able to build with host msc

4 files changed, 6 insertions, 6 deletions

diff --git a/src/host/ehci/ehci.c b/src/host/ehci/ehci.c
index d30b68a64..c9947a19c 100644
--- a/src/host/ehci/ehci.c
+++ b/src/host/ehci/ehci.c
@@ -294,7 +294,7 @@ tusb_error_t  hcd_pipe_control_open(uint8_t dev_addr, uint8_t max_packet_size)
   return TUSB_ERROR_NONE;

 }

 

-tusb_error_t  hcd_pipe_control_xfer(uint8_t dev_addr, tusb_control_request_t const * p_request, uint8_t data[])

+bool  hcd_pipe_control_xfer(uint8_t dev_addr, tusb_control_request_t const * p_request, uint8_t data[])

 {

   ehci_qhd_t * const p_qhd = get_control_qhd(dev_addr);

 

@@ -332,7 +332,7 @@ tusb_error_t  hcd_pipe_control_xfer(uint8_t dev_addr, tusb_control_request_t con
 

   p_qhd->qtd_overlay.next.address = (uint32_t) p_setup;

 

-  return TUSB_ERROR_NONE;

+  return true;

 }

 

 tusb_error_t  hcd_pipe_control_close(uint8_t dev_addr)

diff --git a/src/host/hcd.h b/src/host/hcd.h
index efdfb920d..3e3b966d0 100644
--- a/src/host/hcd.h
+++ b/src/host/hcd.h
@@ -128,7 +128,7 @@ void hcd_event_handler(hcd_event_t const* event, bool in_isr);
 //--------------------------------------------------------------------+

 // TODO control xfer should be used via usbh layer

 tusb_error_t  hcd_pipe_control_open(uint8_t dev_addr, uint8_t max_packet_size) ATTR_WARN_UNUSED_RESULT;

-tusb_error_t  hcd_pipe_control_xfer(uint8_t dev_addr, tusb_control_request_t const * p_request, uint8_t data[]) ATTR_WARN_UNUSED_RESULT;

+bool  hcd_pipe_control_xfer(uint8_t dev_addr, tusb_control_request_t const * p_request, uint8_t data[]) ATTR_WARN_UNUSED_RESULT;

 tusb_error_t  hcd_pipe_control_close(uint8_t dev_addr) ATTR_WARN_UNUSED_RESULT;

 

 pipe_handle_t hcd_pipe_open(uint8_t dev_addr, tusb_desc_endpoint_t const * endpoint_desc, uint8_t class_code) ATTR_WARN_UNUSED_RESULT;

diff --git a/src/host/ohci/ohci.c b/src/host/ohci/ohci.c
index 91d9b6243..cef0d5dae 100644
--- a/src/host/ohci/ohci.c
+++ b/src/host/ohci/ohci.c
@@ -291,7 +291,7 @@ tusb_error_t  hcd_pipe_control_open(uint8_t dev_addr, uint8_t max_packet_size)
   return TUSB_ERROR_NONE;

 }

 

-tusb_error_t  hcd_pipe_control_xfer(uint8_t dev_addr, tusb_control_request_t const * p_request, uint8_t data[])

+bool  hcd_pipe_control_xfer(uint8_t dev_addr, tusb_control_request_t const * p_request, uint8_t data[])

 {

   ohci_ed_t* const p_ed = &ohci_data.control[dev_addr].ed;

 

@@ -331,7 +331,7 @@ tusb_error_t  hcd_pipe_control_xfer(uint8_t dev_addr, tusb_control_request_t con
 

   OHCI_REG->command_status_bit.control_list_filled = 1;

 

-  return TUSB_ERROR_NONE;

+  return true;

 }

 

 tusb_error_t  hcd_pipe_control_close(uint8_t dev_addr)

diff --git a/src/host/usbh.c b/src/host/usbh.c
index ad0653cf4..6c3194fdd 100644
--- a/src/host/usbh.c
+++ b/src/host/usbh.c
@@ -199,7 +199,7 @@ bool usbh_control_xfer (uint8_t dev_addr, tusb_control_request_t* request, uint8
   dev->control.request = *request;

   dev->control.pipe_status = 0;

 

-  TU_ASSERT_ERR(hcd_pipe_control_xfer(dev_addr, &dev->control.request, data), false);

+  TU_ASSERT(hcd_pipe_control_xfer(dev_addr, &dev->control.request, data));

   TU_ASSERT(osal_semaphore_wait(dev->control.sem_hdl, OSAL_TIMEOUT_NORMAL));

 

   osal_mutex_unlock(dev->control.mutex_hdl);