Przeglądaj źródła

simplify tusb_dcd_edpt_xfer API

hathach 8 lat temu
rodzic
commit
16aa3eb437

+ 1 - 1
hw/mcu/nordic/nrf52/tusb_port/dcd_nrf52.c

@@ -412,7 +412,7 @@ bool tusb_dcd_edpt_open (uint8_t port, tusb_descriptor_endpoint_t const * desc_e
   return true;
   return true;
 }
 }
 
 
-bool tusb_dcd_edpt_xfer (uint8_t port, uint8_t ep_addr, uint8_t * buffer, uint16_t total_bytes, bool int_on_complete)
+bool tusb_dcd_edpt_xfer (uint8_t port, uint8_t ep_addr, uint8_t * buffer, uint16_t total_bytes)
 {
 {
   (void) port;
   (void) port;
 
 

+ 2 - 2
hw/mcu/nxp/lpc43xx/tusb_port/dcd_lpc43xx.c

@@ -365,11 +365,11 @@ bool tusb_dcd_edpt_queue_xfer(uint8_t port, uint8_t ep_addr, uint8_t * buffer, u
   return pipe_add_xfer(port, ep_idx, buffer, total_bytes, false);
   return pipe_add_xfer(port, ep_idx, buffer, total_bytes, false);
 }
 }
 
 
-bool  tusb_dcd_edpt_xfer(uint8_t port, uint8_t ep_addr, uint8_t * buffer, uint16_t total_bytes, bool int_on_complete)
+bool  tusb_dcd_edpt_xfer(uint8_t port, uint8_t ep_addr, uint8_t * buffer, uint16_t total_bytes)
 {
 {
   uint8_t ep_idx = edpt_addr2phy(ep_addr);
   uint8_t ep_idx = edpt_addr2phy(ep_addr);
 
 
-  VERIFY ( pipe_add_xfer(port, ep_idx, buffer, total_bytes, int_on_complete) );
+  VERIFY ( pipe_add_xfer(port, ep_idx, buffer, total_bytes, true) );
 
 
   dcd_qhd_t* p_qhd = &dcd_data_ptr[port]->qhd[ ep_idx ];
   dcd_qhd_t* p_qhd = &dcd_data_ptr[port]->qhd[ ep_idx ];
   dcd_qtd_t* p_qtd = &dcd_data_ptr[port]->qtd[ p_qhd->list_qtd_idx[0] ];
   dcd_qtd_t* p_qtd = &dcd_data_ptr[port]->qtd[ p_qhd->list_qtd_idx[0] ];

+ 3 - 4
tinyusb/class/cdc/cdc_device.c

@@ -199,7 +199,7 @@ tusb_error_t cdcd_open(uint8_t port, tusb_descriptor_interface_t const * p_inter
   p_cdc->interface_number   = p_interface_desc->bInterfaceNumber;
   p_cdc->interface_number   = p_interface_desc->bInterfaceNumber;
 
 
   // Prepare for incoming data
   // Prepare for incoming data
-  TU_ASSERT( tusb_dcd_edpt_xfer(port, p_cdc->ep_out, _tmp_rx_buf, sizeof(_tmp_rx_buf), true), TUSB_ERROR_DCD_EDPT_XFER);
+  TU_ASSERT( tusb_dcd_edpt_xfer(port, p_cdc->ep_out, _tmp_rx_buf, sizeof(_tmp_rx_buf)), TUSB_ERROR_DCD_EDPT_XFER);
 
 
 
 
   return TUSB_ERROR_NONE;
   return TUSB_ERROR_NONE;
@@ -277,7 +277,7 @@ tusb_error_t cdcd_xfer_cb(uint8_t port, uint8_t ep_addr, tusb_event_t event, uin
     fifo_write_n(&_rx_ff, _tmp_rx_buf, xferred_bytes);
     fifo_write_n(&_rx_ff, _tmp_rx_buf, xferred_bytes);
 
 
     // preparing for next
     // preparing for next
-    TU_ASSERT(tusb_dcd_edpt_xfer(port, p_cdc->ep_out, _tmp_rx_buf, sizeof(_tmp_rx_buf), true), TUSB_ERROR_DCD_EDPT_XFER);
+    TU_ASSERT(tusb_dcd_edpt_xfer(port, p_cdc->ep_out, _tmp_rx_buf, sizeof(_tmp_rx_buf)), TUSB_ERROR_DCD_EDPT_XFER);
 
 
     // fire callback
     // fire callback
     tud_cdc_rx_cb(port);
     tud_cdc_rx_cb(port);
@@ -294,9 +294,8 @@ bool tud_n_cdc_flush (uint8_t port)
 
 
   VERIFY( !tusb_dcd_edpt_busy(port, edpt) );
   VERIFY( !tusb_dcd_edpt_busy(port, edpt) );
 
 
-
   uint16_t count = fifo_read_n(&_tx_ff, _tmp_tx_buf, sizeof(_tmp_tx_buf));
   uint16_t count = fifo_read_n(&_tx_ff, _tmp_tx_buf, sizeof(_tmp_tx_buf));
-  TU_ASSERT( tusb_dcd_edpt_xfer(port, edpt, _tmp_tx_buf, count, false) );
+  TU_ASSERT( tusb_dcd_edpt_xfer(port, edpt, _tmp_tx_buf, count) );
 
 
   return true;
   return true;
 }
 }

+ 2 - 2
tinyusb/class/hid/hid_device.c

@@ -119,7 +119,7 @@ tusb_error_t tud_hid_keyboard_send(uint8_t port, hid_keyboard_report_t const *p_
 
 
   hidd_interface_t * p_kbd = &keyboardd_data; // TODO &keyboardd_data[port];
   hidd_interface_t * p_kbd = &keyboardd_data; // TODO &keyboardd_data[port];
 
 
-  TU_ASSERT( tusb_dcd_edpt_xfer(port, p_kbd->edpt_addr, (void*) p_report, sizeof(hid_keyboard_report_t), true), TUSB_ERROR_DCD_EDPT_XFER ) ;
+  TU_ASSERT( tusb_dcd_edpt_xfer(port, p_kbd->edpt_addr, (void*) p_report, sizeof(hid_keyboard_report_t)), TUSB_ERROR_DCD_EDPT_XFER ) ;
 
 
   return TUSB_ERROR_NONE;
   return TUSB_ERROR_NONE;
 }
 }
@@ -142,7 +142,7 @@ tusb_error_t tud_hid_mouse_send(uint8_t port, hid_mouse_report_t const *p_report
 
 
   hidd_interface_t * p_mouse = &moused_data; // TODO &keyboardd_data[port];
   hidd_interface_t * p_mouse = &moused_data; // TODO &keyboardd_data[port];
 
 
-  TU_ASSERT( tusb_dcd_edpt_xfer(port, p_mouse->edpt_addr, (void*) p_report, sizeof(hid_mouse_report_t), true), TUSB_ERROR_DCD_EDPT_XFER ) ;
+  TU_ASSERT( tusb_dcd_edpt_xfer(port, p_mouse->edpt_addr, (void*) p_report, sizeof(hid_mouse_report_t)), TUSB_ERROR_DCD_EDPT_XFER ) ;
 
 
   return TUSB_ERROR_NONE;
   return TUSB_ERROR_NONE;
 }
 }

+ 4 - 4
tinyusb/class/msc/msc_device.c

@@ -126,7 +126,7 @@ tusb_error_t mscd_open(uint8_t port, tusb_descriptor_interface_t const * p_inter
   (*p_length) += sizeof(tusb_descriptor_interface_t) + 2*sizeof(tusb_descriptor_endpoint_t);
   (*p_length) += sizeof(tusb_descriptor_interface_t) + 2*sizeof(tusb_descriptor_endpoint_t);
 
 
   //------------- Queue Endpoint OUT for Command Block Wrapper -------------//
   //------------- Queue Endpoint OUT for Command Block Wrapper -------------//
-  TU_ASSERT( tusb_dcd_edpt_xfer(port, p_msc->ep_out, (uint8_t*) &p_msc->cbw, sizeof(msc_cbw_t), true), TUSB_ERROR_DCD_EDPT_XFER );
+  TU_ASSERT( tusb_dcd_edpt_xfer(port, p_msc->ep_out, (uint8_t*) &p_msc->cbw, sizeof(msc_cbw_t)), TUSB_ERROR_DCD_EDPT_XFER );
 
 
   return TUSB_ERROR_NONE;
   return TUSB_ERROR_NONE;
 }
 }
