Merge pull request #51 from hathach/develop

Add suspend, resume and remote wakeup support

5 files changed, 9 insertions, 12 deletions

diff --git a/src/class/cdc/cdc_device.c b/src/class/cdc/cdc_device.c
index 2ac8d471c..c194aacd8 100644
--- a/src/class/cdc/cdc_device.c
+++ b/src/class/cdc/cdc_device.c
@@ -99,7 +99,7 @@ static void _prep_out_transaction (uint8_t itf)
 bool tud_cdc_n_connected(uint8_t itf)

 {

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

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

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

 }

 

 uint8_t tud_cdc_n_get_line_state (uint8_t itf)

diff --git a/src/class/cdc/cdc_device.h b/src/class/cdc/cdc_device.h
index 468edef45..25c721e13 100644
--- a/src/class/cdc/cdc_device.h
+++ b/src/class/cdc/cdc_device.h
@@ -38,7 +38,6 @@
 #define CFG_TUD_CDC_EPSIZE 64

 #endif

 

-

 #ifdef __cplusplus

  extern "C" {

 #endif

@@ -97,7 +96,6 @@ ATTR_WEAK void tud_cdc_line_coding_cb(uint8_t itf, cdc_line_coding_t const* p_li
 

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

 // INTERNAL USBD-CLASS DRIVER API

-

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

 void cdcd_init               (void);

 bool cdcd_open               (uint8_t rhport, tusb_desc_interface_t const * p_interface_desc, uint16_t *p_length);

diff --git a/src/class/hid/hid_device.c b/src/class/hid/hid_device.c
index 3a20a9cc8..5c81a1268 100644
--- a/src/class/hid/hid_device.c
+++ b/src/class/hid/hid_device.c
@@ -107,7 +107,7 @@ static inline hidd_interface_t* get_interface_by_itfnum(uint8_t itf_num)
 //--------------------------------------------------------------------+

 bool tud_hid_generic_ready(void)

 {

-  return (_hidd_itf[ITF_IDX_GENERIC].ep_in != 0) && !dcd_edpt_busy(TUD_OPT_RHPORT, _hidd_itf[ITF_IDX_GENERIC].ep_in);

+  return tud_ready() && (_hidd_itf[ITF_IDX_GENERIC].ep_in != 0) && !dcd_edpt_busy(TUD_OPT_RHPORT, _hidd_itf[ITF_IDX_GENERIC].ep_in);

 }

 

 bool tud_hid_generic_report(uint8_t report_id, void const* report, uint8_t len)

@@ -265,6 +265,7 @@ void hidd_init(void)
 

 void hidd_reset(uint8_t rhport)

 {

+  (void) rhport;

   tu_memclr(_hidd_itf, sizeof(_hidd_itf));

 

   #if CFG_TUD_HID_KEYBOARD

@@ -447,6 +448,7 @@ bool hidd_control_request(uint8_t rhport, tusb_control_request_t const * p_reque
 // return false to stall control endpoint (e.g Host send non-sense DATA)

 bool hidd_control_request_complete(uint8_t rhport, tusb_control_request_t const * p_request)

 {

+  (void) rhport;

   hidd_interface_t* p_hid = get_interface_by_itfnum( (uint8_t) p_request->wIndex );

   TU_ASSERT(p_hid);

 

@@ -469,6 +471,11 @@ bool hidd_control_request_complete(uint8_t rhport, tusb_control_request_t const
 bool hidd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes)

 {

   // nothing to do

+  (void) rhport;

+  (void) ep_addr;

+  (void) event;

+  (void) xferred_bytes;

+

   return true;

 }

 

diff --git a/src/class/msc/msc_device.c b/src/class/msc/msc_device.c
index 04a3178a3..ace91b40a 100644
--- a/src/class/msc/msc_device.c
+++ b/src/class/msc/msc_device.c
@@ -102,11 +102,6 @@ static inline uint16_t rdwr10_get_blockcount(uint8_t const command[])
 //--------------------------------------------------------------------+

 // APPLICATION API

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

-bool tud_msc_ready(void)

-{

-  return ( _mscd_itf.ep_in != 0 ) && ( _mscd_itf.ep_out != 0 ) ;

-}

-

 bool tud_msc_set_sense(uint8_t lun, uint8_t sense_key, uint8_t add_sense_code, uint8_t add_sense_qualifier)

 {

   (void) lun;

diff --git a/src/class/msc/msc_device.h b/src/class/msc/msc_device.h
index e030951be..74be7e06d 100644
--- a/src/class/msc/msc_device.h
+++ b/src/class/msc/msc_device.h
@@ -68,9 +68,6 @@ TU_VERIFY_STATIC(CFG_TUD_MSC_BUFSIZE < UINT16_MAX, "Size is not correct");
  * \defgroup MSC_Device Device

  *  @{ */

 

-

-// Check if MSC interface is ready to use

-bool tud_msc_ready(void);

 bool tud_msc_set_sense(uint8_t lun, uint8_t sense_key, uint8_t add_sense_code, uint8_t add_sense_qualifier);

 

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