Merge pull request #13 from hathach/devlocal

add unplugged event for nrf5x

7 files changed, 18 insertions, 24 deletions

diff --git a/src/class/cdc/cdc.h b/src/class/cdc/cdc.h
index afac8379d..d07c62429 100644
--- a/src/class/cdc/cdc.h
+++ b/src/class/cdc/cdc.h
@@ -50,10 +50,6 @@
  extern "C" {

 #endif

 

-#pragma GCC diagnostic push

-#pragma GCC diagnostic ignored "-Wpacked"

-#pragma GCC diagnostic ignored "-Wattributes"

-

 /** \defgroup ClassDriver_CDC_Common Common Definitions

  *  @{ */

 

@@ -406,8 +402,6 @@ typedef struct ATTR_PACKED
 

 TU_VERIFY_STATIC(sizeof(cdc_line_control_state_t) == 2, "size is not correct");

 

-#pragma GCC diagnostic pop

-

 /** @} */

 

 #ifdef __cplusplus

diff --git a/src/class/cdc/cdc_device.c b/src/class/cdc/cdc_device.c
index d8ade9c7f..b68a6a7ff 100644
--- a/src/class/cdc/cdc_device.c
+++ b/src/class/cdc/cdc_device.c
@@ -87,7 +87,7 @@ typedef struct
 //--------------------------------------------------------------------+

 // INTERNAL OBJECT & FUNCTION DECLARATION

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

-CFG_TUSB_ATTR_USBRAM static cdcd_interface_t _cdcd_itf[CFG_TUD_CDC];

+CFG_TUSB_MEM_SECTION static cdcd_interface_t _cdcd_itf[CFG_TUD_CDC];

 

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

 // APPLICATION API

@@ -358,7 +358,7 @@ bool cdcd_control_request(uint8_t rhport, tusb_control_request_t const * request
   return true;

 }

 

-tusb_error_t cdcd_xfer_cb(uint8_t rhport, uint8_t ep_addr, tusb_event_t event, uint32_t xferred_bytes)

+tusb_error_t cdcd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes)

 {

   // TODO Support multiple interfaces

   uint8_t const itf = 0;

diff --git a/src/class/cdc/cdc_device.h b/src/class/cdc/cdc_device.h
index 749351a54..ad1100e9c 100644
--- a/src/class/cdc/cdc_device.h
+++ b/src/class/cdc/cdc_device.h
@@ -116,7 +116,7 @@ void         cdcd_init               (void);
 tusb_error_t cdcd_open               (uint8_t rhport, tusb_desc_interface_t const * p_interface_desc, uint16_t *p_length);

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

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

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

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

 void         cdcd_reset              (uint8_t rhport);

 

 #endif

diff --git a/src/class/cdc/cdc_host.c b/src/class/cdc/cdc_host.c
index af2e2c444..0a3661878 100644
--- a/src/class/cdc/cdc_host.c
+++ b/src/class/cdc/cdc_host.c
@@ -221,7 +221,7 @@ tusb_error_t cdch_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_
   OSAL_SUBTASK_END

 }

 

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

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

 {

   tuh_cdc_xfer_isr( pipe_hdl.dev_addr, event, get_app_pipeid(pipe_hdl), xferred_bytes );

 }

diff --git a/src/class/cdc/cdc_host.h b/src/class/cdc/cdc_host.h
index 77f1e5a78..0b863bb61 100644
--- a/src/class/cdc/cdc_host.h
+++ b/src/class/cdc/cdc_host.h
@@ -77,27 +77,27 @@ bool tuh_cdc_is_busy(uint8_t dev_addr, cdc_pipeid_t pipeid)  ATTR_PURE ATTR_WARN
 

 /** \brief 			Perform USB OUT transfer to device

  * \param[in]		dev_addr	device address

- * \param[in]	  p_data    Buffer containing data. Must be accessible by USB controller (see \ref CFG_TUSB_ATTR_USBRAM)

+ * \param[in]	  p_data    Buffer containing data. Must be accessible by USB controller (see \ref CFG_TUSB_MEM_SECTION)

  * \param[in]		length    Number of bytes to be transferred via USB bus

  * \retval      TUSB_ERROR_NONE on success

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

  * \retval      TUSB_ERROR_DEVICE_NOT_READY if device is not yet configured (by SET CONFIGURED request)

  * \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. \a p_data must be declared with \ref CFG_TUSB_ATTR_USBRAM.

+ *              interface's callback function. \a p_data must be declared with \ref CFG_TUSB_MEM_SECTION.

  */

 tusb_error_t tuh_cdc_send(uint8_t dev_addr, void const * p_data, uint32_t length, bool is_notify);

 

 /** \brief 			Perform USB IN transfer to get data from device

  * \param[in]		dev_addr	device address

- * \param[in]	  p_buffer  Buffer containing received data. Must be accessible by USB controller (see \ref CFG_TUSB_ATTR_USBRAM)

+ * \param[in]	  p_buffer  Buffer containing received data. Must be accessible by USB controller (see \ref CFG_TUSB_MEM_SECTION)

  * \param[in]		length    Number of bytes to be transferred via USB bus

  * \retval      TUSB_ERROR_NONE on success

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

  * \retval      TUSB_ERROR_DEVICE_NOT_READY if device is not yet configured (by SET CONFIGURED request)

  * \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. \a p_data must be declared with \ref CFG_TUSB_ATTR_USBRAM.

+ *              interface's callback function. \a p_data must be declared with \ref CFG_TUSB_MEM_SECTION.

  */

 tusb_error_t tuh_cdc_receive(uint8_t dev_addr, void * p_buffer, uint32_t length, bool is_notify);

 

