Merge pull request #27 from hathach/devlocal

clean up & add dcd_get_frame_number()

9 files changed, 45 insertions, 44 deletions

diff --git a/src/class/cdc/cdc_device.c b/src/class/cdc/cdc_device.c
index 7ec7a1eb2..b8678c1c4 100644
--- a/src/class/cdc/cdc_device.c
+++ b/src/class/cdc/cdc_device.c
@@ -93,7 +93,7 @@ CFG_TUSB_MEM_SECTION static cdcd_interface_t _cdcd_itf[CFG_TUD_CDC];
 bool tud_cdc_n_connected(uint8_t itf)

 {

   // DTR (bit 0) active  is considered as connected

-  return BIT_TEST_(_cdcd_itf[itf].line_state, 0);

+  return TU_BIT_TEST(_cdcd_itf[itf].line_state, 0);

 }

 

 uint8_t tud_cdc_n_get_line_state (uint8_t itf)

@@ -349,7 +349,7 @@ bool cdcd_control_request(uint8_t rhport, tusb_control_request_t const * request
       usbd_control_status(rhport, request);

 

       // Invoke callback

-      if ( tud_cdc_line_state_cb) tud_cdc_line_state_cb(itf, BIT_TEST_(request->wValue, 0), BIT_TEST_(request->wValue, 1));

+      if ( tud_cdc_line_state_cb) tud_cdc_line_state_cb(itf, TU_BIT_TEST(request->wValue, 0), TU_BIT_TEST(request->wValue, 1));

     break;

 

     default: return false; // stall unsupported request

diff --git a/src/class/cdc/cdc_rndis_host.h b/src/class/cdc/cdc_rndis_host.h
index 3b92d3f23..730df2e23 100644
--- a/src/class/cdc/cdc_rndis_host.h
+++ b/src/class/cdc/cdc_rndis_host.h
@@ -64,7 +64,7 @@ typedef struct {
 }rndish_data_t;
 
 void rndish_init(void);
-tusb_error_t rndish_open_subtask(uint8_t dev_addr, cdch_data_t *p_cdc) ATTR_WARN_UNUSED_RESULT;
+tusb_error_t rndish_open_subtask(uint8_t dev_addr, cdch_data_t *p_cdc);
 void rndish_xfer_isr(cdch_data_t *p_cdc, pipe_handle_t pipe_hdl, xfer_result_t event, uint32_t xferred_bytes);
 void rndish_close(uint8_t dev_addr);
 
diff --git a/src/class/custom/custom_host.h b/src/class/custom/custom_host.h
index 5f9c25dda..a5fcb6fb4 100644
--- a/src/class/custom/custom_host.h
+++ b/src/class/custom/custom_host.h
@@ -62,7 +62,7 @@ static inline bool tusbh_custom_is_mounted(uint8_t dev_addr, uint16_t vendor_id,
 {
   (void) vendor_id; // TODO check this later
   (void) product_id;
-//  return (tusbh_device_get_mounted_class_flag(dev_addr) & BIT_(TUSB_CLASS_MAPPED_INDEX_END-1) ) != 0;
+//  return (tusbh_device_get_mounted_class_flag(dev_addr) & TU_BIT(TUSB_CLASS_MAPPED_INDEX_END-1) ) != 0;
   return false;
 }
 
@@ -72,7 +72,7 @@ tusb_error_t tusbh_custom_write(uint8_t dev_addr, uint16_t vendor_id, uint16_t p
 #ifdef _TINY_USB_SOURCE_FILE_
 
 void         cush_init(void);
-tusb_error_t cush_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interface_desc, uint16_t *p_length) ATTR_WARN_UNUSED_RESULT;
+tusb_error_t cush_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interface_desc, uint16_t *p_length);
 void         cush_isr(pipe_handle_t pipe_hdl, xfer_result_t event);
 void         cush_close(uint8_t dev_addr);
 
diff --git a/src/class/hid/hid.h b/src/class/hid/hid.h
index 8bfede2da..6abc71e0d 100644
--- a/src/class/hid/hid.h
+++ b/src/class/hid/hid.h
@@ -173,11 +173,11 @@ typedef struct ATTR_PACKED
 /// Standard Mouse Buttons Bitmap

 typedef enum

 {

-	MOUSE_BUTTON_LEFT     = BIT_(0), ///< Left button

-	MOUSE_BUTTON_RIGHT    = BIT_(1), ///< Right button

-	MOUSE_BUTTON_MIDDLE   = BIT_(2), ///< Middle button

-  MOUSE_BUTTON_BACKWARD = BIT_(3), ///< Backward button,

-  MOUSE_BUTTON_FORWARD  = BIT_(4), ///< Forward button,

+  MOUSE_BUTTON_LEFT     = TU_BIT(0), ///< Left button

+  MOUSE_BUTTON_RIGHT    = TU_BIT(1), ///< Right button

+  MOUSE_BUTTON_MIDDLE   = TU_BIT(2), ///< Middle button

+  MOUSE_BUTTON_BACKWARD = TU_BIT(3), ///< Backward button,

+  MOUSE_BUTTON_FORWARD  = TU_BIT(4), ///< Forward button,

 }hid_mouse_button_bm_t;

 

 /// @}

@@ -199,23 +199,23 @@ typedef struct ATTR_PACKED
 /// Keyboard modifier codes bitmap

 typedef enum

 {

-	KEYBOARD_MODIFIER_LEFTCTRL   = BIT_(0), ///< Left Control

-	KEYBOARD_MODIFIER_LEFTSHIFT  = BIT_(1), ///< Left Shift

-	KEYBOARD_MODIFIER_LEFTALT    = BIT_(2), ///< Left Alt

-	KEYBOARD_MODIFIER_LEFTGUI    = BIT_(3), ///< Left Window

-	KEYBOARD_MODIFIER_RIGHTCTRL  = BIT_(4), ///< Right Control

-	KEYBOARD_MODIFIER_RIGHTSHIFT = BIT_(5), ///< Right Shift

-	KEYBOARD_MODIFIER_RIGHTALT   = BIT_(6), ///< Right Alt

-	KEYBOARD_MODIFIER_RIGHTGUI   = BIT_(7)  ///< Right Window

+  KEYBOARD_MODIFIER_LEFTCTRL   = TU_BIT(0), ///< Left Control

+  KEYBOARD_MODIFIER_LEFTSHIFT  = TU_BIT(1), ///< Left Shift

+  KEYBOARD_MODIFIER_LEFTALT    = TU_BIT(2), ///< Left Alt

+  KEYBOARD_MODIFIER_LEFTGUI    = TU_BIT(3), ///< Left Window

+  KEYBOARD_MODIFIER_RIGHTCTRL  = TU_BIT(4), ///< Right Control

+  KEYBOARD_MODIFIER_RIGHTSHIFT = TU_BIT(5), ///< Right Shift

+  KEYBOARD_MODIFIER_RIGHTALT   = TU_BIT(6), ///< Right Alt

+  KEYBOARD_MODIFIER_RIGHTGUI   = TU_BIT(7)  ///< Right Window

 }hid_keyboard_modifier_bm_t;

 

 typedef enum

 {

-  KEYBOARD_LED_NUMLOCK    = BIT_(0), ///< Num Lock LED

-  KEYBOARD_LED_CAPSLOCK   = BIT_(1), ///< Caps Lock LED

-  KEYBOARD_LED_SCROLLLOCK = BIT_(2), ///< Scroll Lock LED

-  KEYBOARD_LED_COMPOSE    = BIT_(3), ///< Composition Mode

-  KEYBOARD_LED_KANA       = BIT_(4) ///< Kana mode

+  KEYBOARD_LED_NUMLOCK    = TU_BIT(0), ///< Num Lock LED

+  KEYBOARD_LED_CAPSLOCK   = TU_BIT(1), ///< Caps Lock LED

+  KEYBOARD_LED_SCROLLLOCK = TU_BIT(2), ///< Scroll Lock LED

+  KEYBOARD_LED_COMPOSE    = TU_BIT(3), ///< Composition Mode

+  KEYBOARD_LED_KANA       = TU_BIT(4) ///< Kana mode

 }hid_keyboard_led_bm_t;

 

 /// @}

diff --git a/src/class/hid/hid_device.c b/src/class/hid/hid_device.c
index 70aa7370d..3b882f705 100644
--- a/src/class/hid/hid_device.c
+++ b/src/class/hid/hid_device.c
@@ -207,6 +207,7 @@ bool tud_hid_keyboard_key_press(char ch)
   return tud_hid_keyboard_keycode(modifier, keycode);

 }

 

