Skip to content

Commit d9cc302

Browse files
authored
Merge pull request hathach#2182 from hathach/correct-hcd_edpt_clear_stall-API
correct hcd_edpt_clear_stall() API signature
2 parents 9554283 + 10575c1 commit d9cc302

File tree

8 files changed

+15
-15
lines changed

8 files changed

+15
-15
lines changed

src/host/hcd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ bool hcd_edpt_abort_xfer(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr);
179179
bool hcd_setup_send(uint8_t rhport, uint8_t dev_addr, uint8_t const setup_packet[8]);
180180

181181
// clear stall, data toggle is also reset to DATA0
182-
bool hcd_edpt_clear_stall(uint8_t daddr, uint8_t ep_addr);
182+
bool hcd_edpt_clear_stall(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr);
183183

184184
//--------------------------------------------------------------------+
185185
// USBH implemented API

src/portable/ehci/ehci.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -502,8 +502,8 @@ bool hcd_edpt_abort_xfer(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr) {
502502
return still_active; // true if removed an active transfer
503503
}
504504

505-
bool hcd_edpt_clear_stall(uint8_t daddr, uint8_t ep_addr)
506-
{
505+
bool hcd_edpt_clear_stall(uint8_t rhport, uint8_t daddr, uint8_t ep_addr) {
506+
(void) rhport;
507507
ehci_qhd_t *qhd = qhd_get_from_addr(daddr, ep_addr);
508508
qhd->qtd_overlay.halted = 0;
509509
hcd_dcache_clean_invalidate(qhd, sizeof(ehci_qhd_t));

src/portable/mentor/musb/hcd_musb.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -831,8 +831,8 @@ bool hcd_edpt_abort_xfer(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr) {
831831
}
832832

833833
// clear stall, data toggle is also reset to DATA0
834-
bool hcd_edpt_clear_stall(uint8_t dev_addr, uint8_t ep_addr)
835-
{
834+
bool hcd_edpt_clear_stall(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr) {
835+
(void) rhport;
836836
unsigned const pipenum = find_pipe(dev_addr, ep_addr);
837837
if (!pipenum) return false;
838838
hw_endpoint_t volatile *regs = edpt_regs(pipenum - 1);

src/portable/nxp/khci/hcd_khci.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -570,8 +570,8 @@ bool hcd_edpt_abort_xfer(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr) {
570570
return false;
571571
}
572572

573-
bool hcd_edpt_clear_stall(uint8_t dev_addr, uint8_t ep_addr)
574-
{
573+
bool hcd_edpt_clear_stall(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr) {
574+
(void) rhport;
575575
if (!tu_edpt_number(ep_addr)) return true;
576576
int num = find_pipe(dev_addr, ep_addr);
577577
if (num < 0) return false;

src/portable/ohci/ohci.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -556,8 +556,8 @@ bool hcd_edpt_abort_xfer(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr) {
556556
return false;
557557
}
558558

559-
bool hcd_edpt_clear_stall(uint8_t dev_addr, uint8_t ep_addr)
560-
{
559+
bool hcd_edpt_clear_stall(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr) {
560+
(void) rhport;
561561
ohci_ed_t * const p_ed = ed_from_addr(dev_addr, ep_addr);
562562

563563
p_ed->is_stalled = 0;

src/portable/raspberrypi/pio_usb/hcd_pio_usb.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ bool hcd_setup_send(uint8_t rhport, uint8_t dev_addr, uint8_t const setup_packet
163163
// return busy;
164164
//}
165165

166-
bool hcd_edpt_clear_stall(uint8_t dev_addr, uint8_t ep_addr)
167-
{
166+
bool hcd_edpt_clear_stall(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr) {
167+
(void) rhport;
168168
(void) dev_addr;
169169
(void) ep_addr;
170170

src/portable/raspberrypi/rp2040/hcd_rp2040.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -625,8 +625,8 @@ bool hcd_setup_send(uint8_t rhport, uint8_t dev_addr, uint8_t const setup_packet
625625
return true;
626626
}
627627

628-
bool hcd_edpt_clear_stall(uint8_t dev_addr, uint8_t ep_addr)
629-
{
628+
bool hcd_edpt_clear_stall(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr) {
629+
(void) rhport;
630630
(void) dev_addr;
631631
(void) ep_addr;
632632

src/portable/renesas/rusb2/hcd_rusb2.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -718,8 +718,8 @@ bool hcd_edpt_abort_xfer(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr) {
718718
return false;
719719
}
720720

721-
bool hcd_edpt_clear_stall(uint8_t dev_addr, uint8_t ep_addr)
722-
{
721+
bool hcd_edpt_clear_stall(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr) {
722+
(void) rhport;
723723
uint16_t volatile *ctr = addr_to_pipectr(dev_addr, ep_addr);
724724
TU_ASSERT(ctr);
725725

0 commit comments

Comments
 (0)