@@ -118,16 +118,16 @@ void tuh_cdc_unmounted_cb(uint8_t dev_addr);
 

 /** \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

  * \param[in]   pipe_id value from \ref cdc_pipeid_t indicate the pipe

  * \param[in]   xferred_bytes Number of bytes transferred via USB bus

  * \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

  */

-void tuh_cdc_xfer_isr(uint8_t dev_addr, tusb_event_t event, cdc_pipeid_t pipe_id, uint32_t xferred_bytes);

+void tuh_cdc_xfer_isr(uint8_t dev_addr, xfer_result_t event, cdc_pipeid_t pipe_id, uint32_t xferred_bytes);

 

 /// @} // group CDC_Serial_Host

 /// @}

@@ -151,7 +151,7 @@ extern cdch_data_t cdch_data[CFG_TUSB_HOST_DEVICE_MAX]; // TODO consider to move
 

 void         cdch_init(void);

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

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

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

 void         cdch_close(uint8_t dev_addr);

 

 #endif

diff --git a/src/class/cdc/cdc_rndis_host.c b/src/class/cdc/cdc_rndis_host.c
index 9b7684f77..89ea3b32f 100644
--- a/src/class/cdc/cdc_rndis_host.c
+++ b/src/class/cdc/cdc_rndis_host.c
@@ -54,8 +54,8 @@
 //--------------------------------------------------------------------+
 #define RNDIS_MSG_PAYLOAD_MAX   (1024*4)
 
-CFG_TUSB_ATTR_USBRAM static uint8_t msg_notification[CFG_TUSB_HOST_DEVICE_MAX][8];
-CFG_TUSB_ATTR_USBRAM ATTR_ALIGNED(4) static uint8_t msg_payload[RNDIS_MSG_PAYLOAD_MAX];
+CFG_TUSB_MEM_SECTION static uint8_t msg_notification[CFG_TUSB_HOST_DEVICE_MAX][8];
+CFG_TUSB_MEM_SECTION ATTR_ALIGNED(4) static uint8_t msg_payload[RNDIS_MSG_PAYLOAD_MAX];
 
 STATIC_VAR rndish_data_t rndish_data[CFG_TUSB_HOST_DEVICE_MAX];
 
@@ -224,7 +224,7 @@ tusb_error_t rndish_open_subtask(uint8_t dev_addr, cdch_data_t *p_cdc)
   OSAL_SUBTASK_END
 }
 
-void rndish_xfer_isr(cdch_data_t *p_cdc, pipe_handle_t pipe_hdl, tusb_event_t event, uint32_t xferred_bytes)
+void rndish_xfer_isr(cdch_data_t *p_cdc, pipe_handle_t pipe_hdl, xfer_result_t event, uint32_t xferred_bytes)
 {
   if ( pipehandle_is_equal(pipe_hdl, p_cdc->pipe_notification) )
   {
diff --git a/src/class/cdc/cdc_rndis_host.h b/src/class/cdc/cdc_rndis_host.h
index c4597daa8..3b92d3f23 100644
--- a/src/class/cdc/cdc_rndis_host.h
+++ b/src/class/cdc/cdc_rndis_host.h
@@ -65,7 +65,7 @@ typedef struct {
 
 void rndish_init(void);
 tusb_error_t rndish_open_subtask(uint8_t dev_addr, cdch_data_t *p_cdc) ATTR_WARN_UNUSED_RESULT;
-void rndish_xfer_isr(cdch_data_t *p_cdc, pipe_handle_t pipe_hdl, tusb_event_t event, uint32_t xferred_bytes);
+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);
 
 #endif