+#if 0 // should be at application

 bool tud_hid_keyboard_key_sequence(const char* str, uint32_t interval_ms)

 {

   // Send each key in string

@@ -231,6 +232,7 @@ bool tud_hid_keyboard_key_sequence(const char* str, uint32_t interval_ms)
 

   return true;

 }

+#endif

 

 #endif // CFG_TUD_HID_ASCII_TO_KEYCODE_LOOKUP

 

diff --git a/src/class/hid/hid_device.h b/src/class/hid/hid_device.h
index 885f33443..f3d5087a2 100644
--- a/src/class/hid/hid_device.h
+++ b/src/class/hid/hid_device.h
@@ -95,7 +95,6 @@ static inline bool tud_hid_keyboard_key_release(void) { return tud_hid_keyboard_
 

 #if CFG_TUD_HID_ASCII_TO_KEYCODE_LOOKUP

 bool tud_hid_keyboard_key_press(char ch);

-bool tud_hid_keyboard_key_sequence(const char* str, uint32_t interval_ms);

 

 typedef struct{

   uint8_t shift;

diff --git a/src/class/hid/hid_host.h b/src/class/hid/hid_host.h
index 7336f5ada..9d4b2b5b6 100644
--- a/src/class/hid/hid_host.h
+++ b/src/class/hid/hid_host.h
@@ -67,7 +67,7 @@ extern uint8_t const hid_keycode_to_ascii_tbl[2][128]; // TODO used weak attr if
  * \retval      true if device supports Keyboard interface

  * \retval      false if device does not support Keyboard interface or is not mounted

  */

-bool          tuh_hid_keyboard_is_mounted(uint8_t dev_addr) ATTR_PURE ATTR_WARN_UNUSED_RESULT;

+bool          tuh_hid_keyboard_is_mounted(uint8_t dev_addr);

 

 /** \brief      Check if the interface is currently busy or not

  * \param[in]   dev_addr device address

@@ -76,7 +76,7 @@ bool          tuh_hid_keyboard_is_mounted(uint8_t dev_addr) ATTR_PURE ATTR_WARN_
  * \note        This function is primarily used for polling/waiting result after \ref tuh_hid_keyboard_get_report.

  *              Alternatively, asynchronous event API can be used

  */

-bool          tuh_hid_keyboard_is_busy(uint8_t dev_addr) ATTR_PURE ATTR_WARN_UNUSED_RESULT;

+bool          tuh_hid_keyboard_is_busy(uint8_t dev_addr);

 

 /** \brief        Perform a get report from Keyboard interface

  * \param[in]		  dev_addr device address

@@ -88,7 +88,7 @@ bool          tuh_hid_keyboard_is_busy(uint8_t dev_addr) ATTR_PURE ATTR_WARN_UNU
  * \retval        TUSB_ERROR_INVALID_PARA if input parameters are not correct

  * \note          This function is non-blocking and returns immediately. The result of usb transfer will be reported by the interface's callback function

  */

-tusb_error_t  tuh_hid_keyboard_get_report(uint8_t dev_addr, void * p_report) /*ATTR_WARN_UNUSED_RESULT*/;

+tusb_error_t  tuh_hid_keyboard_get_report(uint8_t dev_addr, void * p_report);

 

 //------------- Application Callback -------------//

 /** \brief      Callback function that is invoked when an transferring event occurred

@@ -132,7 +132,7 @@ void tuh_hid_keyboard_unmounted_cb(uint8_t dev_addr);
  * \retval      true if device supports Mouse interface

  * \retval      false if device does not support Mouse interface or is not mounted

  */

-bool          tuh_hid_mouse_is_mounted(uint8_t dev_addr) ATTR_PURE ATTR_WARN_UNUSED_RESULT;

+bool          tuh_hid_mouse_is_mounted(uint8_t dev_addr);

 

 /** \brief      Check if the interface is currently busy or not

  * \param[in]   dev_addr device address

@@ -141,7 +141,7 @@ bool          tuh_hid_mouse_is_mounted(uint8_t dev_addr) ATTR_PURE ATTR_WARN_UNU
  * \note        This function is primarily used for polling/waiting result after \ref tuh_hid_mouse_get_report.

  *              Alternatively, asynchronous event API can be used

  */

-bool          tuh_hid_mouse_is_busy(uint8_t dev_addr) ATTR_PURE ATTR_WARN_UNUSED_RESULT;

+bool          tuh_hid_mouse_is_busy(uint8_t dev_addr);

 

 /** \brief        Perform a get report from Mouse interface

  * \param[in]		  dev_addr device address

@@ -153,7 +153,7 @@ bool          tuh_hid_mouse_is_busy(uint8_t dev_addr) ATTR_PURE ATTR_WARN_UNUSED
  * \retval        TUSB_ERROR_INVALID_PARA if input parameters are not correct

  * \note          This function is non-blocking and returns immediately. The result of usb transfer will be reported by the interface's callback function

  */

-tusb_error_t  tuh_hid_mouse_get_report(uint8_t dev_addr, void* p_report) /*ATTR_WARN_UNUSED_RESULT*/;

+tusb_error_t  tuh_hid_mouse_get_report(uint8_t dev_addr, void* p_report);

 

 //------------- Application Callback -------------//

 /** \brief      Callback function that is invoked when an transferring event occurred

@@ -192,11 +192,11 @@ void tuh_hid_mouse_unmounted_cb(uint8_t dev_addr);
  *  The interface API includes status checking function, data transferring function and callback functions

  *  @{ */

 

-bool          tuh_hid_generic_is_mounted(uint8_t dev_addr) ATTR_PURE ATTR_WARN_UNUSED_RESULT;

-tusb_error_t  tuh_hid_generic_get_report(uint8_t dev_addr, void* p_report, bool int_on_complete) ATTR_WARN_UNUSED_RESULT;

-tusb_error_t  tuh_hid_generic_set_report(uint8_t dev_addr, void* p_report, bool int_on_complete) ATTR_WARN_UNUSED_RESULT;

-tusb_interface_status_t tuh_hid_generic_get_status(uint8_t dev_addr) ATTR_WARN_UNUSED_RESULT;

-tusb_interface_status_t tuh_hid_generic_set_status(uint8_t dev_addr) ATTR_WARN_UNUSED_RESULT;

+bool          tuh_hid_generic_is_mounted(uint8_t dev_addr);

+tusb_error_t  tuh_hid_generic_get_report(uint8_t dev_addr, void* p_report, bool int_on_complete);

+tusb_error_t  tuh_hid_generic_set_report(uint8_t dev_addr, void* p_report, bool int_on_complete);

+tusb_interface_status_t tuh_hid_generic_get_status(uint8_t dev_addr);

+tusb_interface_status_t tuh_hid_generic_set_status(uint8_t dev_addr);

 

 //------------- Application Callback -------------//

 void tuh_hid_generic_isr(uint8_t dev_addr, xfer_result_t event);

@@ -216,7 +216,7 @@ typedef struct {
 }hidh_interface_info_t;

 

 void hidh_init(void);

-bool hidh_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interface_desc, uint16_t *p_length) ATTR_WARN_UNUSED_RESULT;

+bool hidh_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interface_desc, uint16_t *p_length);

 void hidh_isr(pipe_handle_t pipe_hdl, xfer_result_t event, uint32_t xferred_bytes);

 void hidh_close(uint8_t dev_addr);

 

