Merge pull request #13 from hathach/devlocal

add unplugged event for nrf5x

5 files changed, 21 insertions, 27 deletions

diff --git a/src/class/hid/hid.h b/src/class/hid/hid.h
index 0008e47fb..8bfede2da 100644
--- a/src/class/hid/hid.h
+++ b/src/class/hid/hid.h
@@ -49,10 +49,6 @@
  extern "C" {

 #endif

 

-#pragma GCC diagnostic push

-#pragma GCC diagnostic ignored "-Wpacked"

-#pragma GCC diagnostic ignored "-Wattributes"

-

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

 // Common Definitions

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

@@ -613,8 +609,6 @@ enum
   HID_USAGE_CONSUMER_AC_PAN                            = 0x0238,

 };

 

-#pragma GCC diagnostic pop

-

 #ifdef __cplusplus

  }

 #endif

diff --git a/src/class/hid/hid_device.c b/src/class/hid/hid_device.c
index b5586a488..f1ecec3c7 100644
--- a/src/class/hid/hid_device.c
+++ b/src/class/hid/hid_device.c
@@ -91,7 +91,7 @@ typedef struct
   hidd_interface_t* itf;

 } hidd_report_t ;

 

-CFG_TUSB_ATTR_USBRAM static hidd_interface_t _hidd_itf[ITF_COUNT];

+CFG_TUSB_MEM_SECTION static hidd_interface_t _hidd_itf[ITF_COUNT];

 

 

 #if CFG_TUD_HID_KEYBOARD

@@ -510,7 +510,7 @@ bool hidd_control_request_complete(uint8_t rhport, tusb_control_request_t const
   return true;

 }

 

-tusb_error_t hidd_xfer_cb(uint8_t rhport, uint8_t edpt_addr, tusb_event_t event, uint32_t xferred_bytes)

