final clean up
This commit is contained in:
parent
c5f6b57755
commit
51c6444e1d
|
@ -84,8 +84,6 @@
|
||||||
// Endian conversion use well-known host to network (big endian) naming
|
// Endian conversion use well-known host to network (big endian) naming
|
||||||
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
|
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
|
||||||
#define TU_BYTE_ORDER TU_LITTLE_ENDIAN
|
#define TU_BYTE_ORDER TU_LITTLE_ENDIAN
|
||||||
#define TU_ENDIAN_LITTLE_BEGIN
|
|
||||||
#define TU_ENDIAN_LITTLE_END
|
|
||||||
#else
|
#else
|
||||||
#define TU_BYTE_ORDER TU_BIG_ENDIAN
|
#define TU_BYTE_ORDER TU_BIG_ENDIAN
|
||||||
#endif
|
#endif
|
||||||
|
@ -153,21 +151,13 @@
|
||||||
// Endian conversion use well-known host to network (big endian) naming
|
// Endian conversion use well-known host to network (big endian) naming
|
||||||
#if defined(__LIT)
|
#if defined(__LIT)
|
||||||
#define TU_BYTE_ORDER TU_LITTLE_ENDIAN
|
#define TU_BYTE_ORDER TU_LITTLE_ENDIAN
|
||||||
#define TU_ENDIAN_LITTLE_BEGIN
|
|
||||||
#define TU_ENDIAN_LITTLE_END
|
|
||||||
#else
|
#else
|
||||||
#define TU_BYTE_ORDER TU_BIG_ENDIAN
|
#define TU_BYTE_ORDER TU_BIG_ENDIAN
|
||||||
#define TU_ENDIAN_LITTLE_BEGIN _Pragma("endian little")
|
|
||||||
#define TU_ENDIAN_LITTLE_END _Pragma("endian")
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define TU_BSWAP16(u16) ((unsigned short)_builtin_revw((unsigned long)u16))
|
#define TU_BSWAP16(u16) ((unsigned short)_builtin_revw((unsigned long)u16))
|
||||||
#define TU_BSWAP32(u32) (_builtin_revl(u32))
|
#define TU_BSWAP32(u32) (_builtin_revl(u32))
|
||||||
|
|
||||||
/* activate the "aligned" emulation, because this toolchain does not know
|
|
||||||
the aligned attribute (or something similar yet) */
|
|
||||||
#define TU_HAS_NO_ATTR_ALIGNED
|
|
||||||
|
|
||||||
#else
|
#else
|
||||||
#error "Compiler attribute porting is required"
|
#error "Compiler attribute porting is required"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1156,14 +1156,14 @@ void usbd_defer_func(osal_task_func_t func, void* param, bool in_isr)
|
||||||
|
|
||||||
bool usbd_edpt_open(uint8_t rhport, tusb_desc_endpoint_t const * desc_ep)
|
bool usbd_edpt_open(uint8_t rhport, tusb_desc_endpoint_t const * desc_ep)
|
||||||
{
|
{
|
||||||
TU_LOG2(" Open EP %02X with Size = %u\r\n", desc_ep->bEndpointAddress, desc_ep->wMaxPacketSize.size);
|
TU_LOG2(" Open EP %02X with Size = %u\r\n", desc_ep->bEndpointAddress, tu_le16toh(desc_ep->wMaxPacketSize.size));
|
||||||
|
|
||||||
switch (desc_ep->bmAttributes.xfer)
|
switch (desc_ep->bmAttributes.xfer)
|
||||||
{
|
{
|
||||||
case TUSB_XFER_ISOCHRONOUS:
|
case TUSB_XFER_ISOCHRONOUS:
|
||||||
{
|
{
|
||||||
uint16_t const max_epsize = (_usbd_dev.speed == TUSB_SPEED_HIGH ? 1024 : 1023);
|
uint16_t const max_epsize = (_usbd_dev.speed == TUSB_SPEED_HIGH ? 1024 : 1023);
|
||||||
TU_ASSERT(desc_ep->wMaxPacketSize.size <= max_epsize);
|
TU_ASSERT(tu_le16toh(desc_ep->wMaxPacketSize.size) <= max_epsize);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
|
@ -55,17 +55,9 @@ typedef struct
|
||||||
|
|
||||||
static usbd_control_xfer_t _ctrl_xfer;
|
static usbd_control_xfer_t _ctrl_xfer;
|
||||||
|
|
||||||
#if defined(TU_HAS_NO_ATTR_ALIGNED)
|
|
||||||
// Helper union to overcome the lack of the alignment attribute/pragma
|
|
||||||
static union {
|
|
||||||
uint16_t : (sizeof(uint16_t) * 8); // Alignment of at least the size of the used type
|
|
||||||
uint8_t _usbd_ctrl_buf[CFG_TUD_ENDPOINT0_SIZE];
|
|
||||||
} Align_usbd_ctrl_buf_;
|
|
||||||
static uint8_t *_usbd_ctrl_buf = (uint8_t*)&Align_usbd_ctrl_buf_;
|
|
||||||
#else
|
|
||||||
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN
|
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN
|
||||||
static uint8_t _usbd_ctrl_buf[CFG_TUD_ENDPOINT0_SIZE];
|
static uint8_t _usbd_ctrl_buf[CFG_TUD_ENDPOINT0_SIZE];
|
||||||
#endif
|
|
||||||
|
|
||||||
//--------------------------------------------------------------------+
|
//--------------------------------------------------------------------+
|
||||||
// Application API
|
// Application API
|
||||||
|
|
|
@ -51,7 +51,6 @@ static inline void osal_task_delay(uint32_t msec)
|
||||||
typedef StaticSemaphore_t osal_semaphore_def_t;
|
typedef StaticSemaphore_t osal_semaphore_def_t;
|
||||||
typedef SemaphoreHandle_t osal_semaphore_t;
|
typedef SemaphoreHandle_t osal_semaphore_t;
|
||||||
|
|
||||||
#if (configSUPPORT_STATIC_ALLOCATION == 1) //FIXME Only static API supported
|
|
||||||
static inline osal_semaphore_t osal_semaphore_create(osal_semaphore_def_t* semdef)
|
static inline osal_semaphore_t osal_semaphore_create(osal_semaphore_def_t* semdef)
|
||||||
{
|
{
|
||||||
return xSemaphoreCreateBinaryStatic(semdef);
|
return xSemaphoreCreateBinaryStatic(semdef);
|
||||||
|
@ -77,7 +76,6 @@ static inline bool osal_semaphore_post(osal_semaphore_t sem_hdl, bool in_isr)
|
||||||
return res != 0;
|
return res != 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
static inline bool osal_semaphore_wait (osal_semaphore_t sem_hdl, uint32_t msec)
|
static inline bool osal_semaphore_wait (osal_semaphore_t sem_hdl, uint32_t msec)
|
||||||
{
|
{
|
||||||
|
@ -98,12 +96,7 @@ typedef SemaphoreHandle_t osal_mutex_t;
|
||||||
|
|
||||||
static inline osal_mutex_t osal_mutex_create(osal_mutex_def_t* mdef)
|
static inline osal_mutex_t osal_mutex_create(osal_mutex_def_t* mdef)
|
||||||
{
|
{
|
||||||
#if (configSUPPORT_STATIC_ALLOCATION == 0) //FIXME Only static API supported
|
|
||||||
(void)mdef;
|
|
||||||
return xSemaphoreCreateMutex();
|
|
||||||
#else
|
|
||||||
return xSemaphoreCreateMutexStatic(mdef);
|
return xSemaphoreCreateMutexStatic(mdef);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline bool osal_mutex_lock (osal_mutex_t mutex_hdl, uint32_t msec)
|
static inline bool osal_mutex_lock (osal_mutex_t mutex_hdl, uint32_t msec)
|
||||||
|
@ -138,11 +131,7 @@ typedef QueueHandle_t osal_queue_t;
|
||||||
|
|
||||||
static inline osal_queue_t osal_queue_create(osal_queue_def_t* qdef)
|
static inline osal_queue_t osal_queue_create(osal_queue_def_t* qdef)
|
||||||
{
|
{
|
||||||
#if defined(__Tx36V5_Maincard__)
|
|
||||||
return xQueueCreate(qdef->depth, qdef->item_sz);
|
|
||||||
#else
|
|
||||||
return xQueueCreateStatic(qdef->depth, qdef->item_sz, (uint8_t*) qdef->buf, &qdef->sq);
|
return xQueueCreateStatic(qdef->depth, qdef->item_sz, (uint8_t*) qdef->buf, &qdef->sq);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline bool osal_queue_receive(osal_queue_t qhdl, void* data)
|
static inline bool osal_queue_receive(osal_queue_t qhdl, void* data)
|
||||||
|
@ -150,19 +139,6 @@ static inline bool osal_queue_receive(osal_queue_t qhdl, void* data)
|
||||||
return xQueueReceive(qhdl, data, portMAX_DELAY);
|
return xQueueReceive(qhdl, data, portMAX_DELAY);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(__Tx36V5_Maincard__)
|
|
||||||
extern BaseType_t UsbTaskWoken;
|
|
||||||
static inline bool osal_queue_send(osal_queue_t qhdl, void const * data, bool in_isr)
|
|
||||||
{
|
|
||||||
if (!in_isr) {
|
|
||||||
return(xQueueSendToBack(qhdl, data, OSAL_TIMEOUT_WAIT_FOREVER));
|
|
||||||
|
|
||||||
} else {
|
|
||||||
BaseType_t res = xQueueSendToBackFromISR(qhdl, data, &UsbTaskWoken);
|
|
||||||
return(res != 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
static inline bool osal_queue_send(osal_queue_t qhdl, void const * data, bool in_isr)
|
static inline bool osal_queue_send(osal_queue_t qhdl, void const * data, bool in_isr)
|
||||||
{
|
{
|
||||||
if ( !in_isr )
|
if ( !in_isr )
|
||||||
|
@ -183,7 +159,6 @@ static inline bool osal_queue_send(osal_queue_t qhdl, void const * data, bool in
|
||||||
return res != 0;
|
return res != 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
static inline bool osal_queue_empty(osal_queue_t qhdl)
|
static inline bool osal_queue_empty(osal_queue_t qhdl)
|
||||||
{
|
{
|
||||||
|
|
|
@ -518,22 +518,13 @@ static void process_set_address(uint8_t rhport)
|
||||||
{
|
{
|
||||||
const uint32_t addr = USB0.USBADDR.BIT.USBADDR;
|
const uint32_t addr = USB0.USBADDR.BIT.USBADDR;
|
||||||
if (!addr) return;
|
if (!addr) return;
|
||||||
#if defined(__CCRX__)
|
|
||||||
tusb_control_request_t setup_packet;
|
|
||||||
setup_packet.bmRequestType = 0;
|
|
||||||
setup_packet.bRequest = 5;
|
|
||||||
setup_packet.wValue = addr;
|
|
||||||
setup_packet.wIndex = 0;
|
|
||||||
setup_packet.wLength = 0;
|
|
||||||
#else
|
|
||||||
const tusb_control_request_t setup_packet = {
|
const tusb_control_request_t setup_packet = {
|
||||||
.bmRequestType = 0,
|
.bmRequestType = { 0 }, /* Note: CCRX needs the braces over this struct member */
|
||||||
.bRequest = 5,
|
.bRequest = 5,
|
||||||
.wValue = addr,
|
.wValue = addr,
|
||||||
.wIndex = 0,
|
.wIndex = 0,
|
||||||
.wLength = 0,
|
.wLength = 0,
|
||||||
};
|
};
|
||||||
#endif
|
|
||||||
dcd_event_setup_received(rhport, (const uint8_t*)&setup_packet, true);
|
dcd_event_setup_received(rhport, (const uint8_t*)&setup_packet, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue