Merge pull request #20 from hathach/devlocal

Host stack rework

2 files changed, 19 insertions, 52 deletions

diff --git a/src/common/tusb_common.h b/src/common/tusb_common.h
index 3c5402e59..f4fac96b8 100644
--- a/src/common/tusb_common.h
+++ b/src/common/tusb_common.h
@@ -73,6 +73,8 @@
 // MACROS

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

 #define TU_ARRAY_SZIE(_arr)      ( sizeof(_arr) / sizeof(_arr[0]) )

+#define TU_MIN(_x, _y)           ( (_x) < (_y) ) ? (_x) : (_y) )

+#define TU_MAX(_x, _y)           ( (_x) > (_y) ) ? (_x) : (_y) )

 

 #define U16_HIGH_U8(u16) ((uint8_t) (((u16) >> 8) & 0x00ff))

 #define U16_LOW_U8(u16)  ((uint8_t) ((u16)       & 0x00ff))

@@ -167,53 +169,23 @@ static inline uint16_t tu_u16_le2be(uint16_t u16)
   return ((uint16_t)(tu_u16_low(u16) << 8)) | tu_u16_high(u16);

 }

 

-//------------- Min -------------//

-static inline uint8_t tu_min8(uint8_t x, uint8_t y)

-{

-  return (x < y) ? x : y;

-}

-

-static inline uint16_t tu_min16(uint16_t x, uint16_t y)

-{

-  return (x < y) ? x : y;

-}

-

-static inline uint32_t tu_min32(uint32_t x, uint32_t y)

-{

-  return (x < y) ? x : y;

-}

-

-//------------- Max -------------//

-static inline uint32_t tu_max32(uint32_t x, uint32_t y)

-{

-  return (x > y) ? x : y;

-}

-

-//------------- Align -------------//

-static inline uint32_t tu_align32 (uint32_t value)

-{

-	return (value & 0xFFFFFFE0UL);

-}

-

-static inline uint32_t tu_align16 (uint32_t value)

-{

-	return (value & 0xFFFFFFF0UL);

-}

+// Min

+static inline uint8_t  tu_min8(uint8_t x, uint8_t y) { return (x < y) ? x : y; }

+static inline uint16_t tu_min16(uint16_t x, uint16_t y) { return (x < y) ? x : y; }

+static inline uint32_t tu_min32(uint32_t x, uint32_t y) { return (x < y) ? x : y; }

 

-static inline uint32_t tu_align_n (uint32_t alignment, uint32_t value)

-{

-	return value & ((uint32_t) ~(alignment-1));

-}

+// Max

+static inline uint8_t  tu_max8(uint8_t x, uint8_t y) { return (x > y) ? x : y; }

+static inline uint16_t tu_max16(uint16_t x, uint16_t y) { return (x > y) ? x : y; }

+static inline uint32_t tu_max32(uint32_t x, uint32_t y) { return (x > y) ? x : y; }

 

-static inline uint32_t tu_align4k (uint32_t value)

-{

-	return (value & 0xFFFFF000UL);

-}

+// Align

+static inline uint32_t tu_align32 (uint32_t value) { return (value & 0xFFFFFFE0UL); }

+static inline uint32_t tu_align16 (uint32_t value) { return (value & 0xFFFFFFF0UL); }

+static inline uint32_t tu_align_n (uint32_t alignment, uint32_t value) { return value & ((uint32_t) ~(alignment-1)); }

+static inline uint32_t tu_align4k (uint32_t value) { return (value & 0xFFFFF000UL); }

 

-static inline uint32_t tu_offset4k(uint32_t value)

-{

-	return (value & 0xFFFUL);

-}

+static inline uint32_t tu_offset4k(uint32_t value) { return (value & 0xFFFUL); }

 

 //------------- Mathematics -------------//

 static inline uint32_t tu_abs(int32_t value)

@@ -221,7 +193,6 @@ static inline uint32_t tu_abs(int32_t value)
   return (value < 0) ? (-value) : value;

 }

 

-

 /// inclusive range checking

 static inline bool tu_within(uint32_t lower, uint32_t value, uint32_t upper)

 {

diff --git a/src/common/tusb_types.h b/src/common/tusb_types.h
index b11481b18..d0a10acef 100644
--- a/src/common/tusb_types.h
+++ b/src/common/tusb_types.h
@@ -184,11 +184,6 @@ typedef enum
   TUSB_DEVICE_STATE_ADDRESSED   ,

   TUSB_DEVICE_STATE_CONFIGURED  ,

   TUSB_DEVICE_STATE_SUSPENDED   ,

-

-  TUSB_DEVICE_STATE_REMOVING    ,

-  TUSB_DEVICE_STATE_SAFE_REMOVE ,

-

-  TUSB_DEVICE_STATE_INVALID_PARAMETER

 }tusb_device_state_t;

 

 typedef enum

@@ -358,6 +353,7 @@ typedef struct ATTR_PACKED{
       uint8_t type      :  2; ///< Request type tusb_request_type_t.

       uint8_t direction :  1; ///< Direction type. tusb_dir_t

     } bmRequestType_bit;

+

     uint8_t bmRequestType;

   };

 

@@ -391,9 +387,9 @@ static inline uint8_t edpt_number(uint8_t addr)
   return addr & (~TUSB_DIR_IN_MASK);

 }

 

-static inline uint8_t edpt_addr(uint8_t num, tusb_dir_t dir)

+static inline uint8_t edpt_addr(uint8_t num, uint8_t dir)

 {

-  return num | (dir == TUSB_DIR_IN ? TUSB_DIR_IN_MASK : 0);

+  return num | (dir ? TUSB_DIR_IN_MASK : 0);

 }

 

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