From 5f309413dc8634274ffa68d0e5c7d21e49b246b1 Mon Sep 17 00:00:00 2001 From: hathach Date: Fri, 14 Mar 2014 14:33:50 +0700 Subject: [PATCH] clean more warnings --- demos/host/src/main.c | 2 ++ tinyusb/class/msc_host.c | 2 ++ tinyusb/common/fifo.c | 19 +++++++++++-------- tinyusb/host/hub.c | 24 +++++++++++++++++------- tinyusb/host/usbh.c | 11 +++++++---- 5 files changed, 39 insertions(+), 19 deletions(-) diff --git a/demos/host/src/main.c b/demos/host/src/main.c index e3023bf6..8fd7f7fb 100644 --- a/demos/host/src/main.c +++ b/demos/host/src/main.c @@ -151,6 +151,8 @@ int main(void) //--------------------------------------------------------------------+ OSAL_TASK_FUNCTION( led_blinking_task ) (void* p_task_para) { + (void) p_task_para; // suppress compiler warnings + static uint32_t led_on_mask = 0; OSAL_TASK_LOOP_BEGIN diff --git a/tinyusb/class/msc_host.c b/tinyusb/class/msc_host.c index c21bc4ca..4983a95f 100644 --- a/tinyusb/class/msc_host.c +++ b/tinyusb/class/msc_host.c @@ -184,6 +184,8 @@ tusb_error_t tusbh_msc_read_capacity10(uint8_t dev_addr, uint8_t lun, uint8_t *p tusb_error_t tusbh_msc_request_sense(uint8_t dev_addr, uint8_t lun, uint8_t *p_data) { + (void) lun; // TODO [MSCH] multiple lun support + msch_interface_t* p_msch = &msch_data[dev_addr-1]; //------------- Command Block Wrapper -------------// diff --git a/tinyusb/common/fifo.c b/tinyusb/common/fifo.c index aa597062..b0f82218 100644 --- a/tinyusb/common/fifo.c +++ b/tinyusb/common/fifo.c @@ -38,8 +38,11 @@ #include #include "fifo.h" -static inline void mutex_lock (fifo_t* f) ATTR_ALWAYS_INLINE; -static inline void mutex_unlock (fifo_t* f) ATTR_ALWAYS_INLINE; +//static inline void mutex_lock (fifo_t* f) ATTR_ALWAYS_INLINE; +//static inline void mutex_unlock (fifo_t* f) ATTR_ALWAYS_INLINE; +#define mutex_lock(f) +#define mutex_unlock(f) + static inline bool is_fifo_initalized(fifo_t* f) ATTR_ALWAYS_INLINE; @@ -154,15 +157,15 @@ void fifo_clear(fifo_t *f) Pointer to the FIFO that should be protected */ /**************************************************************************/ -static inline void mutex_lock (fifo_t* f) -{ +//static inline void mutex_lock (fifo_t* f) +//{ // if (f->irq > 0) // { // #if !defined (_TEST_) // NVIC_DisableIRQ(f->irq); // #endif // } -} +//} /**************************************************************************/ /*! @@ -172,15 +175,15 @@ static inline void mutex_lock (fifo_t* f) Pointer to the FIFO that should be protected */ /**************************************************************************/ -static inline void mutex_unlock (fifo_t* f) -{ +//static inline void mutex_unlock (fifo_t* f) +//{ // if (f->irq > 0) // { // #if !defined (_TEST_) // NVIC_EnableIRQ(f->irq); // #endif // } -} +//} static inline bool is_fifo_initalized(fifo_t* f) { diff --git a/tinyusb/host/hub.c b/tinyusb/host/hub.c index 5e6744c2..2a9764bd 100644 --- a/tinyusb/host/hub.c +++ b/tinyusb/host/hub.c @@ -207,19 +207,29 @@ tusb_error_t hub_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t cons OSAL_SUBTASK_END } +// is the response of interrupt endpoint polling void hub_isr(pipe_handle_t pipe_hdl, tusb_event_t event, uint32_t xferred_bytes) { + (void) xferred_bytes; // TODO can be more than 1 for hub with lots of ports + usbh_hub_t * p_hub = &hub_data[pipe_hdl.dev_addr-1]; - for (uint8_t port=1; port <= p_hub->port_number; port++) - { // TODO HUB ignore bit0 hub_status_change - if ( BIT_TEST_(p_hub->status_change, port) ) - { - usbh_hub_port_plugged_isr(pipe_hdl.dev_addr, port); + if ( event == TUSB_EVENT_XFER_COMPLETE ) + { + for (uint8_t port=1; port <= p_hub->port_number; port++) + { // TODO HUB ignore bit0 hub_status_change + if ( BIT_TEST_(p_hub->status_change, port) ) + { + usbh_hub_port_plugged_isr(pipe_hdl.dev_addr, port); + } } + // NOTE: next status transfer is queued by usbh.c after handling this request + } + else + { + // TODO [HUB] check if hub is still plugged before polling status endpoint since failed usually mean hub unplugged +// ASSERT_INT ( TUSB_ERROR_NONE, hcd_pipe_xfer(pipe_hdl, &p_hub->status_change, 1, true) ); } - - // NOTE: next status transfer is queued by usbh.c after handling this request } void hub_close(uint8_t dev_addr) diff --git a/tinyusb/host/usbh.c b/tinyusb/host/usbh.c index e6db37d4..f0920785 100644 --- a/tinyusb/host/usbh.c +++ b/tinyusb/host/usbh.c @@ -240,10 +240,11 @@ static inline tusb_error_t usbh_pipe_control_close(uint8_t dev_addr) return TUSB_ERROR_NONE; } -tusb_interface_status_t usbh_pipe_status_get(pipe_handle_t pipe_hdl) -{ - return TUSB_INTERFACE_STATUS_BUSY; -} +// TODO [USBH] unify pipe status get +//tusb_interface_status_t usbh_pipe_status_get(pipe_handle_t pipe_hdl) +//{ +// return TUSB_INTERFACE_STATUS_BUSY; +//} //--------------------------------------------------------------------+ // USBH-HCD ISR/Callback API @@ -347,6 +348,8 @@ static tusb_error_t enumeration_body_subtask(void); // forever loop cannot have any return at all. OSAL_TASK_FUNCTION(usbh_enumeration_task) (void* p_task_para) { + (void) p_task_para; // suppress compiler warnings + OSAL_TASK_LOOP_BEGIN enumeration_body_subtask();