Merge branch 'main' into syslog

This commit is contained in:
feelfree69
2026-04-24 12:01:30 +02:00
committed by GitHub
10 changed files with 367 additions and 279 deletions
+2
View File
@@ -1070,8 +1070,10 @@ __xdata struct uip_udp_conn *uip_udp_new(__xdata uip_ipaddr_t *ripaddr, __xdata
#ifndef HTONS
# if UIP_BYTE_ORDER == UIP_BIG_ENDIAN
# define HTONS(n) (n)
# define NTOHS(n) (n)
# else /* UIP_BYTE_ORDER == UIP_BIG_ENDIAN */
# define HTONS(n) (u16_t)((((u16_t) (n)) << 8) | (((u16_t) (n)) >> 8))
# define NTOHS(n) (u16_t)((((u16_t) (n)) << 8) | (((u16_t) (n)) >> 8))
# endif /* UIP_BYTE_ORDER == UIP_BIG_ENDIAN */
#else
#error "HTONS already defined!"
+4 -3
View File
@@ -68,7 +68,8 @@
struct arp_hdr_i {
struct uip_eth_hdr ethhdr;
uint8_t rtl_tag[RTL_TAG_SIZE + VLAN_TAG_SIZE];
struct rtl_tag rtl_tag;
struct vlan_tag vlan_tag;
u16_t hwtype;
u16_t protocol;
u8_t hwlen;
@@ -131,8 +132,8 @@ static __xdata u8_t arptime;
static __xdata u8_t tmpage;
#define BUF ((__xdata struct arp_hdr_i *)&uip_buf[0])
#define BUF_O ((__xdata struct arp_hdr_o *)&uip_buf[RTL_TAG_SIZE + VLAN_TAG_SIZE])
#define IPBUF ((__xdata struct ethip_hdr *)&uip_buf[RTL_TAG_SIZE + VLAN_TAG_SIZE])
#define BUF_O ((__xdata struct arp_hdr_o *)&uip_buf[RTL_FRAME_DESC_SIZE])
#define IPBUF ((__xdata struct ethip_hdr *)&uip_buf[RTL_FRAME_DESC_SIZE])
/*-----------------------------------------------------------------------------------*/
/**
* Initialize the ARP module.
+1 -1
View File
@@ -447,7 +447,7 @@ void uip_log(char *msg);
#ifdef UIP_CONF_LLH_LEN
#define UIP_LLH_LEN UIP_CONF_LLH_LEN
#else /* UIP_CONF_LLH_LEN */
#define UIP_LLH_LEN ETHER_HEADER_SIZE + RTL_TAG_SIZE + VLAN_TAG_SIZE
#define UIP_LLH_LEN ETHER_HEADER_SIZE + RTL_FRAME_DESC_SIZE
#endif /* UIP_CONF_LLH_LEN */
/** @} */