@@ -251,10 +251,10 @@ tusb_error_t mscd_xfer_cb(uint8_t port, uint8_t ep_addr, tusb_event_t event, uin
     // Move to default CMD stage after sending status
     // Move to default CMD stage after sending status
     p_msc->stage = MSC_STAGE_CMD;
     p_msc->stage = MSC_STAGE_CMD;
 
 
-    TU_ASSERT( tusb_dcd_edpt_xfer(port, p_msc->ep_in , (uint8_t*) &p_msc->csw, sizeof(msc_csw_t), true) );
+    TU_ASSERT( tusb_dcd_edpt_xfer(port, p_msc->ep_in , (uint8_t*) &p_msc->csw, sizeof(msc_csw_t)) );
 
 
     //------------- Queue the next CBW -------------//
     //------------- Queue the next CBW -------------//
-    TU_ASSERT( tusb_dcd_edpt_xfer(port, p_msc->ep_out, (uint8_t*) &p_msc->cbw, sizeof(msc_cbw_t), true) );
+    TU_ASSERT( tusb_dcd_edpt_xfer(port, p_msc->ep_out, (uint8_t*) &p_msc->cbw, sizeof(msc_cbw_t)) );
   }
   }
 
 
   return TUSB_ERROR_NONE;
   return TUSB_ERROR_NONE;