+tusb_error_t hidd_xfer_cb(uint8_t rhport, uint8_t edpt_addr, xfer_result_t event, uint32_t xferred_bytes)

 {

   // nothing to do

   return TUSB_ERROR_NONE;

diff --git a/src/class/hid/hid_device.h b/src/class/hid/hid_device.h
index 7f8cd0fa7..7aff7f34d 100644
--- a/src/class/hid/hid_device.h
+++ b/src/class/hid/hid_device.h
@@ -110,7 +110,7 @@ extern const hid_ascii_to_keycode_entry_t HID_ASCII_TO_KEYCODE[128];
 

 /** Callback invoked when USB host request \ref HID_REQ_CONTROL_GET_REPORT.

  * \param[in]   report_type specify which report (INPUT, OUTPUT, FEATURE) that host requests

- * \param[out]  buffer data that application need to update, value must be accessible by USB controller (see \ref CFG_TUSB_ATTR_USBRAM)

+ * \param[out]  buffer data that application need to update, value must be accessible by USB controller (see \ref CFG_TUSB_MEM_SECTION)

  * \param[in]   reqlen  number of bytes that host requested

  * \retval      non-zero Actual number of bytes in the response's buffer.

  * \retval      zero  indicates the current request is not supported. Tinyusb device stack will reject the request by

@@ -173,7 +173,7 @@ static inline bool tud_hid_mouse_button_release(void)
 /**

  * Callback function that is invoked when USB host request \ref HID_REQ_CONTROL_GET_REPORT.

  * \param[in]   report_type specify which report (INPUT, OUTPUT, FEATURE) that host requests

- * \param[out]  buffer  buffer that application need to update, value must be accessible by USB controller (see \ref CFG_TUSB_ATTR_USBRAM)

+ * \param[out]  buffer  buffer that application need to update, value must be accessible by USB controller (see \ref CFG_TUSB_MEM_SECTION)

  * \param[in]   reqlen  number of bytes that host requested

  * \retval      non-zero Actual number of bytes in the response's buffer.

  * \retval      zero  indicates the current request is not supported. Tinyusb device stack will reject the request by

@@ -380,7 +380,7 @@ void hidd_init(void);
 tusb_error_t hidd_open(uint8_t rhport, tusb_desc_interface_t const * p_interface_desc, uint16_t *p_length);

 bool hidd_control_request(uint8_t rhport, tusb_control_request_t const * p_request);

 bool hidd_control_request_complete (uint8_t rhport, tusb_control_request_t const * p_request);

-tusb_error_t hidd_xfer_cb(uint8_t rhport, uint8_t edpt_addr, tusb_event_t event, uint32_t xferred_bytes);

+tusb_error_t hidd_xfer_cb(uint8_t rhport, uint8_t edpt_addr, xfer_result_t event, uint32_t xferred_bytes);

 void hidd_reset(uint8_t rhport);

 

 #endif

diff --git a/src/class/hid/hid_host.c b/src/class/hid/hid_host.c
index 518297eec..6aa0748df 100644
--- a/src/class/hid/hid_host.c
+++ b/src/class/hid/hid_host.c
@@ -177,7 +177,7 @@ void hidh_init(void)
 }

 

 #if 0

-CFG_TUSB_ATTR_USBRAM uint8_t report_descriptor[256];

+CFG_TUSB_MEM_SECTION uint8_t report_descriptor[256];

 #endif

 

 tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interface_desc, uint16_t *p_length)

@@ -251,7 +251,7 @@ tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_
   OSAL_SUBTASK_END

 }

 

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

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

 {

   (void) xferred_bytes; // TODO may need to use this para later

 

diff --git a/src/class/hid/hid_host.h b/src/class/hid/hid_host.h
index b93bcdccb..cb0230e8a 100644
--- a/src/class/hid/hid_host.h
+++ b/src/class/hid/hid_host.h
@@ -80,7 +80,7 @@ bool          tuh_hid_keyboard_is_busy(uint8_t dev_addr) ATTR_PURE ATTR_WARN_UNU
 

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

  * \param[in]		  dev_addr device address

- * \param[in,out] p_report address that is used to store data from device. Must be accessible by usb controller (see \ref CFG_TUSB_ATTR_USBRAM)

+ * \param[in,out] p_report address that is used to store data from device. Must be accessible by usb controller (see \ref CFG_TUSB_MEM_SECTION)

  * \returns       \ref tusb_error_t type to indicate success or error condition.

  * \retval        TUSB_ERROR_NONE on success

  * \retval        TUSB_ERROR_INTERFACE_IS_BUSY if the interface is already transferring data with device

@@ -93,14 +93,14 @@ tusb_error_t  tuh_hid_keyboard_get_report(uint8_t dev_addr, void * p_report) /*A
 //------------- Application Callback -------------//

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

  * \param[in]		dev_addr	Address of device

- * \param[in]   event an value from \ref tusb_event_t

+ * \param[in]   event an value from \ref xfer_result_t

  * \note        event can be one of following

- *              - TUSB_EVENT_XFER_COMPLETE : previously scheduled transfer completes successfully.

- *              - TUSB_EVENT_XFER_ERROR   : previously scheduled transfer encountered a transaction error.

- *              - TUSB_EVENT_XFER_STALLED : previously scheduled transfer is stalled by device.

+ *              - XFER_RESULT_SUCCESS : previously scheduled transfer completes successfully.

+ *              - XFER_RESULT_FAILED   : previously scheduled transfer encountered a transaction error.

+ *              - XFER_RESULT_STALLED : previously scheduled transfer is stalled by device.

  * \note        Application should schedule the next report by calling \ref tuh_hid_keyboard_get_report within this callback

  */

-void tuh_hid_keyboard_isr(uint8_t dev_addr, tusb_event_t event);

+void tuh_hid_keyboard_isr(uint8_t dev_addr, xfer_result_t event);

 

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

  * \param[in] 	dev_addr Address of newly mounted device

@@ -145,7 +145,7 @@ bool          tuh_hid_mouse_is_busy(uint8_t dev_addr) ATTR_PURE ATTR_WARN_UNUSED
 

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

  * \param[in]		  dev_addr device address

- * \param[in,out] p_report address that is used to store data from device. Must be accessible by usb controller (see \ref CFG_TUSB_ATTR_USBRAM)

+ * \param[in,out] p_report address that is used to store data from device. Must be accessible by usb controller (see \ref CFG_TUSB_MEM_SECTION)

  * \returns       \ref tusb_error_t type to indicate success or error condition.

  * \retval        TUSB_ERROR_NONE on success

  * \retval        TUSB_ERROR_INTERFACE_IS_BUSY if the interface is already transferring data with device

@@ -158,14 +158,14 @@ tusb_error_t  tuh_hid_mouse_get_report(uint8_t dev_addr, void* p_report) /*ATTR_
 //------------- Application Callback -------------//

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

  * \param[in]		dev_addr	Address of device

- * \param[in]   event an value from \ref tusb_event_t

+ * \param[in]   event an value from \ref xfer_result_t

  * \note        event can be one of following

- *              - TUSB_EVENT_XFER_COMPLETE : previously scheduled transfer completes successfully.

- *              - TUSB_EVENT_XFER_ERROR   : previously scheduled transfer encountered a transaction error.

- *              - TUSB_EVENT_XFER_STALLED : previously scheduled transfer is stalled by device.

+ *              - XFER_RESULT_SUCCESS : previously scheduled transfer completes successfully.

+ *              - XFER_RESULT_FAILED   : previously scheduled transfer encountered a transaction error.

+ *              - XFER_RESULT_STALLED : previously scheduled transfer is stalled by device.

  * \note        Application should schedule the next report by calling \ref tuh_hid_mouse_get_report within this callback

  */

-void tuh_hid_mouse_isr(uint8_t dev_addr, tusb_event_t event);

+void tuh_hid_mouse_isr(uint8_t dev_addr, xfer_result_t event);

 

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

  * \param[in]	  dev_addr Address of newly mounted device

@@ -199,7 +199,7 @@ tusb_interface_status_t tuh_hid_generic_get_status(uint8_t dev_addr) ATTR_WARN_U
 tusb_interface_status_t tuh_hid_generic_set_status(uint8_t dev_addr) ATTR_WARN_UNUSED_RESULT;

 

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

-void tuh_hid_generic_isr(uint8_t dev_addr, tusb_event_t event);

+void tuh_hid_generic_isr(uint8_t dev_addr, xfer_result_t event);

 

 /** @} */ // Generic_Host

 /** @} */ // ClassDriver_HID_Generic

@@ -217,7 +217,7 @@ typedef struct {
 

 void         hidh_init(void);

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

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

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

 void         hidh_close(uint8_t dev_addr);

 

 #endif