diff --git a/src/class/msc/msc_device.c b/src/class/msc/msc_device.c
index d4d115bce..5d2758414 100644
--- a/src/class/msc/msc_device.c
+++ b/src/class/msc/msc_device.c
@@ -385,7 +385,7 @@ bool mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t
             p_csw->status = MSC_CSW_STATUS_PASSED;

           }

         }

-        else if ( !BIT_TEST_(p_cbw->dir, 7) )

+        else if ( !TU_BIT_TEST(p_cbw->dir, 7) )

         {

           // OUT transfer

           TU_ASSERT( dcd_edpt_xfer(rhport, p_msc->ep_out, _mscd_buf, p_msc->total_len) );

@@ -426,7 +426,7 @@ bool mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t
 

     case MSC_STAGE_DATA:

       // OUT transfer, invoke callback if needed

-      if ( !BIT_TEST_(p_cbw->dir, 7) )

+      if ( !TU_BIT_TEST(p_cbw->dir, 7) )

       {

         if ( SCSI_CMD_WRITE_10 != p_cbw->command[0] )

         {

diff --git a/src/class/msc/msc_host.h b/src/class/msc/msc_host.h
index 968d221b4..9035cb845 100644
--- a/src/class/msc/msc_host.h
+++ b/src/class/msc/msc_host.h
@@ -60,7 +60,7 @@
  * \retval      true if device supports

  * \retval      false if device does not support or is not mounted

  */

-bool          tuh_msc_is_mounted(uint8_t dev_addr) ATTR_PURE ATTR_WARN_UNUSED_RESULT;

+bool          tuh_msc_is_mounted(uint8_t dev_addr);

 

 /** \brief      Check if the interface is currently busy or not

  * \param[in]   dev_addr device address

@@ -70,7 +70,7 @@ bool          tuh_msc_is_mounted(uint8_t dev_addr) ATTR_PURE ATTR_WARN_UNUSED_RE
  *              can be scheduled. User needs to make sure the corresponding interface is mounted (by \ref tuh_msc_is_mounted)

  *              before calling this function

  */

-bool          tuh_msc_is_busy(uint8_t dev_addr) ATTR_PURE ATTR_WARN_UNUSED_RESULT;

+bool          tuh_msc_is_busy(uint8_t dev_addr);

 

 /** \brief      Get SCSI vendor's name of MassStorage device

  * \param[in]   dev_addr device address

@@ -113,7 +113,7 @@ tusb_error_t tuh_msc_get_capacity(uint8_t dev_addr, uint32_t* p_last_lba, uint32
  * \retval      TUSB_ERROR_INVALID_PARA if input parameters are not correct

  * \note        This function is non-blocking and returns immediately. The result of USB transfer will be reported by the interface's callback function

  */

-tusb_error_t tuh_msc_read10 (uint8_t dev_addr, uint8_t lun, void * p_buffer, uint32_t lba, uint16_t block_count) ATTR_WARN_UNUSED_RESULT;

+tusb_error_t tuh_msc_read10 (uint8_t dev_addr, uint8_t lun, void * p_buffer, uint32_t lba, uint16_t block_count);

 

 /** \brief 			Perform SCSI WRITE 10 command to write data to MassStorage device

  * \param[in]		dev_addr	device address

@@ -127,7 +127,7 @@ tusb_error_t tuh_msc_read10 (uint8_t dev_addr, uint8_t lun, void * p_buffer, uin
  * \retval      TUSB_ERROR_INVALID_PARA if input parameters are not correct

  * \note        This function is non-blocking and returns immediately. The result of USB transfer will be reported by the interface's callback function

  */

-tusb_error_t tuh_msc_write10(uint8_t dev_addr, uint8_t lun, void const * p_buffer, uint32_t lba, uint16_t block_count) ATTR_WARN_UNUSED_RESULT;

+tusb_error_t tuh_msc_write10(uint8_t dev_addr, uint8_t lun, void const * p_buffer, uint32_t lba, uint16_t block_count);

 

 /** \brief 			Perform SCSI REQUEST SENSE command, used to retrieve sense data from MassStorage device

  * \param[in]		dev_addr	device address

@@ -150,11 +150,11 @@ tusb_error_t tuh_msc_request_sense(uint8_t dev_addr, uint8_t lun, uint8_t *p_dat
  * \retval      TUSB_ERROR_INVALID_PARA if input parameters are not correct

  * \note        This function is non-blocking and returns immediately. The result of USB transfer will be reported by the interface's callback function

  */

-tusb_error_t tuh_msc_test_unit_ready(uint8_t dev_addr, uint8_t lun, msc_csw_t * p_csw) ATTR_WARN_UNUSED_RESULT; // TODO to be refractor

+tusb_error_t tuh_msc_test_unit_ready(uint8_t dev_addr, uint8_t lun, msc_csw_t * p_csw); // TODO to be refractor

 

 //tusb_error_t  tusbh_msc_scsi_send(uint8_t dev_addr, uint8_t lun, bool is_direction_in,

 //                                  uint8_t const * p_command, uint8_t cmd_len,

-//                                  uint8_t * p_response, uint32_t resp_len) ATTR_WARN_UNUSED_RESULT;

+//                                  uint8_t * p_response, uint32_t resp_len);

 

 //------------- Application Callback -------------//

 /** \brief 			Callback function that will be invoked when a device with MassStorage interface is mounted