Merge pull request #2182 from hathach/correct-hcd_edpt_clear_stall-API

correct hcd_edpt_clear_stall() API signature
This commit is contained in:
Ha Thach 2023-07-26 21:42:08 +07:00 committed by GitHub
commit d9cc30291f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 15 additions and 15 deletions

View File

@ -179,7 +179,7 @@ bool hcd_edpt_abort_xfer(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr);
bool hcd_setup_send(uint8_t rhport, uint8_t dev_addr, uint8_t const setup_packet[8]); bool hcd_setup_send(uint8_t rhport, uint8_t dev_addr, uint8_t const setup_packet[8]);
// clear stall, data toggle is also reset to DATA0 // clear stall, data toggle is also reset to DATA0
bool hcd_edpt_clear_stall(uint8_t daddr, uint8_t ep_addr); bool hcd_edpt_clear_stall(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr);
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// USBH implemented API // USBH implemented API

View File

@ -502,8 +502,8 @@ bool hcd_edpt_abort_xfer(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr) {
return still_active; // true if removed an active transfer return still_active; // true if removed an active transfer
} }
bool hcd_edpt_clear_stall(uint8_t daddr, uint8_t ep_addr) bool hcd_edpt_clear_stall(uint8_t rhport, uint8_t daddr, uint8_t ep_addr) {
{ (void) rhport;
ehci_qhd_t *qhd = qhd_get_from_addr(daddr, ep_addr); ehci_qhd_t *qhd = qhd_get_from_addr(daddr, ep_addr);
qhd->qtd_overlay.halted = 0; qhd->qtd_overlay.halted = 0;
hcd_dcache_clean_invalidate(qhd, sizeof(ehci_qhd_t)); hcd_dcache_clean_invalidate(qhd, sizeof(ehci_qhd_t));

View File

@ -831,8 +831,8 @@ bool hcd_edpt_abort_xfer(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr) {
} }
// clear stall, data toggle is also reset to DATA0 // clear stall, data toggle is also reset to DATA0
bool hcd_edpt_clear_stall(uint8_t dev_addr, uint8_t ep_addr) bool hcd_edpt_clear_stall(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr) {
{ (void) rhport;
unsigned const pipenum = find_pipe(dev_addr, ep_addr); unsigned const pipenum = find_pipe(dev_addr, ep_addr);
if (!pipenum) return false; if (!pipenum) return false;
hw_endpoint_t volatile *regs = edpt_regs(pipenum - 1); hw_endpoint_t volatile *regs = edpt_regs(pipenum - 1);

View File

@ -570,8 +570,8 @@ bool hcd_edpt_abort_xfer(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr) {
return false; return false;
} }
bool hcd_edpt_clear_stall(uint8_t dev_addr, uint8_t ep_addr) bool hcd_edpt_clear_stall(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr) {
{ (void) rhport;
if (!tu_edpt_number(ep_addr)) return true; if (!tu_edpt_number(ep_addr)) return true;
int num = find_pipe(dev_addr, ep_addr); int num = find_pipe(dev_addr, ep_addr);
if (num < 0) return false; if (num < 0) return false;

View File

@ -556,8 +556,8 @@ bool hcd_edpt_abort_xfer(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr) {
return false; return false;
} }
bool hcd_edpt_clear_stall(uint8_t dev_addr, uint8_t ep_addr) bool hcd_edpt_clear_stall(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr) {
{ (void) rhport;
ohci_ed_t * const p_ed = ed_from_addr(dev_addr, ep_addr); ohci_ed_t * const p_ed = ed_from_addr(dev_addr, ep_addr);
p_ed->is_stalled = 0; p_ed->is_stalled = 0;

View File

@ -163,8 +163,8 @@ bool hcd_setup_send(uint8_t rhport, uint8_t dev_addr, uint8_t const setup_packet
// return busy; // return busy;
//} //}
bool hcd_edpt_clear_stall(uint8_t dev_addr, uint8_t ep_addr) bool hcd_edpt_clear_stall(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr) {
{ (void) rhport;
(void) dev_addr; (void) dev_addr;
(void) ep_addr; (void) ep_addr;

View File

@ -625,8 +625,8 @@ bool hcd_setup_send(uint8_t rhport, uint8_t dev_addr, uint8_t const setup_packet
return true; return true;
} }
bool hcd_edpt_clear_stall(uint8_t dev_addr, uint8_t ep_addr) bool hcd_edpt_clear_stall(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr) {
{ (void) rhport;
(void) dev_addr; (void) dev_addr;
(void) ep_addr; (void) ep_addr;

View File

@ -718,8 +718,8 @@ bool hcd_edpt_abort_xfer(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr) {
return false; return false;
} }
bool hcd_edpt_clear_stall(uint8_t dev_addr, uint8_t ep_addr) bool hcd_edpt_clear_stall(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr) {
{ (void) rhport;
uint16_t volatile *ctr = addr_to_pipectr(dev_addr, ep_addr); uint16_t volatile *ctr = addr_to_pipectr(dev_addr, ep_addr);
TU_ASSERT(ctr); TU_ASSERT(ctr);