@@ -300,7 +300,7 @@ static bool read10_write10_data_xfer(uint8_t port, mscd_interface_t* p_msc)
     return true;
     return true;
   } else if (xfer_block < block_count)
   } else if (xfer_block < block_count)
   {
   {
-    TU_ASSERT( tusb_dcd_edpt_xfer(port, ep_addr, p_buffer, xfer_byte, true), TUSB_ERROR_DCD_EDPT_XFER );
+    TU_ASSERT( tusb_dcd_edpt_xfer(port, ep_addr, p_buffer, xfer_byte), TUSB_ERROR_DCD_EDPT_XFER );
 
 
     // adjust lba, block_count, xfer_bytes for the next call
     // adjust lba, block_count, xfer_bytes for the next call
     p_readwrite->lba         = __n2be(lba+xfer_block);
     p_readwrite->lba         = __n2be(lba+xfer_block);

+ 1 - 1
tinyusb/tusb_dcd.h

@@ -89,7 +89,7 @@ bool tusb_dcd_control_xfer     (uint8_t port, tusb_dir_t dir, uint8_t * buffer,
 
 
 //------------- Other Endpoints -------------//
 //------------- Other Endpoints -------------//
 bool tusb_dcd_edpt_open        (uint8_t port, tusb_descriptor_endpoint_t const * p_endpoint_desc);
 bool tusb_dcd_edpt_open        (uint8_t port, tusb_descriptor_endpoint_t const * p_endpoint_desc);
-bool tusb_dcd_edpt_xfer        (uint8_t port, uint8_t ep_addr, uint8_t * buffer, uint16_t total_bytes, bool int_on_complete);
+bool tusb_dcd_edpt_xfer        (uint8_t port, uint8_t ep_addr, uint8_t * buffer, uint16_t total_bytes);
 bool tusb_dcd_edpt_queue_xfer  (uint8_t port, uint8_t ep_addr, uint8_t * buffer, uint16_t total_bytes); // only queue, not transferring yet
 bool tusb_dcd_edpt_queue_xfer  (uint8_t port, uint8_t ep_addr, uint8_t * buffer, uint16_t total_bytes); // only queue, not transferring yet
 bool tusb_dcd_edpt_busy        (uint8_t port, uint8_t ep_addr);
 bool tusb_dcd_edpt_busy        (uint8_t port, uint8_t ep_addr);