remove CFG_TUD_CDC_FLUSH_ON_SOF option

7 files changed, 1 insertions, 40 deletions

diff --git a/examples/device/device_virtual_com/src/tusb_config.h b/examples/device/device_virtual_com/src/tusb_config.h
index 38930505b..f7cde7848 100644
--- a/examples/device/device_virtual_com/src/tusb_config.h
+++ b/examples/device/device_virtual_com/src/tusb_config.h
@@ -87,11 +87,6 @@
 #define CFG_TUD_CDC_RX_BUFSIZE    64
 #define CFG_TUD_CDC_TX_BUFSIZE    64
 
-
-// TX is sent automatically every Start of Frame event.
-// If not enabled, application must call tud_cdc_write_flush() periodically
-#define CFG_TUD_CDC_FLUSH_ON_SOF    1
-
 //--------------------------------------------------------------------+
 // USB RAM PLACEMENT
 //--------------------------------------------------------------------+
diff --git a/examples/device/nrf52840/src/tusb_config.h b/examples/device/nrf52840/src/tusb_config.h
index 9e6b01616..86bd9e9a0 100644
--- a/examples/device/nrf52840/src/tusb_config.h
+++ b/examples/device/nrf52840/src/tusb_config.h
@@ -101,10 +101,6 @@
 #define CFG_TUD_CDC_RX_BUFSIZE      64
 #define CFG_TUD_CDC_TX_BUFSIZE      64
 
-// TX is sent automatically every Start of Frame event.
-// If not enabled, application must call tud_cdc_write_flush() periodically
-#define CFG_TUD_CDC_FLUSH_ON_SOF    0
-
 //--------------------------------------------------------------------
 // MSC
 //--------------------------------------------------------------------
diff --git a/examples/device/nrf52840_freertos/src/tusb_config.h b/examples/device/nrf52840_freertos/src/tusb_config.h
index bd27f58b5..cadff0403 100644
--- a/examples/device/nrf52840_freertos/src/tusb_config.h
+++ b/examples/device/nrf52840_freertos/src/tusb_config.h
@@ -101,10 +101,6 @@
 #define CFG_TUD_CDC_RX_BUFSIZE      64
 #define CFG_TUD_CDC_TX_BUFSIZE      64
 
-// TX is sent automatically every Start of Frame event.
-// If not enabled, application must call tud_cdc_write_flush() periodically
-#define CFG_TUD_CDC_FLUSH_ON_SOF    0
-
 //--------------------------------------------------------------------
 // MSC
 //--------------------------------------------------------------------
diff --git a/examples/obsolete/device/src/tusb_config.h b/examples/obsolete/device/src/tusb_config.h
index fc6807aef..7b7c82299 100644
--- a/examples/obsolete/device/src/tusb_config.h
+++ b/examples/obsolete/device/src/tusb_config.h
@@ -85,12 +85,6 @@
 #define CFG_TUD_CDC_RX_BUFSIZE    128
 #define CFG_TUD_CDC_TX_BUFSIZE    128
 
-
-// TX is sent automatically in Start of Frame event.
-// If not enabled, application must call tud_cdc_write_flush() periodically
-#define CFG_TUD_CDC_FLUSH_ON_SOF  1
-
-
 // Number of supported Logical Unit Number (At least 1)
 #define CFG_TUD_MSC_MAXLUN        1
 
diff --git a/src/class/cdc/cdc_device.c b/src/class/cdc/cdc_device.c
index 5dd7da122..6858b6ad0 100644
--- a/src/class/cdc/cdc_device.c
+++ b/src/class/cdc/cdc_device.c
@@ -90,7 +90,7 @@ CFG_TUSB_ATTR_USBRAM static cdcd_interface_t _cdcd_itf[CFG_TUD_CDC];
 //--------------------------------------------------------------------+

 bool tud_cdc_n_connected(uint8_t itf)

 {

-  // DTR (bit 0) active  isconsidered as connected

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

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

 }

 

@@ -348,14 +348,4 @@ tusb_error_t cdcd_xfer_cb(uint8_t rhport, uint8_t ep_addr, tusb_event_t event, u
   return TUSB_ERROR_NONE;

 }

 

-#if CFG_TUD_CDC_FLUSH_ON_SOF

-void cdcd_sof(uint8_t rhport)

-{

-  for(uint8_t i=0; i<CFG_TUD_CDC; i++)

-  {

-    tud_cdc_n_flush(i);

-  }

-}

-#endif

-

 #endif

diff --git a/src/class/cdc/cdc_device.h b/src/class/cdc/cdc_device.h
index 4014f5fa9..2e03793a9 100644
--- a/src/class/cdc/cdc_device.h
+++ b/src/class/cdc/cdc_device.h
@@ -116,12 +116,6 @@ tusb_error_t cdcd_control_request_st (uint8_t rhport, tusb_control_request_t con
 tusb_error_t cdcd_xfer_cb            (uint8_t rhport, uint8_t edpt_addr, tusb_event_t event, uint32_t xferred_bytes);

 void         cdcd_reset              (uint8_t rhport);

 

-#if CFG_TUD_CDC_FLUSH_ON_SOF

-void cdcd_sof(uint8_t rhport);

-#else

-#define cdcd_sof    NULL

-#endif

-

 #endif

 

 #ifdef __cplusplus

diff --git a/src/portable/nordic/nrf5x/hal_nrf5x.c b/src/portable/nordic/nrf5x/hal_nrf5x.c
index 7ace69ef6..fe33825e9 100644
--- a/src/portable/nordic/nrf5x/hal_nrf5x.c
+++ b/src/portable/nordic/nrf5x/hal_nrf5x.c
@@ -261,10 +261,6 @@ void tusb_hal_nrf_power_event (uint32_t event)
       NRF_USBD->INTENSET = USBD_INTEN_USBRESET_Msk | USBD_INTEN_USBEVENT_Msk | USBD_INTEN_EPDATA_Msk |
           USBD_INTEN_EP0SETUP_Msk | USBD_INTEN_EP0DATADONE_Msk | USBD_INTEN_ENDEPIN0_Msk | USBD_INTEN_ENDEPOUT0_Msk;
 
-#if CFG_TUD_CDC && CFG_TUD_CDC_FLUSH_ON_SOF
-      NRF_USBD->INTENSET |= USBD_INTEN_SOF_Msk;
-#endif
-
       // Enable interrupt, Priorities 0,1,4,5 (nRF52) are reserved for SoftDevice
       NVIC_SetPriority(USBD_IRQn, USB_NVIC_PRIO);
       NVIC_ClearPendingIRQ(USBD_IRQn);