Преглед изворни кода

revert dcd_edpt_xfer_fifo() implementation for esp32s2

hathach пре 5 година
родитељ
комит
3acf0c2d73
1 измењених фајлова са 8 додато и 2 уклоњено
  1. 8 2
      src/portable/espressif/esp32s2/dcd_esp32s2.c

+ 8 - 2
src/portable/espressif/esp32s2/dcd_esp32s2.c

@@ -60,7 +60,7 @@
 
 
 typedef struct {
 typedef struct {
     uint8_t *buffer;
     uint8_t *buffer;
-    tu_fifo_t * ff;
+    // tu_fifo_t * ff; // TODO support dcd_edpt_xfer_fifo API
     uint16_t total_len;
     uint16_t total_len;
     uint16_t queued_len;
     uint16_t queued_len;
     uint16_t max_size;
     uint16_t max_size;
@@ -321,7 +321,7 @@ bool dcd_edpt_xfer(uint8_t rhport, uint8_t ep_addr, uint8_t *buffer, uint16_t to
 
 
   xfer_ctl_t * xfer = XFER_CTL_BASE(epnum, dir);
   xfer_ctl_t * xfer = XFER_CTL_BASE(epnum, dir);
   xfer->buffer       = buffer;
   xfer->buffer       = buffer;
-  xfer->ff           = NULL;
+  // xfer->ff           = NULL; // TODO support dcd_edpt_xfer_fifo API
   xfer->total_len    = total_bytes;
   xfer->total_len    = total_bytes;
   xfer->queued_len   = 0;
   xfer->queued_len   = 0;
   xfer->short_packet = false;
   xfer->short_packet = false;
@@ -357,6 +357,7 @@ bool dcd_edpt_xfer(uint8_t rhport, uint8_t ep_addr, uint8_t *buffer, uint16_t to
   return true;
   return true;
 }
 }
 
 
+#if 0 // TODO support dcd_edpt_xfer_fifo API
 bool dcd_edpt_xfer_fifo (uint8_t rhport, uint8_t ep_addr, tu_fifo_t * ff, uint16_t total_bytes)
 bool dcd_edpt_xfer_fifo (uint8_t rhport, uint8_t ep_addr, tu_fifo_t * ff, uint16_t total_bytes)
 {
 {
   (void)rhport;
   (void)rhport;
@@ -404,6 +405,7 @@ bool dcd_edpt_xfer_fifo (uint8_t rhport, uint8_t ep_addr, tu_fifo_t * ff, uint16
   }
   }
   return true;
   return true;
 }
 }
+#endif
 
 
 void dcd_edpt_stall(uint8_t rhport, uint8_t ep_addr)
 void dcd_edpt_stall(uint8_t rhport, uint8_t ep_addr)
 {
 {
@@ -514,12 +516,14 @@ static void receive_packet(xfer_ctl_t *xfer, /* usb_out_endpoint_t * out_ep, */
   }
   }
 
 
   // Common buffer read
   // Common buffer read
+#if 0 // TODO support dcd_edpt_xfer_fifo API
   if (xfer->ff)
   if (xfer->ff)
   {
   {
     // Ring buffer
     // Ring buffer
     tu_fifo_write_n_const_addr_full_words(xfer->ff, (const void *) rx_fifo, to_recv_size);
     tu_fifo_write_n_const_addr_full_words(xfer->ff, (const void *) rx_fifo, to_recv_size);
   }
   }
   else
   else
+#endif
   {
   {
     uint8_t to_recv_rem = to_recv_size % 4;
     uint8_t to_recv_rem = to_recv_size % 4;
     uint16_t to_recv_size_aligned = to_recv_size - to_recv_rem;
     uint16_t to_recv_size_aligned = to_recv_size - to_recv_rem;
@@ -571,11 +575,13 @@ static void transmit_packet(xfer_ctl_t *xfer, volatile usb_in_endpoint_t *in_ep,
 
 
   uint16_t to_xfer_size = (remaining > xfer->max_size) ? xfer->max_size : remaining;
   uint16_t to_xfer_size = (remaining > xfer->max_size) ? xfer->max_size : remaining;
 
 
+#if 0 // TODO support dcd_edpt_xfer_fifo API
   if (xfer->ff)
   if (xfer->ff)
   {
   {
     tu_fifo_read_n_const_addr_full_words(xfer->ff, (void *) tx_fifo, to_xfer_size);
     tu_fifo_read_n_const_addr_full_words(xfer->ff, (void *) tx_fifo, to_xfer_size);
   }
   }
   else
   else
+#endif
   {
   {
     uint8_t to_xfer_rem = to_xfer_size % 4;
     uint8_t to_xfer_rem = to_xfer_size % 4;
     uint16_t to_xfer_size_aligned = to_xfer_size - to_xfer_rem;
     uint16_t to_xfer_size_aligned = to_xfer_size - to_xfer_rem;