diff options
| author | hathach <[email protected]> | 2018-12-12 16:41:12 +0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-12-12 16:41:12 +0700 |
| commit | 908931320e206e6ae6610cfc56b2a0950f252172 (patch) | |
| tree | 8ae966733204841d54cf15f3e1154699cc884526 /src/common | |
| parent | b7ad49332cd9a5539e35a75785adb5ca2e79715a (diff) | |
| parent | 142f274c1d0cef2a1a5623885be29e2fecef4445 (diff) | |
Merge pull request #21 from hathach/devlocal
Devlocal
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/tusb_types.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/common/tusb_types.h b/src/common/tusb_types.h index d0a10acef..6f0167898 100644 --- a/src/common/tusb_types.h +++ b/src/common/tusb_types.h @@ -181,7 +181,6 @@ enum { typedef enum
{
TUSB_DEVICE_STATE_UNPLUG = 0 ,
- TUSB_DEVICE_STATE_ADDRESSED ,
TUSB_DEVICE_STATE_CONFIGURED ,
TUSB_DEVICE_STATE_SUSPENDED ,
}tusb_device_state_t;
@@ -376,18 +375,18 @@ static inline uint8_t bm_request_type(uint8_t direction, uint8_t type, uint8_t r //--------------------------------------------------------------------+
// Get direction from Endpoint address
-static inline tusb_dir_t edpt_dir(uint8_t addr)
+static inline tusb_dir_t tu_edpt_dir(uint8_t addr)
{
return (addr & TUSB_DIR_IN_MASK) ? TUSB_DIR_IN : TUSB_DIR_OUT;
}
// Get Endpoint number from address
-static inline uint8_t edpt_number(uint8_t addr)
+static inline uint8_t tu_edpt_number(uint8_t addr)
{
return addr & (~TUSB_DIR_IN_MASK);
}
-static inline uint8_t edpt_addr(uint8_t num, uint8_t dir)
+static inline uint8_t tu_edpt_addr(uint8_t num, uint8_t dir)
{
return num | (dir ? TUSB_DIR_IN_MASK : 0);
}
@@ -395,19 +394,20 @@ static inline uint8_t edpt_addr(uint8_t num, uint8_t dir) //--------------------------------------------------------------------+
// Descriptor helper
//--------------------------------------------------------------------+
-static inline uint8_t const * descriptor_next(uint8_t const p_desc[])
+static inline uint8_t const * tu_desc_next(void const* desc)
{
- return p_desc + p_desc[DESC_OFFSET_LEN];
+ uint8_t const* desc8 = (uint8_t const*) desc;
+ return desc8 + desc8[DESC_OFFSET_LEN];
}
-static inline uint8_t descriptor_type(uint8_t const p_desc[])
+static inline uint8_t tu_desc_type(void const* desc)
{
- return p_desc[DESC_OFFSET_TYPE];
+ return ((uint8_t const*) desc)[DESC_OFFSET_TYPE];
}
-static inline uint8_t descriptor_len(uint8_t const p_desc[])
+static inline uint8_t tu_desc_len(void const* desc)
{
- return p_desc[DESC_OFFSET_LEN];
+ return ((uint8_t const*) desc)[DESC_OFFSET_LEN];
}
// Length of the string descriptors in bytes with slen characters
|