From ec164c389c99d8129f9d6cacda2731bde9b08257 Mon Sep 17 00:00:00 2001 From: Aidan MacDonald Date: Sun, 19 Sep 2021 11:44:38 +0100 Subject: usb: introduce new control request API Change-Id: I6545d8985ab683c026f28f6a7c0e23b40d0a6506 --- firmware/target/arm/as3525/usb-drv-as3525.c | 4 ++-- firmware/target/arm/rk27xx/usb-drv-rk27xx.c | 2 +- firmware/target/arm/tms320dm320/sansa-connect/tnetv105_usb_drv.c | 2 +- firmware/target/arm/usb-drv-arc.c | 2 +- firmware/target/arm/usb-s3c6400x.c | 2 +- firmware/target/arm/usb-tcc.c | 2 +- firmware/target/mips/ingenic_jz47xx/usb-jz4740.c | 2 +- firmware/target/mips/ingenic_jz47xx/usb-jz4760.c | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) (limited to 'firmware/target') diff --git a/firmware/target/arm/as3525/usb-drv-as3525.c b/firmware/target/arm/as3525/usb-drv-as3525.c index 8369edc400..d0875ed48c 100644 --- a/firmware/target/arm/as3525/usb-drv-as3525.c +++ b/firmware/target/arm/as3525/usb-drv-as3525.c @@ -655,7 +655,7 @@ static void handle_out_ep(int ep) req->wIndex, req->wLength); - usb_core_control_request(&req_copy); + usb_core_legacy_control_request(&req_copy); setup_desc_init(setup_desc); ep_sts &= ~USB_EP_STAT_SETUP_RCVD; @@ -760,7 +760,7 @@ void INT_USB_FUNC(void) got_set_configuration = 1; set_config.wValue = USB_DEV_STS & USB_DEV_STS_MASK_CFG; - usb_core_control_request(&set_config); + usb_core_legacy_control_request(&set_config); intr &= ~USB_DEV_INTR_SET_CONFIG; } if (intr & USB_DEV_INTR_EARLY_SUSPEND) {/* idle >3ms detected */ diff --git a/firmware/target/arm/rk27xx/usb-drv-rk27xx.c b/firmware/target/arm/rk27xx/usb-drv-rk27xx.c index aac271c47a..77860b5494 100644 --- a/firmware/target/arm/rk27xx/usb-drv-rk27xx.c +++ b/firmware/target/arm/rk27xx/usb-drv-rk27xx.c @@ -117,7 +117,7 @@ static void setup_received(void) setup_data[1] = SETUP2; /* pass setup data to the upper layer */ - usb_core_control_request((struct usb_ctrlrequest*)setup_data); + usb_core_legacy_control_request((struct usb_ctrlrequest*)setup_data); } static int max_pkt_size(struct endpoint_t *endp) diff --git a/firmware/target/arm/tms320dm320/sansa-connect/tnetv105_usb_drv.c b/firmware/target/arm/tms320dm320/sansa-connect/tnetv105_usb_drv.c index f1acc9c964..e5a9000f40 100644 --- a/firmware/target/arm/tms320dm320/sansa-connect/tnetv105_usb_drv.c +++ b/firmware/target/arm/tms320dm320/sansa-connect/tnetv105_usb_drv.c @@ -1181,7 +1181,7 @@ void VLYNQ(void) } /* Process control packet */ - usb_core_control_request(&setup); + usb_core_legacy_control_request(&setup); } if (sysIntrStatus.f.ep0_in_ack) diff --git a/firmware/target/arm/usb-drv-arc.c b/firmware/target/arm/usb-drv-arc.c index 4c53108f12..22751f27f0 100644 --- a/firmware/target/arm/usb-drv-arc.c +++ b/firmware/target/arm/usb-drv-arc.c @@ -877,7 +877,7 @@ static void control_received(void) } } - usb_core_control_request((struct usb_ctrlrequest*)tmp); + usb_core_legacy_control_request((struct usb_ctrlrequest*)tmp); } static void transfer_completed(void) diff --git a/firmware/target/arm/usb-s3c6400x.c b/firmware/target/arm/usb-s3c6400x.c index 71d04e6f2a..0f3ecf8c00 100644 --- a/firmware/target/arm/usb-s3c6400x.c +++ b/firmware/target/arm/usb-s3c6400x.c @@ -522,7 +522,7 @@ static void handle_ep_int(int ep, bool out) ep0_setup_pkt->bRequest == USB_REQ_SET_ADDRESS) DCFG = (DCFG & ~bitm(DCFG, devadr)) | (ep0_setup_pkt->wValue << DCFG_devadr_bitp); - usb_core_control_request(ep0_setup_pkt); + usb_core_legacy_control_request(ep0_setup_pkt); } } diff --git a/firmware/target/arm/usb-tcc.c b/firmware/target/arm/usb-tcc.c index 8ce75b6764..53f101c471 100644 --- a/firmware/target/arm/usb-tcc.c +++ b/firmware/target/arm/usb-tcc.c @@ -251,7 +251,7 @@ void handle_control(void) DEBUG(2, "req: %02x %02d", req->bRequestType, req->bRequest); } - usb_core_control_request(req); + usb_core_legacy_control_request(req); } static diff --git a/firmware/target/mips/ingenic_jz47xx/usb-jz4740.c b/firmware/target/mips/ingenic_jz47xx/usb-jz4740.c index 8d04c54a68..07d24be380 100644 --- a/firmware/target/mips/ingenic_jz47xx/usb-jz4740.c +++ b/firmware/target/mips/ingenic_jz47xx/usb-jz4740.c @@ -239,7 +239,7 @@ static void EP0_handler(void) { readFIFO(ep_recv, REG_USB_REG_COUNT0); REG_USB_REG_CSR0 = csr0 | USB_CSR0_SVDOUTPKTRDY; /* clear OUTPKTRDY bit */ - usb_core_control_request((struct usb_ctrlrequest*)ep_recv->buf); + usb_core_legacy_control_request((struct usb_ctrlrequest*)ep_recv->buf); } } diff --git a/firmware/target/mips/ingenic_jz47xx/usb-jz4760.c b/firmware/target/mips/ingenic_jz47xx/usb-jz4760.c index 5dbf9455e3..6db4a25d5c 100644 --- a/firmware/target/mips/ingenic_jz47xx/usb-jz4760.c +++ b/firmware/target/mips/ingenic_jz47xx/usb-jz4760.c @@ -335,7 +335,7 @@ static void EP0_handler(void) ep0_data_requested = true; else ep0_data_supplied = true; REG_USB_CSR0 = csr0; - usb_core_control_request(&ep0_rx.request); + usb_core_legacy_control_request(&ep0_rx.request); ep_transfer_completed(ep_recv); } } -- cgit v1.2.3