From ed3ce755f24e4d6cc7252bdefea319f3e5863858 Mon Sep 17 00:00:00 2001 From: Hans-Erik Floryd Date: Mon, 7 Jul 2025 14:04:25 +0200 Subject: [PATCH] Rename PACKED to OSAL_PACKED Use a less generic name to avoid namespace conflicts. Fixes #835. Change-Id: I222878742ed7d02d19ad50ff732adabfe4f0729a --- contrib/osal/erika/osal_defs.h | 8 +++--- contrib/osal/intime/osal_defs.h | 14 +++++----- contrib/osal/macosx/osal_defs.h | 8 +++--- contrib/osal/rtems/osal_defs.h | 8 +++--- contrib/osal/vxworks/osal_defs.h | 8 +++--- include/soem/ec_eoe.h | 12 ++++---- include/soem/ec_main.h | 48 ++++++++++++++++---------------- include/soem/ec_soe.h | 24 ++++++++-------- include/soem/ec_type.h | 12 ++++---- osal/linux/osal_defs.h | 8 +++--- osal/rtk/osal_defs.h | 8 +++--- osal/win32/osal_defs.h | 12 ++++---- src/ec_coe.c | 12 ++++---- src/ec_foe.c | 6 ++-- src/ec_main.c | 18 ++++++------ src/ec_soe.c | 6 ++-- 16 files changed, 106 insertions(+), 106 deletions(-) diff --git a/contrib/osal/erika/osal_defs.h b/contrib/osal/erika/osal_defs.h index 933b431..65a3a9d 100644 --- a/contrib/osal/erika/osal_defs.h +++ b/contrib/osal/erika/osal_defs.h @@ -25,10 +25,10 @@ extern "C" { } while (0) #endif -#ifndef PACKED -#define PACKED_BEGIN -#define PACKED __attribute__((__packed__)) -#define PACKED_END +#ifndef OSAL_PACKED +#define OSAL_PACKED_BEGIN +#define OSAL_PACKED __attribute__((__packed__)) +#define OSAL_PACKED_END #endif int osal_gettimeofday(struct timeval *tv, struct timezone *tz); diff --git a/contrib/osal/intime/osal_defs.h b/contrib/osal/intime/osal_defs.h index 93bac72..cc3afc1 100644 --- a/contrib/osal/intime/osal_defs.h +++ b/contrib/osal/intime/osal_defs.h @@ -21,15 +21,15 @@ extern "C" { } while (0) #endif -#ifndef PACKED +#ifndef OSAL_PACKED #ifdef _MSC_VER -#define PACKED_BEGIN __pragma(pack(push, 1)) -#define PACKED -#define PACKED_END __pragma(pack(pop)) +#define OSAL_PACKED_BEGIN __pragma(pack(push, 1)) +#define OSAL_PACKED +#define OSAL_PACKED_END __pragma(pack(pop)) #elif defined(__GNUC__) -#define PACKED_BEGIN -#define PACKED __attribute__((__packed__)) -#define PACKED_END +#define OSAL_PACKED_BEGIN +#define OSAL_PACKED __attribute__((__packed__)) +#define OSAL_PACKED_END #endif #endif diff --git a/contrib/osal/macosx/osal_defs.h b/contrib/osal/macosx/osal_defs.h index a797383..061d62c 100644 --- a/contrib/osal/macosx/osal_defs.h +++ b/contrib/osal/macosx/osal_defs.h @@ -21,10 +21,10 @@ extern "C" { } while (0) #endif -#ifndef PACKED -#define PACKED_BEGIN -#define PACKED __attribute__((__packed__)) -#define PACKED_END +#ifndef OSAL_PACKED +#define OSAL_PACKED_BEGIN +#define OSAL_PACKED __attribute__((__packed__)) +#define OSAL_PACKED_END #endif #include diff --git a/contrib/osal/rtems/osal_defs.h b/contrib/osal/rtems/osal_defs.h index a797383..061d62c 100644 --- a/contrib/osal/rtems/osal_defs.h +++ b/contrib/osal/rtems/osal_defs.h @@ -21,10 +21,10 @@ extern "C" { } while (0) #endif -#ifndef PACKED -#define PACKED_BEGIN -#define PACKED __attribute__((__packed__)) -#define PACKED_END +#ifndef OSAL_PACKED +#define OSAL_PACKED_BEGIN +#define OSAL_PACKED __attribute__((__packed__)) +#define OSAL_PACKED_END #endif #include diff --git a/contrib/osal/vxworks/osal_defs.h b/contrib/osal/vxworks/osal_defs.h index 980f1c1..0dd44bb 100644 --- a/contrib/osal/vxworks/osal_defs.h +++ b/contrib/osal/vxworks/osal_defs.h @@ -17,10 +17,10 @@ } while (0) #endif -#ifndef PACKED -#define PACKED_BEGIN -#define PACKED __attribute__((__packed__)) -#define PACKED_END +#ifndef OSAL_PACKED +#define OSAL_PACKED_BEGIN +#define OSAL_PACKED __attribute__((__packed__)) +#define OSAL_PACKED_END #endif #define OSAL_THREAD_HANDLE TASK_ID diff --git a/include/soem/ec_eoe.h b/include/soem/ec_eoe.h index 4497b83..3387319 100644 --- a/include/soem/ec_eoe.h +++ b/include/soem/ec_eoe.h @@ -133,12 +133,12 @@ typedef struct eoe_ip4_addr } eoe_ip4_addr_t; /** EOE ethernet address */ -PACKED_BEGIN -typedef struct PACKED eoe_ethaddr +OSAL_PACKED_BEGIN +typedef struct OSAL_PACKED eoe_ethaddr { uint8_t addr[EOE_ETHADDR_LENGTH]; } eoe_ethaddr_t; -PACKED_END +OSAL_PACKED_END /** EoE IP request structure, storage only, no need to pack */ typedef struct eoe_param @@ -160,8 +160,8 @@ typedef struct eoe_param /** EOE structure. * Used to interpret EoE mailbox packets. */ -PACKED_BEGIN -typedef struct PACKED +OSAL_PACKED_BEGIN +typedef struct OSAL_PACKED { ec_mbxheadert mbxheader; uint16_t frameinfo1; @@ -172,7 +172,7 @@ typedef struct PACKED }; uint8 data[EC_MAXEOEDATA]; } ec_EOEt; -PACKED_END +OSAL_PACKED_END int ecx_EOEdefinehook(ecx_contextt *context, void *hook); int ecx_EOEsetIp(ecx_contextt *context, diff --git a/include/soem/ec_main.h b/include/soem/ec_main.h index 2485fd9..7806cc9 100644 --- a/include/soem/ec_main.h +++ b/include/soem/ec_main.h @@ -27,8 +27,8 @@ struct ec_adapter }; /** record for FMMU */ -PACKED_BEGIN -typedef struct PACKED ec_fmmu +OSAL_PACKED_BEGIN +typedef struct OSAL_PACKED ec_fmmu { uint32 LogStart; uint16 LogLength; @@ -41,26 +41,26 @@ typedef struct PACKED ec_fmmu uint8 unused1; uint16 unused2; } ec_fmmut; -PACKED_END +OSAL_PACKED_END /** record for sync manager */ -PACKED_BEGIN -typedef struct PACKED ec_sm +OSAL_PACKED_BEGIN +typedef struct OSAL_PACKED ec_sm { uint16 StartAddr; uint16 SMlength; uint32 SMflags; } ec_smt; -PACKED_END +OSAL_PACKED_END -PACKED_BEGIN -typedef struct PACKED ec_state_status +OSAL_PACKED_BEGIN +typedef struct OSAL_PACKED ec_state_status { uint16 State; uint16 Unused; uint16 ALstatuscode; } ec_state_status; -PACKED_END +OSAL_PACKED_END /** mailbox buffer array */ typedef uint8 ec_mbxbuft[EC_MAXMBX + 1]; @@ -430,25 +430,25 @@ typedef struct ec_eepromPDO } ec_eepromPDOt; /** standard ethercat mailbox header */ -PACKED_BEGIN -typedef struct PACKED ec_mbxheader +OSAL_PACKED_BEGIN +typedef struct OSAL_PACKED ec_mbxheader { uint16 length; uint16 address; uint8 priority; uint8 mbxtype; } ec_mbxheadert; -PACKED_END +OSAL_PACKED_END /** ALstatus and ALstatus code */ -PACKED_BEGIN -typedef struct PACKED ec_alstatus +OSAL_PACKED_BEGIN +typedef struct OSAL_PACKED ec_alstatus { uint16 alstatus; uint16 unused; uint16 alstatuscode; } ec_alstatust; -PACKED_END +OSAL_PACKED_END /** stack structure to store segmented LRD/LWR/LRW constructs */ typedef struct ec_idxstack @@ -471,34 +471,34 @@ typedef struct ec_ering } ec_eringt; /** SyncManager Communication Type structure for CA */ -PACKED_BEGIN -typedef struct PACKED ec_SMcommtype +OSAL_PACKED_BEGIN +typedef struct OSAL_PACKED ec_SMcommtype { uint8 n; uint8 nu1; uint8 SMtype[EC_MAXSM]; } ec_SMcommtypet; -PACKED_END +OSAL_PACKED_END /** SDO assign structure for CA */ -PACKED_BEGIN -typedef struct PACKED ec_PDOassign +OSAL_PACKED_BEGIN +typedef struct OSAL_PACKED ec_PDOassign { uint8 n; uint8 nu1; uint16 index[256]; } ec_PDOassignt; -PACKED_END +OSAL_PACKED_END /** SDO description structure for CA */ -PACKED_BEGIN -typedef struct PACKED ec_PDOdesc +OSAL_PACKED_BEGIN +typedef struct OSAL_PACKED ec_PDOdesc { uint8 n; uint8 nu1; uint32 PDO[256]; } ec_PDOdesct; -PACKED_END +OSAL_PACKED_END /** Context structure , referenced by all ecx functions*/ struct ecx_context diff --git a/include/soem/ec_soe.h b/include/soem/ec_soe.h index 03e2b37..e6dbf3e 100644 --- a/include/soem/ec_soe.h +++ b/include/soem/ec_soe.h @@ -29,8 +29,8 @@ extern "C" { #define EC_IDN_ATCONFIG 16 /** SoE name structure */ -PACKED_BEGIN -typedef struct PACKED +OSAL_PACKED_BEGIN +typedef struct OSAL_PACKED { /** current length in bytes of list */ uint16 currentlength; @@ -38,11 +38,11 @@ typedef struct PACKED uint16 maxlength; char name[EC_SOE_MAXNAME]; } ec_SoEnamet; -PACKED_END +OSAL_PACKED_END /** SoE list structure */ -PACKED_BEGIN -typedef struct PACKED +OSAL_PACKED_BEGIN +typedef struct OSAL_PACKED { /** current length in bytes of list */ uint16 currentlength; @@ -56,11 +56,11 @@ typedef struct PACKED uint64 lword[1]; }; } ec_SoElistt; -PACKED_END +OSAL_PACKED_END /** SoE IDN mapping structure */ -PACKED_BEGIN -typedef struct PACKED +OSAL_PACKED_BEGIN +typedef struct OSAL_PACKED { /** current length in bytes of list */ uint16 currentlength; @@ -68,7 +68,7 @@ typedef struct PACKED uint16 maxlength; uint16 idn[EC_SOE_MAXMAPPING]; } ec_SoEmappingt; -PACKED_END +OSAL_PACKED_END #define EC_SOE_LENGTH_1 0x00 #define EC_SOE_LENGTH_2 0x01 @@ -84,8 +84,8 @@ PACKED_END #define EC_SOE_TYPE_PARAMETER 0x07 /** SoE attribute structure */ -PACKED_BEGIN -typedef struct PACKED +OSAL_PACKED_BEGIN +typedef struct OSAL_PACKED { /** evaluation factor for display purposes */ uint32 evafactor : 16; @@ -108,7 +108,7 @@ typedef struct PACKED uint32 wpop : 1; uint32 reserved2 : 1; } ec_SoEattributet; -PACKED_END +OSAL_PACKED_END int ecx_SoEread(ecx_contextt *context, uint16 slave, uint8 driveNo, uint8 elementflags, uint16 idn, int *psize, void *p, int timeout); int ecx_SoEwrite(ecx_contextt *context, uint16 slave, uint8 driveNo, uint8 elementflags, uint16 idn, int psize, void *p, int timeout); diff --git a/include/soem/ec_type.h b/include/soem/ec_type.h index ff420da..faca170 100644 --- a/include/soem/ec_type.h +++ b/include/soem/ec_type.h @@ -62,8 +62,8 @@ extern "C" { typedef uint8 ec_bufT[EC_BUFSIZE]; /** ethernet header definition */ -PACKED_BEGIN -typedef struct PACKED +OSAL_PACKED_BEGIN +typedef struct OSAL_PACKED { /** destination MAC */ uint16 da0, da1, da2; @@ -72,14 +72,14 @@ typedef struct PACKED /** ethernet type */ uint16 etype; } ec_etherheadert; -PACKED_END +OSAL_PACKED_END /** ethernet header size */ #define ETH_HEADERSIZE sizeof(ec_etherheadert) /** EtherCAT datagram header definition */ -PACKED_BEGIN -typedef struct PACKED +OSAL_PACKED_BEGIN +typedef struct OSAL_PACKED { /** length of EtherCAT datagram */ uint16 elength; @@ -96,7 +96,7 @@ typedef struct PACKED /** interrupt, currently unused */ uint16 irpt; } ec_comt; -PACKED_END +OSAL_PACKED_END /** EtherCAT header size */ #define EC_HEADERSIZE sizeof(ec_comt) diff --git a/osal/linux/osal_defs.h b/osal/linux/osal_defs.h index d7f57d0..3d6ad51 100644 --- a/osal/linux/osal_defs.h +++ b/osal/linux/osal_defs.h @@ -25,10 +25,10 @@ extern "C" { } while (0) #endif -#ifndef PACKED -#define PACKED_BEGIN -#define PACKED __attribute__((__packed__)) -#define PACKED_END +#ifndef OSAL_PACKED +#define OSAL_PACKED_BEGIN +#define OSAL_PACKED __attribute__((__packed__)) +#define OSAL_PACKED_END #endif #define ec_timet struct timespec diff --git a/osal/rtk/osal_defs.h b/osal/rtk/osal_defs.h index 74a577b..2cf8edc 100644 --- a/osal/rtk/osal_defs.h +++ b/osal/rtk/osal_defs.h @@ -24,10 +24,10 @@ extern "C" { } while (0) #endif -#ifndef PACKED -#define PACKED_BEGIN -#define PACKED __attribute__((__packed__)) -#define PACKED_END +#ifndef OSAL_PACKED +#define OSAL_PACKED_BEGIN +#define OSAL_PACKED __attribute__((__packed__)) +#define OSAL_PACKED_END #endif #define ec_timet struct timespec diff --git a/osal/win32/osal_defs.h b/osal/win32/osal_defs.h index aa36c06..18abebf 100644 --- a/osal/win32/osal_defs.h +++ b/osal/win32/osal_defs.h @@ -25,14 +25,14 @@ extern "C" { } while (0) #endif -#ifndef PACKED -#define PACKED +#ifndef OSAL_PACKED +#define OSAL_PACKED #ifdef __GNUC__ -#define PACKED_BEGIN _Pragma("pack(push,1)") -#define PACKED_END _Pragma("pack(pop)") +#define OSAL_PACKED_BEGIN _Pragma("pack(push,1)") +#define OSAL_PACKED_END _Pragma("pack(pop)") #else -#define PACKED_BEGIN __pragma(pack(push, 1)) -#define PACKED_END __pragma(pack(pop)) +#define OSAL_PACKED_BEGIN __pragma(pack(push, 1)) +#define OSAL_PACKED_END __pragma(pack(pop)) #endif #endif diff --git a/src/ec_coe.c b/src/ec_coe.c index 6303d4a..6ac2113 100644 --- a/src/ec_coe.c +++ b/src/ec_coe.c @@ -17,8 +17,8 @@ #include "oshw.h" /** SDO structure, not to be confused with EcSDOserviceT */ -PACKED_BEGIN -typedef struct PACKED +OSAL_PACKED_BEGIN +typedef struct OSAL_PACKED { ec_mbxheadert MbxHeader; uint16 CANOpen; @@ -32,11 +32,11 @@ typedef struct PACKED uint32 ldata[0x80]; }; } ec_SDOt; -PACKED_END +OSAL_PACKED_END /** SDO service structure */ -PACKED_BEGIN -typedef struct PACKED +OSAL_PACKED_BEGIN +typedef struct OSAL_PACKED { ec_mbxheadert MbxHeader; uint16 CANOpen; @@ -50,7 +50,7 @@ typedef struct PACKED uint32 ldata[0x80]; }; } ec_SDOservicet; -PACKED_END +OSAL_PACKED_END /** Report SDO error. * diff --git a/src/ec_foe.c b/src/ec_foe.c index f9e3e05..077aaa6 100644 --- a/src/ec_foe.c +++ b/src/ec_foe.c @@ -27,8 +27,8 @@ /** FOE structure. * Used for Read, Write, Data, Ack and Error mailbox packets. */ -PACKED_BEGIN -typedef struct PACKED +OSAL_PACKED_BEGIN +typedef struct OSAL_PACKED { ec_mbxheadert MbxHeader; uint8 OpCode; @@ -46,7 +46,7 @@ typedef struct PACKED char ErrorText[EC_MAXFOEDATA]; }; } ec_FOEt; -PACKED_END +OSAL_PACKED_END /** FoE progress hook. * diff --git a/src/ec_main.c b/src/ec_main.c index f0933f3..1b53714 100644 --- a/src/ec_main.c +++ b/src/ec_main.c @@ -25,28 +25,28 @@ #define EC_LOCALDELAY 200 /** record for ethercat eeprom communications */ -PACKED_BEGIN -typedef struct PACKED +OSAL_PACKED_BEGIN +typedef struct OSAL_PACKED { uint16 comm; uint16 addr; uint16 d2; } ec_eepromt; -PACKED_END +OSAL_PACKED_END /** mailbox error structure */ -PACKED_BEGIN -typedef struct PACKED +OSAL_PACKED_BEGIN +typedef struct OSAL_PACKED { ec_mbxheadert MbxHeader; uint16 Type; uint16 Detail; } ec_mbxerrort; -PACKED_END +OSAL_PACKED_END /** emergency request structure */ -PACKED_BEGIN -typedef struct PACKED +OSAL_PACKED_BEGIN +typedef struct OSAL_PACKED { ec_mbxheadert MbxHeader; uint16 CANOpen; @@ -55,7 +55,7 @@ typedef struct PACKED uint8 bData; uint16 w1, w2; } ec_emcyt; -PACKED_END +OSAL_PACKED_END /** Create list over available network adapters. * diff --git a/src/ec_soe.c b/src/ec_soe.c index f0ede39..2d328a9 100644 --- a/src/ec_soe.c +++ b/src/ec_soe.c @@ -17,8 +17,8 @@ #define EC_SOE_MAX_DRIVES 8 /** SoE (Servo over EtherCAT) mailbox structure */ -PACKED_BEGIN -typedef struct PACKED +OSAL_PACKED_BEGIN +typedef struct OSAL_PACKED { ec_mbxheadert MbxHeader; uint8 opCode : 3; @@ -32,7 +32,7 @@ typedef struct PACKED uint16 fragmentsleft; }; } ec_SoEt; -PACKED_END +OSAL_PACKED_END /** Report SoE error. *