Merge pull request #13 from hathach/devlocal

add unplugged event for nrf5x

7 files changed, 27 insertions, 27 deletions

diff --git a/src/host/ehci/ehci.c b/src/host/ehci/ehci.c
index c7ff70d70..27808d59b 100644
--- a/src/host/ehci/ehci.c
+++ b/src/host/ehci/ehci.c
@@ -56,12 +56,12 @@
 //--------------------------------------------------------------------+

 // INTERNAL OBJECT & FUNCTION DECLARATION

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

-CFG_TUSB_ATTR_USBRAM STATIC_VAR ehci_data_t ehci_data;

+CFG_TUSB_MEM_SECTION STATIC_VAR ehci_data_t ehci_data;

 

 #if EHCI_PERIODIC_LIST

 

   #if (CFG_TUSB_RHPORT0_MODE & OPT_MODE_HOST)

-  CFG_TUSB_ATTR_USBRAM ATTR_ALIGNED(4096) STATIC_VAR ehci_link_t period_frame_list0[EHCI_FRAMELIST_SIZE];

+  CFG_TUSB_MEM_SECTION ATTR_ALIGNED(4096) STATIC_VAR ehci_link_t period_frame_list0[EHCI_FRAMELIST_SIZE];

 

     #ifndef __ICCARM__ // IAR cannot able to determine the alignment with datalignment pragma

     TU_VERIFY_STATIC( ALIGN_OF(period_frame_list0) == 4096, "Period Framelist must be 4k alginment"); // validation

@@ -69,7 +69,7 @@ CFG_TUSB_ATTR_USBRAM STATIC_VAR ehci_data_t ehci_data;
   #endif

 

   #if (CFG_TUSB_RHPORT1_MODE & OPT_MODE_HOST)

-  CFG_TUSB_ATTR_USBRAM ATTR_ALIGNED(4096) STATIC_VAR ehci_link_t period_frame_list1[EHCI_FRAMELIST_SIZE];

+  CFG_TUSB_MEM_SECTION ATTR_ALIGNED(4096) STATIC_VAR ehci_link_t period_frame_list1[EHCI_FRAMELIST_SIZE];

 

     #ifndef __ICCARM__ // IAR cannot able to determine the alignment with datalignment pragma

     TU_VERIFY_STATIC( ALIGN_OF(period_frame_list1) == 4096, "Period Framelist must be 4k alginment"); // validation

@@ -570,7 +570,7 @@ static void qhd_xfer_complete_isr(ehci_qhd_t * p_qhd)
     if (is_ioc) // end of request

     { // call USBH callback

       usbh_xfer_isr( qhd_create_pipe_handle(p_qhd, xfer_type),

-                     p_qhd->class_code, TUSB_EVENT_XFER_COMPLETE,

+                     p_qhd->class_code, XFER_RESULT_SUCCESS,

                      p_qhd->total_xferred_bytes - (xfer_type == TUSB_XFER_CONTROL ? 8 : 0) ); // subtract setup packet size if control,

       p_qhd->total_xferred_bytes = 0;

     }

@@ -638,15 +638,15 @@ static void qhd_xfer_error_isr(ehci_qhd_t * p_qhd)
         qhd_has_xact_error(p_qhd) )

   { // current qhd has error in transaction

     tusb_xfer_type_t const xfer_type = qhd_get_xfer_type(p_qhd);

-    tusb_event_t error_event;

+    xfer_result_t error_event;

 

     // no error bits are set, endpoint is halted due to STALL

-    error_event = qhd_has_xact_error(p_qhd) ? TUSB_EVENT_XFER_ERROR : TUSB_EVENT_XFER_STALLED;

+    error_event = qhd_has_xact_error(p_qhd) ? XFER_RESULT_FAILED : XFER_RESULT_STALLED;

 

     p_qhd->total_xferred_bytes += p_qhd->p_qtd_list_head->expected_bytes - p_qhd->p_qtd_list_head->total_bytes;

 

 

-//    if ( TUSB_EVENT_XFER_ERROR == error_event )    TU_BREAKPOINT(); // TODO skip unplugged device

+//    if ( XFER_RESULT_FAILED == error_event )    TU_BREAKPOINT(); // TODO skip unplugged device

 

     p_qhd->p_qtd_list_head->used = 0; // free QTD

     qtd_remove_1st_from_qhd(p_qhd);

diff --git a/src/host/hub.c b/src/host/hub.c
index 624e43563..55c8597ad 100644
--- a/src/host/hub.c
+++ b/src/host/hub.c
@@ -58,8 +58,8 @@ typedef struct {
   uint8_t status_change; // data from status change interrupt endpoint

 }usbh_hub_t;

 

-CFG_TUSB_ATTR_USBRAM STATIC_VAR usbh_hub_t hub_data[CFG_TUSB_HOST_DEVICE_MAX];

-ATTR_ALIGNED(4) CFG_TUSB_ATTR_USBRAM STATIC_VAR uint8_t hub_enum_buffer[sizeof(descriptor_hub_desc_t)];

+CFG_TUSB_MEM_SECTION STATIC_VAR usbh_hub_t hub_data[CFG_TUSB_HOST_DEVICE_MAX];

+ATTR_ALIGNED(4) CFG_TUSB_MEM_SECTION STATIC_VAR uint8_t hub_enum_buffer[sizeof(descriptor_hub_desc_t)];

 

 //OSAL_SEM_DEF(hub_enum_semaphore);

 //static osal_semaphore_handle_t hub_enum_sem_hdl;

@@ -209,13 +209,13 @@ tusb_error_t hub_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_i
 }

 

 // is the response of interrupt endpoint polling

-void hub_isr(pipe_handle_t pipe_hdl, tusb_event_t event, uint32_t xferred_bytes)

+void hub_isr(pipe_handle_t pipe_hdl, xfer_result_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];

 

-  if ( event == TUSB_EVENT_XFER_COMPLETE )

+  if ( event == XFER_RESULT_SUCCESS )

   {

     for (uint8_t port=1; port <= p_hub->port_number; port++)

     { // TODO HUB ignore bit0 hub_status_change

diff --git a/src/host/hub.h b/src/host/hub.h
index 67c02f2e3..9376a2698 100644
--- a/src/host/hub.h
+++ b/src/host/hub.h
@@ -196,7 +196,7 @@ tusb_error_t hub_status_pipe_queue(uint8_t dev_addr);
 

 void         hub_init(void);

 tusb_error_t hub_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interface_desc, uint16_t *p_length) ATTR_WARN_UNUSED_RESULT;

-void         hub_isr(pipe_handle_t pipe_hdl, tusb_event_t event, uint32_t xferred_bytes);

+void         hub_isr(pipe_handle_t pipe_hdl, xfer_result_t event, uint32_t xferred_bytes);

 void         hub_close(uint8_t dev_addr);

 

 #endif

diff --git a/src/host/ohci/ohci.c b/src/host/ohci/ohci.c
index b9183a025..91d9b6243 100644
--- a/src/host/ohci/ohci.c
+++ b/src/host/ohci/ohci.c
@@ -142,7 +142,7 @@ enum {
 //--------------------------------------------------------------------+

 // INTERNAL OBJECT & FUNCTION DECLARATION

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

-CFG_TUSB_ATTR_USBRAM ATTR_ALIGNED(256) STATIC_VAR ohci_data_t ohci_data;

+CFG_TUSB_MEM_SECTION ATTR_ALIGNED(256) STATIC_VAR ohci_data_t ohci_data;

 

 static ohci_ed_t * const p_ed_head[] =

 {

@@ -617,11 +617,11 @@ static void done_queue_isr(uint8_t hostid)
     // TODO check if td_head is iso td

     //------------- Non ISO transfer -------------//

     ohci_gtd_t * const p_qtd = (ohci_gtd_t *) td_head;

-    tusb_event_t const event = (p_qtd->condition_code == OHCI_CCODE_NO_ERROR) ? TUSB_EVENT_XFER_COMPLETE :

-                               (p_qtd->condition_code == OHCI_CCODE_STALL) ? TUSB_EVENT_XFER_STALLED : TUSB_EVENT_XFER_ERROR;

+    xfer_result_t const event = (p_qtd->condition_code == OHCI_CCODE_NO_ERROR) ? XFER_RESULT_SUCCESS :

+                               (p_qtd->condition_code == OHCI_CCODE_STALL) ? XFER_RESULT_STALLED : XFER_RESULT_FAILED;

 

     p_qtd->used = 0; // free TD

-    if ( (p_qtd->delay_interrupt == OHCI_INT_ON_COMPLETE_YES) || (event != TUSB_EVENT_XFER_COMPLETE) )

+    if ( (p_qtd->delay_interrupt == OHCI_INT_ON_COMPLETE_YES) || (event != XFER_RESULT_SUCCESS) )

     {

       ohci_ed_t * const p_ed  = gtd_get_ed(p_qtd);

 

@@ -634,11 +634,11 @@ static void done_queue_isr(uint8_t hostid)
       // --> HC will not process Control list (due to service ratio when Bulk list not empty)

       // To walk-around this, the halted ED will have TailP = HeadP (empty list condition), when clearing halt

       // the TailP must be set back to NULL for processing remaining TDs

-      if ((event != TUSB_EVENT_XFER_COMPLETE))

+      if ((event != XFER_RESULT_SUCCESS))

       {

         p_ed->td_tail.address &= 0x0Ful;

         p_ed->td_tail.address |= tu_align16(p_ed->td_head.address); // mark halted EP as empty queue

-        if ( event == TUSB_EVENT_XFER_STALLED ) p_ed->is_stalled = 1;

+        if ( event == XFER_RESULT_STALLED ) p_ed->is_stalled = 1;

       }

 

       pipe_handle_t pipe_hdl =

diff --git a/src/host/usbh.c b/src/host/usbh.c
index f996d7a70..a0aab3b96 100644
--- a/src/host/usbh.c
+++ b/src/host/usbh.c
@@ -109,13 +109,13 @@ enum { USBH_CLASS_DRIVER_COUNT = sizeof(usbh_class_drivers) / sizeof(host_class_
 //--------------------------------------------------------------------+

 // INTERNAL OBJECT & FUNCTION DECLARATION

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

-CFG_TUSB_ATTR_USBRAM usbh_device_info_t usbh_devices[CFG_TUSB_HOST_DEVICE_MAX+1]; // including zero-address

+CFG_TUSB_MEM_SECTION usbh_device_info_t usbh_devices[CFG_TUSB_HOST_DEVICE_MAX+1]; // including zero-address

 

 //------------- Enumeration Task Data -------------/

 enum { ENUM_QUEUE_DEPTH = 16 };

 

 STATIC_VAR osal_queue_t enum_queue_hdl;

-CFG_TUSB_ATTR_USBRAM ATTR_ALIGNED(4) STATIC_VAR uint8_t enum_data_buffer[CFG_TUSB_HOST_ENUM_BUFFER_SIZE];

+CFG_TUSB_MEM_SECTION ATTR_ALIGNED(4) STATIC_VAR uint8_t enum_data_buffer[CFG_TUSB_HOST_ENUM_BUFFER_SIZE];

 

 //------------- Reporter Task Data -------------//

 

@@ -199,7 +199,7 @@ tusb_error_t usbh_control_xfer_subtask(uint8_t dev_addr, uint8_t bmRequestType,
 #ifndef _TEST_

   usbh_devices[dev_addr].control.pipe_status = 0;

 #else

-  usbh_devices[dev_addr].control.pipe_status = TUSB_EVENT_XFER_COMPLETE; // in Test project, mark as complete immediately

+  usbh_devices[dev_addr].control.pipe_status = XFER_RESULT_SUCCESS; // in Test project, mark as complete immediately

 #endif

 

   error = hcd_pipe_control_xfer(dev_addr, &usbh_devices[dev_addr].control.request, data);

@@ -207,11 +207,11 @@ tusb_error_t usbh_control_xfer_subtask(uint8_t dev_addr, uint8_t bmRequestType,
   osal_mutex_release(usbh_devices[dev_addr].control.mutex_hdl);

 

   STASK_ASSERT_ERR(error);

-  if (TUSB_EVENT_XFER_STALLED == usbh_devices[dev_addr].control.pipe_status) STASK_RETURN(TUSB_ERROR_USBH_XFER_STALLED);

-  if (TUSB_EVENT_XFER_ERROR   == usbh_devices[dev_addr].control.pipe_status) STASK_RETURN(TUSB_ERROR_USBH_XFER_FAILED);

+  if (XFER_RESULT_STALLED == usbh_devices[dev_addr].control.pipe_status) STASK_RETURN(TUSB_ERROR_USBH_XFER_STALLED);

+  if (XFER_RESULT_FAILED   == usbh_devices[dev_addr].control.pipe_status) STASK_RETURN(TUSB_ERROR_USBH_XFER_FAILED);

 

 //  STASK_ASSERT_HDLR(TUSB_ERROR_NONE == error &&

-//                              TUSB_EVENT_XFER_COMPLETE == usbh_devices[dev_addr].control.pipe_status,

+//                              XFER_RESULT_SUCCESS == usbh_devices[dev_addr].control.pipe_status,

 //                              tuh_device_mount_failed_cb(TUSB_ERROR_USBH_MOUNT_DEVICE_NOT_RESPOND, NULL) );

 

   OSAL_SUBTASK_END

@@ -256,7 +256,7 @@ static inline uint8_t std_class_code_to_index(uint8_t std_class_code)
 // USBH-HCD ISR/Callback API

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

 // interrupt caused by a TD (with IOC=1) in pipe of class class_code

-void usbh_xfer_isr(pipe_handle_t pipe_hdl, uint8_t class_code, tusb_event_t event, uint32_t xferred_bytes)

+void usbh_xfer_isr(pipe_handle_t pipe_hdl, uint8_t class_code, xfer_result_t event, uint32_t xferred_bytes)

 {

   uint8_t class_index = std_class_code_to_index(class_code);

   if (TUSB_XFER_CONTROL == pipe_hdl.xfer_type)

diff --git a/src/host/usbh.h b/src/host/usbh.h
index 5aaeb4186..22fdef162 100644
--- a/src/host/usbh.h
+++ b/src/host/usbh.h
@@ -66,7 +66,7 @@ typedef enum tusb_interface_status_{
 typedef struct {
   void (* const init) (void);
   tusb_error_t (* const open_subtask)(uint8_t, tusb_desc_interface_t const *, uint16_t*);
-  void (* const isr) (pipe_handle_t, tusb_event_t, uint32_t);
+  void (* const isr) (pipe_handle_t, xfer_result_t, uint32_t);
   void (* const close) (uint8_t);
 } host_class_driver_t;
 //--------------------------------------------------------------------+
diff --git a/src/host/usbh_hcd.h b/src/host/usbh_hcd.h
index 1c2c4ad0b..f6b72273a 100644
--- a/src/host/usbh_hcd.h
+++ b/src/host/usbh_hcd.h
@@ -101,7 +101,7 @@ extern usbh_device_info_t usbh_devices[CFG_TUSB_HOST_DEVICE_MAX+1]; // including
 //--------------------------------------------------------------------+
 // callback from HCD ISR
 //--------------------------------------------------------------------+
-void usbh_xfer_isr(pipe_handle_t pipe_hdl, uint8_t class_code, tusb_event_t event, uint32_t xferred_bytes);
+void usbh_xfer_isr(pipe_handle_t pipe_hdl, uint8_t class_code, xfer_result_t event, uint32_t xferred_bytes);
 void usbh_hcd_rhport_plugged_isr(uint8_t hostid);
 void usbh_hcd_rhport_unplugged_isr(uint8_t hostid);