From d7ba86c85eb8cb5b15de53e503e75d04bf0cc836 Mon Sep 17 00:00:00 2001
From: hathach <thachha@live.com>
Date: Sat, 23 Mar 2013 11:34:51 +0700
Subject: refractor - rename usbh_device_info_t.status to state - rename enum
 TUSB_DEVICE_STATUS_* to TUSB_DEVICE_STATE_*

---
 tinyusb/host/hcd.h      |  5 +++++
 tinyusb/host/usbh.c     | 15 ++++++++-------
 tinyusb/host/usbh.h     | 10 +++++-----
 tinyusb/host/usbh_hcd.h |  2 +-
 4 files changed, 19 insertions(+), 13 deletions(-)

(limited to 'tinyusb/host')

diff --git a/tinyusb/host/hcd.h b/tinyusb/host/hcd.h
index 98b5e5c5c..129a4640f 100644
--- a/tinyusb/host/hcd.h
+++ b/tinyusb/host/hcd.h
@@ -66,6 +66,11 @@ typedef struct {
   uint8_t index;
 } pipe_handle_t;
 
+typedef enum {
+  BUS_XFER_COMPLETE,
+  BUS_XFER_ERROR
+}usb_bus_event_t;
+
 //--------------------------------------------------------------------+
 // USBH-HCD API
 //--------------------------------------------------------------------+
diff --git a/tinyusb/host/usbh.c b/tinyusb/host/usbh.c
index dbc0c2765..542089748 100644
--- a/tinyusb/host/usbh.c
+++ b/tinyusb/host/usbh.c
@@ -101,7 +101,7 @@ static inline uint8_t get_configure_number_for_device(tusb_descriptor_device_t*
 tusbh_device_status_t tusbh_device_status_get (tusb_handle_device_t const device_hdl)
 {
   ASSERT(device_hdl <= TUSB_CFG_HOST_DEVICE_MAX, 0);
-  return usbh_device_info_pool[device_hdl].status;
+  return usbh_device_info_pool[device_hdl].state;
 }
 
 //--------------------------------------------------------------------+
@@ -135,6 +135,7 @@ tusb_error_t usbh_init(void)
   return TUSB_ERROR_NONE;
 }
 
+//------------- USBH control transfer -------------//
 // function called within a task, requesting os blocking services, subtask input parameter must be static/global variables
 tusb_error_t usbh_control_xfer_subtask(uint8_t dev_addr, tusb_std_request_t const* p_request, uint8_t* data)
 {
@@ -207,7 +208,7 @@ void usbh_device_unplugged_isr(uint8_t hostid)
           !(usbh_device_info_pool[dev_addr].core_id  == hostid &&
             usbh_device_info_pool[dev_addr].hub_addr == 0 &&
             usbh_device_info_pool[dev_addr].hub_port == 0 &&
-            usbh_device_info_pool[dev_addr].status   != TUSB_DEVICE_STATUS_UNPLUG
+            usbh_device_info_pool[dev_addr].state   != TUSB_DEVICE_STATE_UNPLUG
           )
   )
   {
@@ -226,13 +227,13 @@ void usbh_device_unplugged_isr(uint8_t hostid)
   usbh_pipe_control_close(dev_addr);
 
   // set to REMOVING to end wait for HCD to clean up its cached data for this device
-  usbh_device_info_pool[dev_addr].status = TUSB_DEVICE_STATUS_REMOVING;
+  usbh_device_info_pool[dev_addr].state = TUSB_DEVICE_STATE_REMOVING;
 }
 
 // HCD cleaned up cached data for this device
 void usbh_device_hcd_data_cleaned_up_cb(uint8_t dev_addr)
 {
-  usbh_device_info_pool[dev_addr].status = TUSB_DEVICE_STATUS_UNPLUG;
+  usbh_device_info_pool[dev_addr].state = TUSB_DEVICE_STATE_UNPLUG;
 }
 
 //--------------------------------------------------------------------+
@@ -298,7 +299,7 @@ OSAL_TASK_DECLARE(usbh_enumeration_task)
   usbh_device_info_pool[new_addr].hub_addr = usbh_device_info_pool[0].hub_addr;
   usbh_device_info_pool[new_addr].hub_port = usbh_device_info_pool[0].hub_port;
   usbh_device_info_pool[new_addr].speed    = usbh_device_info_pool[0].speed;
-  usbh_device_info_pool[new_addr].status   = TUSB_DEVICE_STATUS_ADDRESSED;
+  usbh_device_info_pool[new_addr].state   = TUSB_DEVICE_STATE_ADDRESSED;
   usbh_pipe_control_close(0);
 
 //  hcd_port_reset( usbh_device_info_pool[new_addr].core_id ); TODO verified
@@ -408,7 +409,7 @@ OSAL_TASK_DECLARE(usbh_enumeration_task)
     )
   );
 
-  usbh_device_info_pool[new_addr].status = TUSB_DEVICE_STATUS_READY;
+  usbh_device_info_pool[new_addr].state = TUSB_DEVICE_STATE_READY;
   tusbh_device_mount_succeed_cb(new_addr);
 
   // TODO invoke mounted callback
@@ -431,7 +432,7 @@ static inline uint8_t get_new_address(void)
   uint8_t addr;
   for (addr=1; addr <= TUSB_CFG_HOST_DEVICE_MAX; addr++)
   {
-    if (usbh_device_info_pool[addr].status == TUSB_DEVICE_STATUS_UNPLUG)
+    if (usbh_device_info_pool[addr].state == TUSB_DEVICE_STATE_UNPLUG)
       break;
   }
   return addr;
diff --git a/tinyusb/host/usbh.h b/tinyusb/host/usbh.h
index e0a1bc0e7..77a6ebe5d 100644
--- a/tinyusb/host/usbh.h
+++ b/tinyusb/host/usbh.h
@@ -95,13 +95,13 @@
 
 /// Device Status
 enum tusbh_device_status_{
-  TUSB_DEVICE_STATUS_UNPLUG      = 0,
-  TUSB_DEVICE_STATUS_ADDRESSED,
+  TUSB_DEVICE_STATE_UNPLUG      = 0,
+  TUSB_DEVICE_STATE_ADDRESSED,
 
-  TUSB_DEVICE_STATUS_READY, /* Configured */
+  TUSB_DEVICE_STATE_READY, /* Configured */
 
-  TUSB_DEVICE_STATUS_REMOVING,
-  TUSB_DEVICE_STATUS_SAFE_REMOVE,
+  TUSB_DEVICE_STATE_REMOVING,
+  TUSB_DEVICE_STATE_SAFE_REMOVE,
 };
 
 typedef enum {
diff --git a/tinyusb/host/usbh_hcd.h b/tinyusb/host/usbh_hcd.h
index 47f1b32d4..7722fbf21 100644
--- a/tinyusb/host/usbh_hcd.h
+++ b/tinyusb/host/usbh_hcd.h
@@ -90,7 +90,7 @@ typedef struct { // TODO internal structure, re-order members
   //------------- configuration descriptor info -------------//
   uint8_t interface_count; // bNumInterfaces alias
 
-  uint8_t status;          // value from enum tusbh_device_status_
+  uint8_t state;          // value from enum tusbh_device_status_
 
   tusb_std_request_t control_request;
   OSAL_SEM_DEF(semaphore);
-- 
cgit v1.3.1