summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorhathach <[email protected]>2021-07-22 17:07:39 +0700
committerhathach <[email protected]>2021-07-22 17:07:39 +0700
commit4e50ceba48c15206543fe662f098a98152ef4235 (patch)
tree9b4f0ee3235dc258e65a1a1cab77fde272bb8458 /src
parentb35ad6edcb8b723c481246532349d21b35c46ac1 (diff)
rename packed begin/end
Diffstat (limited to 'src')
-rw-r--r--src/class/cdc/cdc.h20
-rw-r--r--src/common/tusb_compiler.h8
-rw-r--r--src/common/tusb_types.h4
-rw-r--r--src/portable/renesas/usba/dcd_usba.c4
4 files changed, 18 insertions, 18 deletions
diff --git a/src/class/cdc/cdc.h b/src/class/cdc/cdc.h
index f59690835..7a06711be 100644
--- a/src/class/cdc/cdc.h
+++ b/src/class/cdc/cdc.h
@@ -215,7 +215,7 @@ typedef enum
// Class Specific Functional Descriptor (Communication Interface)
//--------------------------------------------------------------------+
-TU_PACK_STRUCT_BEGIN // Start of definition of packed structs (used by the CCRX toolchain)
+TU_ATTR_PACKED_BEGIN // Start of definition of packed structs (used by the CCRX toolchain)
/// Header Functional Descriptor (Communication Interface)
typedef struct TU_ATTR_PACKED
@@ -236,10 +236,10 @@ typedef struct TU_ATTR_PACKED
uint8_t bSubordinateInterface ; ///< Array of Interface number of Data Interface
}cdc_desc_func_union_t;
-TU_PACK_STRUCT_END // End of definition of packed structs (used by the CCRX toolchain)
+TU_ATTR_PACKED_END // End of definition of packed structs (used by the CCRX toolchain)
#define cdc_desc_func_union_n_t(no_slave)\
- TU_PACK_STRUCT_BEGIN \
+ TU_ATTR_PACKED_BEGIN \
struct TU_ATTR_PACKED { \
uint8_t bLength ;\
uint8_t bDescriptorType ;\
@@ -247,10 +247,10 @@ TU_PACK_STRUCT_END // End of definition of packed structs (used by the CCRX too
uint8_t bControlInterface ;\
uint8_t bSubordinateInterface[no_slave] ;\
} \
-TU_PACK_STRUCT_END
+TU_ATTR_PACKED_END
-TU_PACK_STRUCT_BEGIN // Start of definition of packed structs (used by the CCRX toolchain)
+TU_ATTR_PACKED_BEGIN // Start of definition of packed structs (used by the CCRX toolchain)
/// Country Selection Functional Descriptor (Communication Interface)
typedef struct TU_ATTR_PACKED
@@ -262,10 +262,10 @@ typedef struct TU_ATTR_PACKED
uint16_t wCountryCode ; ///< Country code in the format as defined in [ISO3166], release date as specified inoffset 3 for the first supported country.
}cdc_desc_func_country_selection_t;
-TU_PACK_STRUCT_END // End of definition of packed structs (used by the CCRX toolchain)
+TU_ATTR_PACKED_END // End of definition of packed structs (used by the CCRX toolchain)
#define cdc_desc_func_country_selection_n_t(no_country) \
- TU_PACK_STRUCT_BEGIN \
+ TU_ATTR_PACKED_BEGIN \
struct TU_ATTR_PACKED { \
uint8_t bLength ;\
uint8_t bDescriptorType ;\
@@ -273,13 +273,13 @@ TU_PACK_STRUCT_END // End of definition of packed structs (used by the CCRX too
uint8_t iCountryCodeRelDate ;\
uint16_t wCountryCode[no_country] ;\
} \
-TU_PACK_STRUCT_END
+TU_ATTR_PACKED_END
//--------------------------------------------------------------------+
// PUBLIC SWITCHED TELEPHONE NETWORK (PSTN) SUBCLASS
//--------------------------------------------------------------------+
-TU_PACK_STRUCT_BEGIN // Start of definition of packed structs (used by the CCRX toolchain)
+TU_ATTR_PACKED_BEGIN // Start of definition of packed structs (used by the CCRX toolchain)
/// \brief Call Management Functional Descriptor
/// \details This functional descriptor describes the processing of calls for the Communications Class interface.
@@ -419,7 +419,7 @@ typedef struct TU_ATTR_PACKED
} cdc_line_control_state_t;
TU_BIT_FIELD_ORDER_END
-TU_PACK_STRUCT_END // End of definition of packed structs (used by the CCRX toolchain)
+TU_ATTR_PACKED_END // End of definition of packed structs (used by the CCRX toolchain)
TU_VERIFY_STATIC(sizeof(cdc_line_control_state_t) == 2, "size is not correct");
diff --git a/src/common/tusb_compiler.h b/src/common/tusb_compiler.h
index 6fdd08032..1f3128e0e 100644
--- a/src/common/tusb_compiler.h
+++ b/src/common/tusb_compiler.h
@@ -79,8 +79,8 @@
#define TU_ATTR_UNUSED __attribute__ ((unused)) // Function/Variable is meant to be possibly unused
#define TU_ATTR_USED __attribute__ ((used)) // Function/Variable is meant to be used
- #define TU_PACK_STRUCT_BEGIN
- #define TU_PACK_STRUCT_END
+ #define TU_ATTR_PACKED_BEGIN
+ #define TU_ATTR_PACKED_END
#define TU_BIT_FIELD_ORDER_BEGIN
#define TU_BIT_FIELD_ORDER_END
@@ -150,8 +150,8 @@
#define TU_ATTR_UNUSED
#define TU_ATTR_USED
- #define TU_PACK_STRUCT_BEGIN _Pragma("pack")
- #define TU_PACK_STRUCT_END _Pragma("packoption")
+ #define TU_ATTR_PACKED_BEGIN _Pragma("pack")
+ #define TU_ATTR_PACKED_END _Pragma("packoption")
#define TU_BIT_FIELD_ORDER_BEGIN _Pragma("bit_order right")
#define TU_BIT_FIELD_ORDER_END _Pragma("bit_order")
diff --git a/src/common/tusb_types.h b/src/common/tusb_types.h
index f34eb3075..34395365e 100644
--- a/src/common/tusb_types.h
+++ b/src/common/tusb_types.h
@@ -262,7 +262,7 @@ enum
// USB Descriptors
//--------------------------------------------------------------------+
-TU_PACK_STRUCT_BEGIN // Start of definition of packed structs (used by the CCRX toolchain)
+TU_ATTR_PACKED_BEGIN // Start of definition of packed structs (used by the CCRX toolchain)
/// USB Device Descriptor
typedef struct TU_ATTR_PACKED
@@ -479,7 +479,7 @@ typedef struct TU_ATTR_PACKED{
} tusb_control_request_t;
TU_BIT_FIELD_ORDER_END
-TU_PACK_STRUCT_END // End of definition of packed structs (used by the CCRX toolchain)
+TU_ATTR_PACKED_END // End of definition of packed structs (used by the CCRX toolchain)
TU_VERIFY_STATIC( sizeof(tusb_control_request_t) == 8, "size is not correct");
diff --git a/src/portable/renesas/usba/dcd_usba.c b/src/portable/renesas/usba/dcd_usba.c
index 67b92dc89..0c206fdd0 100644
--- a/src/portable/renesas/usba/dcd_usba.c
+++ b/src/portable/renesas/usba/dcd_usba.c
@@ -120,7 +120,7 @@ typedef union {
} hw_fifo_t;
TU_BIT_FIELD_ORDER_END
-TU_PACK_STRUCT_BEGIN // Start of definition of packed structs (used by the CCRX toolchain)
+TU_ATTR_PACKED_BEGIN // Start of definition of packed structs (used by the CCRX toolchain)
TU_BIT_FIELD_ORDER_BEGIN
typedef struct TU_ATTR_PACKED
@@ -135,7 +135,7 @@ typedef struct TU_ATTR_PACKED
} pipe_state_t;
TU_BIT_FIELD_ORDER_END
-TU_PACK_STRUCT_END // End of definition of packed structs (used by the CCRX toolchain)
+TU_ATTR_PACKED_END // End of definition of packed structs (used by the CCRX toolchain)
typedef struct
{