Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-08-01 20:28:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

net/utils: add union name for tasking compiler compatibility

Browse source 
Some compilers like Tasking do not support anonymous unions/structs.
Add explicit names to the anonymous union and struct members in
snoop_packet_header_s and update all references accordingly.

Signed-off-by: zhangyuan29 <zhangyuan29@xiaomi.com>
This commit is contained in:
zhangyuan29 2024-12-16 21:47:28 +08:00 • committed by Alan C. Assis
parent 1c36ba764f
commit c99fa1994f
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
net/utils/net_snoop.c
View file

@ -146,7 +146,7 @@ begin_packed_struct struct snoop_packet_header_s
{
uint32_t flags; /* Packet Flags: 1 hci cmd , eg: btsnoop */
uint32_t rec_len; /* length of record */
};
} u1;
uint32_t cum_drops; /* cumulative number of dropped packets */
union
{
@ -156,7 +156,7 @@ begin_packed_struct struct snoop_packet_header_s
uint32_t ts_sec; /* timestamp seconds */
uint32_t ts_usec; /* timestamp microseconds */
} ts;
};
} u2;
} end_packed_struct;
/****************************************************************************
@ -185,8 +185,8 @@ static void snoop_fill_packet_header(FAR struct snoop_s *snoop,
case SNOOP_DATALINK_HCI_BSCP:
case SNOOP_DATALINK_HCI_SERIAL:
gettimeofday(&tv, NULL);
header->ts_usec = htobe64(SNOOP_EPOCH_USEC(tv));
header->flags = htobe32(flags);
header->u2.ts_usec = htobe64(SNOOP_EPOCH_USEC(tv));
header->u1.flags = htobe32(flags);
break;
case SNOOP_DATALINK_TYPE_TOKENBUS:
@ -199,9 +199,9 @@ static void snoop_fill_packet_header(FAR struct snoop_s *snoop,
case SNOOP_DATALINK_TYPE_FDDI:
case SNOOP_DATALINK_TYPE_OTHER:
gettimeofday(&tv, NULL);
header->ts.ts_sec = htobe32(tv.tv_sec);
header->ts.ts_usec = htobe32(tv.tv_usec);
header->rec_len = htobe32(flags);
header->u2.ts.ts_sec = htobe32(tv.tv_sec);
header->u2.ts.ts_usec = htobe32(tv.tv_usec);
header->u1.rec_len = htobe32(flags);
break;
default: