Merge pull request #13 from hathach/devlocal

add unplugged event for nrf5x

3 files changed, 4 insertions, 15 deletions

diff --git a/src/common/compiler/tusb_compiler_gcc.h b/src/common/compiler/tusb_compiler_gcc.h
index c9f716d48..e40ad9c41 100644
--- a/src/common/compiler/tusb_compiler_gcc.h
+++ b/src/common/compiler/tusb_compiler_gcc.h
@@ -66,10 +66,8 @@
 
 /// The packed attribute specifies that a variable or structure field should have the smallest possible alignment—one byte for a variable, and one bit for a field, unless you specify a larger value with the aligned attribute
 #define ATTR_PACKED                __attribute__ ((packed))
-
 #define ATTR_PREPACKED
 
-#define ATTR_PACKED_STRUCT(x)     x __attribute__ ((packed))
 /** @} */
 
 /** \defgroup Group_FuncAttr Function Attributes
diff --git a/src/common/compiler/tusb_compiler_iar.h b/src/common/compiler/tusb_compiler_iar.h
index 1703ea45f..1f8936859 100644
--- a/src/common/compiler/tusb_compiler_iar.h
+++ b/src/common/compiler/tusb_compiler_iar.h
@@ -53,8 +53,6 @@
 #endif

 

 #define ALIGN_OF(x)     __ALIGNOF__(x)

-

-#define ATTR_PACKED_STRUCT(x)     __packed x

 #define ATTR_PREPACKED  __packed

 #define ATTR_PACKED

 //#define ATTR_SECTION(section)      _Pragma((#section))

diff --git a/src/common/tusb_types.h b/src/common/tusb_types.h
index 32632cd90..b11481b18 100644
--- a/src/common/tusb_types.h
+++ b/src/common/tusb_types.h
@@ -51,10 +51,6 @@
  extern "C" {

 #endif

 

-#pragma GCC diagnostic push

-#pragma GCC diagnostic ignored "-Wpacked"

-#pragma GCC diagnostic ignored "-Wattributes"

-

 /*------------------------------------------------------------------*/

 /* CONSTANTS

  *------------------------------------------------------------------*/

@@ -197,11 +193,10 @@ typedef enum
 

 typedef enum

 {

-  TUSB_EVENT_NONE = 0,

-  TUSB_EVENT_XFER_COMPLETE,

-  TUSB_EVENT_XFER_ERROR,

-  TUSB_EVENT_XFER_STALLED,

-}tusb_event_t;

+  XFER_RESULT_SUCCESS,

+  XFER_RESULT_FAILED,

+  XFER_RESULT_STALLED,

+}xfer_result_t;

 

 enum

 {

@@ -428,8 +423,6 @@ static inline uint8_t descriptor_len(uint8_t const p_desc[])
 // Convert comma-separated string to descriptor unicode format

 #define TUD_DESC_STRCONV( ... )     (const uint16_t[]) { TUD_DESC_STR_HEADER(VA_ARGS_NUM_(__VA_ARGS__)), __VA_ARGS__ }

 

-#pragma GCC diagnostic pop

-

 #ifdef __cplusplus

  }

 #endif