summaryrefslogtreecommitdiff
path: root/tinyusb
diff options
context:
space:
mode:
authorhathach <[email protected]>2014-02-20 10:41:31 +0700
committerhathach <[email protected]>2014-02-20 10:41:31 +0700
commit533c8d2eed68fe76242fa5dcd2b1733d6278a4e8 (patch)
tree1e7340ffc17d5716cdf58abe7ebf567487a3e221 /tinyusb
parentd86523b16ce4e2512661477b85f8a7447ab91efa (diff)
use hcd_pipe_is_busy instead of hcd_pipe_is_idle
remove hcd_pipe_is_idle
Diffstat (limited to 'tinyusb')
-rw-r--r--tinyusb/class/cdc_host.c10
-rw-r--r--tinyusb/host/ehci/ehci.c6
-rw-r--r--tinyusb/host/hcd.h2
3 files changed, 3 insertions, 15 deletions
diff --git a/tinyusb/class/cdc_host.c b/tinyusb/class/cdc_host.c
index a71982ca7..0d2b1dcc3 100644
--- a/tinyusb/class/cdc_host.c
+++ b/tinyusb/class/cdc_host.c
@@ -126,10 +126,7 @@ tusb_error_t tusbh_cdc_send(uint8_t dev_addr, void const * p_data, uint32_t leng
ASSERT( p_data != NULL && length, TUSB_ERROR_INVALID_PARA);
pipe_handle_t pipe_out = cdch_data[dev_addr-1].pipe_out;
- if ( !hcd_pipe_is_idle(pipe_out) )
- {
- return TUSB_ERROR_INTERFACE_IS_BUSY;
- }
+ if ( hcd_pipe_is_busy(pipe_out) ) return TUSB_ERROR_INTERFACE_IS_BUSY;
return hcd_pipe_xfer( pipe_out, (void *) p_data, length, is_notify);
}
@@ -140,10 +137,7 @@ tusb_error_t tusbh_cdc_receive(uint8_t dev_addr, void * p_buffer, uint32_t lengt
ASSERT( p_buffer != NULL && length, TUSB_ERROR_INVALID_PARA);
pipe_handle_t pipe_in = cdch_data[dev_addr-1].pipe_in;
- if ( !hcd_pipe_is_idle(pipe_in) )
- {
- return TUSB_ERROR_INTERFACE_IS_BUSY;
- }
+ if ( hcd_pipe_is_busy(pipe_in) ) return TUSB_ERROR_INTERFACE_IS_BUSY;
return hcd_pipe_xfer( pipe_in, p_buffer, length, is_notify);
}
diff --git a/tinyusb/host/ehci/ehci.c b/tinyusb/host/ehci/ehci.c
index ac0a060d8..830325274 100644
--- a/tinyusb/host/ehci/ehci.c
+++ b/tinyusb/host/ehci/ehci.c
@@ -493,12 +493,6 @@ bool hcd_pipe_is_error(pipe_handle_t pipe_hdl)
return p_qhd->qtd_overlay.halted;
}
-bool hcd_pipe_is_idle(pipe_handle_t pipe_hdl)
-{ // TODO to be remove
- ehci_qhd_t *p_qhd = qhd_get_from_pipe_handle( pipe_hdl );
- return (p_qhd->p_qtd_list_head == NULL);
-}
-
bool hcd_pipe_is_stalled(pipe_handle_t pipe_hdl)
{
ehci_qhd_t *p_qhd = qhd_get_from_pipe_handle( pipe_hdl );
diff --git a/tinyusb/host/hcd.h b/tinyusb/host/hcd.h
index 34e89fea4..952dc5fe2 100644
--- a/tinyusb/host/hcd.h
+++ b/tinyusb/host/hcd.h
@@ -95,7 +95,7 @@ tusb_error_t hcd_pipe_close(pipe_handle_t pipe_hdl) /*ATTR_WARN_UNUSED_RESULT*/
bool hcd_pipe_is_busy(pipe_handle_t pipe_hdl) ATTR_PURE;
bool hcd_pipe_is_error(pipe_handle_t pipe_hdl) ATTR_PURE;
bool hcd_pipe_is_stalled(pipe_handle_t pipe_hdl) ATTR_PURE; // stalled also counted as error
-bool hcd_pipe_is_idle(pipe_handle_t pipe_hdl) ATTR_PURE;
+
uint8_t hcd_pipe_get_endpoint_addr(pipe_handle_t pipe_hdl) ATTR_PURE;
tusb_error_t hcd_pipe_clear_stall(pipe_handle_t pipe_hdl);