rename STATIC_ASSERT to VERIFY_STATIC to avoid name conflict with other codes

3 files changed, 20 insertions, 20 deletions

diff --git a/tinyusb/class/cdc/cdc.h b/tinyusb/class/cdc/cdc.h
index 653704a78..b0c4f90d4 100644
--- a/tinyusb/class/cdc/cdc.h
+++ b/tinyusb/class/cdc/cdc.h
@@ -300,7 +300,7 @@ typedef struct ATTR_PACKED
   uint8_t : 0;

 }cdc_acm_capability_t;

 

-STATIC_ASSERT(sizeof(cdc_acm_capability_t) == 1, "mostly problem with compiler");

+VERIFY_STATIC(sizeof(cdc_acm_capability_t) == 1, "mostly problem with compiler");

 

 /// \brief Abstract Control Management Functional Descriptor

 /// \details This functional descriptor describes the commands supported by by the Communications Class interface with SubClass code of \ref CDC_COMM_SUBCLASS_ABSTRACT_CONTROL_MODEL

@@ -390,7 +390,7 @@ typedef struct ATTR_PACKED
   uint8_t  data_bits; ///< can be 5, 6, 7, 8 or 16

 } cdc_line_coding_t;

 

-STATIC_ASSERT(sizeof(cdc_line_coding_t) == 7, "size is not correct");

+VERIFY_STATIC(sizeof(cdc_line_coding_t) == 7, "size is not correct");

 

 typedef struct ATTR_PACKED

 {

@@ -399,7 +399,7 @@ typedef struct ATTR_PACKED
   uint16_t : 14;

 } cdc_line_control_state_t;

 

-STATIC_ASSERT(sizeof(cdc_line_control_state_t) == 2, "size is not correct");

+VERIFY_STATIC(sizeof(cdc_line_control_state_t) == 2, "size is not correct");

 

 /** @} */

 

diff --git a/tinyusb/class/cdc/cdc_rndis.h b/tinyusb/class/cdc/cdc_rndis.h
index 8076a5bb5..460477eb0 100644
--- a/tinyusb/class/cdc/cdc_rndis.h
+++ b/tinyusb/class/cdc/cdc_rndis.h
@@ -142,7 +142,7 @@ typedef struct {
   uint8_t  oid_buffer[]  ; ///< Flexible array contains the input data supplied by the host, required for the OID query request processing by the device, as per the host NDIS specification.
 } rndis_msg_query_t, rndis_msg_set_t;
 
-STATIC_ASSERT(sizeof(rndis_msg_query_t) == 28, "Make sure flexible array member does not affect layout");
+VERIFY_STATIC(sizeof(rndis_msg_query_t) == 28, "Make sure flexible array member does not affect layout");
 
 /// \brief Query Complete Message
 /// \details This message MUST be sent by the device in response to a query OID message.
@@ -156,7 +156,7 @@ typedef struct {
   uint8_t  oid_buffer[]  ; ///< Flexible array member contains the response data to the OID query request as specified by the host.
 } rndis_msg_query_cmplt_t;
 
-STATIC_ASSERT(sizeof(rndis_msg_query_cmplt_t) == 24, "Make sure flexible array member does not affect layout");
+VERIFY_STATIC(sizeof(rndis_msg_query_cmplt_t) == 24, "Make sure flexible array member does not affect layout");
 
 //------------- Reset -------------//
 /// \brief Reset Message
diff --git a/tinyusb/class/msc/msc.h b/tinyusb/class/msc/msc.h
index 17f1e3163..a8af2b886 100644
--- a/tinyusb/class/msc/msc.h
+++ b/tinyusb/class/msc/msc.h
@@ -109,7 +109,7 @@ typedef struct ATTR_PACKED
   uint8_t  command[16] ; ///< The command block to be executed by the device. The device shall interpret the first cmd_len bytes in this field as a command block

 }msc_cbw_t;

 

-STATIC_ASSERT(sizeof(msc_cbw_t) == 31, "size is not correct");

+VERIFY_STATIC(sizeof(msc_cbw_t) == 31, "size is not correct");

 

 /// Command Status Wrapper

 typedef struct ATTR_PACKED

@@ -120,7 +120,7 @@ typedef struct ATTR_PACKED
   uint8_t  status       ; ///< indicates the success or failure of the command. Values from \ref msc_csw_status_t

 }msc_csw_t;

 

-STATIC_ASSERT(sizeof(msc_csw_t) == 13, "size is not correct");

+VERIFY_STATIC(sizeof(msc_csw_t) == 13, "size is not correct");

 

 //--------------------------------------------------------------------+

 // SCSI Constant

@@ -172,7 +172,7 @@ typedef struct ATTR_PACKED
   uint8_t control     ;

 } scsi_test_unit_ready_t;

 

-STATIC_ASSERT(sizeof(scsi_test_unit_ready_t) == 6, "size is not correct");

+VERIFY_STATIC(sizeof(scsi_test_unit_ready_t) == 6, "size is not correct");

 

 /// SCSI Inquiry Command

 typedef struct ATTR_PACKED

@@ -185,7 +185,7 @@ typedef struct ATTR_PACKED
   uint8_t control      ;

 } scsi_inquiry_t, scsi_request_sense_t;

 

-STATIC_ASSERT(sizeof(scsi_inquiry_t) == 6, "size is not correct");

+VERIFY_STATIC(sizeof(scsi_inquiry_t) == 6, "size is not correct");

 

 /// SCSI Inquiry Response Data

 typedef struct ATTR_PACKED

@@ -231,7 +231,7 @@ typedef struct ATTR_PACKED
   uint8_t product_revision[4] ; ///< 4 bytes of ASCII data defined by the vendor.

 } scsi_inquiry_data_t;

 

-STATIC_ASSERT(sizeof(scsi_inquiry_data_t) == 36, "size is not correct");

+VERIFY_STATIC(sizeof(scsi_inquiry_data_t) == 36, "size is not correct");

 

 

 typedef struct ATTR_PACKED

@@ -258,7 +258,7 @@ typedef struct ATTR_PACKED
 

 } scsi_sense_fixed_data_t;

 

-STATIC_ASSERT(sizeof(scsi_sense_fixed_data_t) == 18, "size is not correct");

+VERIFY_STATIC(sizeof(scsi_sense_fixed_data_t) == 18, "size is not correct");

 

 typedef struct ATTR_PACKED

 {

@@ -276,7 +276,7 @@ typedef struct ATTR_PACKED
   uint8_t control;

 } scsi_mode_sense_6_t;

 

-STATIC_ASSERT( sizeof(scsi_mode_sense_6_t) == 6, "size is not correct");

+VERIFY_STATIC( sizeof(scsi_mode_sense_6_t) == 6, "size is not correct");

 

 typedef struct ATTR_PACKED

 {

@@ -286,7 +286,7 @@ typedef struct ATTR_PACKED
   uint8_t block_descriptor_length;

 } scsi_mode_parameters_t;

 

-STATIC_ASSERT( sizeof(scsi_mode_parameters_t) == 4, "size is not correct");

+VERIFY_STATIC( sizeof(scsi_mode_parameters_t) == 4, "size is not correct");

 

 typedef struct ATTR_PACKED

 {

@@ -296,7 +296,7 @@ typedef struct ATTR_PACKED
   uint8_t control;

 } scsi_prevent_allow_medium_removal_t;

 

-STATIC_ASSERT( sizeof(scsi_prevent_allow_medium_removal_t) == 6, "size is not correct");

+VERIFY_STATIC( sizeof(scsi_prevent_allow_medium_removal_t) == 6, "size is not correct");

 

 //--------------------------------------------------------------------+

 // SCSI MMC

@@ -310,7 +310,7 @@ typedef struct ATTR_PACKED
   uint8_t control;

 } scsi_read_format_capacity_t;

 

-STATIC_ASSERT( sizeof(scsi_read_format_capacity_t) == 10, "size is not correct");

+VERIFY_STATIC( sizeof(scsi_read_format_capacity_t) == 10, "size is not correct");

 

 typedef struct ATTR_PACKED{

   uint8_t reserved[3];

@@ -324,7 +324,7 @@ typedef struct ATTR_PACKED{
 

 } scsi_read_format_capacity_data_t;

 

-STATIC_ASSERT( sizeof(scsi_read_format_capacity_data_t) == 12, "size is not correct");

+VERIFY_STATIC( sizeof(scsi_read_format_capacity_data_t) == 12, "size is not correct");

 

 //--------------------------------------------------------------------+

 // SCSI Block Command (SBC-3)

@@ -342,7 +342,7 @@ typedef struct ATTR_PACKED
   uint8_t  control                  ;

 } scsi_read_capacity10_t;

 

-STATIC_ASSERT(sizeof(scsi_read_capacity10_t) == 10, "size is not correct");

+VERIFY_STATIC(sizeof(scsi_read_capacity10_t) == 10, "size is not correct");

 

 /// SCSI Read Capacity 10 Response Data

 typedef struct {

@@ -350,7 +350,7 @@ typedef struct {
   uint32_t block_size ; ///< Block size in bytes

 } scsi_read_capacity10_data_t;

 

-STATIC_ASSERT(sizeof(scsi_read_capacity10_data_t) == 8, "size is not correct");

+VERIFY_STATIC(sizeof(scsi_read_capacity10_data_t) == 8, "size is not correct");

 

 /// SCSI Read 10 Command

 typedef struct ATTR_PACKED

@@ -363,8 +363,8 @@ typedef struct ATTR_PACKED
   uint8_t  control     ;

 } scsi_read10_t, scsi_write10_t;

 

-STATIC_ASSERT(sizeof(scsi_read10_t) == 10, "size is not correct");

-STATIC_ASSERT(sizeof(scsi_write10_t) == 10, "size is not correct");

+VERIFY_STATIC(sizeof(scsi_read10_t) == 10, "size is not correct");

+VERIFY_STATIC(sizeof(scsi_write10_t) == 10, "size is not correct");

 

 #ifdef __cplusplus

  }