Skip to content

Commit c1065e0

Browse files
jfischer-nojhedberg
jfischer-no
authored and
jhedberg
committed
usb: host: rework ch9 tools to work on USB device
Use the USB device structure and wrappers introduced earlier. With this patch, users of ch9 requests do not need to work directly with the UHC API. The requests are now blocked until there is a response from the UHC. Callers finally have access to the data buffer and request status. Signed-off-by: Johann Fischer <[email protected]>
1 parent c3bcf31 commit c1065e0

File tree

4 files changed

+272
-193
lines changed

4 files changed

+272
-193
lines changed

‎subsys/usb/host/usbh_ch9.c‎

Lines changed: 127 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,43 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
#include <zephyr/kernel.h>
87
#include <errno.h>
9-
#include <zephyr/drivers/usb/uhc.h>
8+
9+
#include <zephyr/kernel.h>
10+
#include <zephyr/usb/usbh.h>
1011
#include <zephyr/usb/usb_ch9.h>
1112
#include <zephyr/sys/byteorder.h>
1213
#include <zephyr/net/buf.h>
1314

15+
#include "usbh_device.h"
16+
1417
#include <zephyr/logging/log.h>
1518
LOG_MODULE_REGISTER(usbh_ch9, CONFIG_USBH_LOG_LEVEL);
1619

17-
#define SETUP_REQ_TIMEOUT 1000U
20+
/*
21+
* For now we set it to the upper limit defined in Chapter
22+
* "9.2.6.4 Standard Device Requests"
23+
* This will need to be revised and set depending on the request.
24+
*/
25+
#define SETUP_REQ_TIMEOUT 5000U
26+
27+
K_SEM_DEFINE(ch9_req_sync, 0, 1);
1828

19-
int usbh_req_setup(const struct device *dev,
20-
const uint8_t addr,
29+
static int ch9_req_cb(struct usb_device *const udev, struct uhc_transfer *const xfer)
30+
{
31+
LOG_DBG("Request finished %p, err %d", xfer, xfer->err);
32+
k_sem_give(&ch9_req_sync);
33+
34+
return 0;
35+
}
36+
37+
int usbh_req_setup(struct usb_device *const udev,
2138
const uint8_t bmRequestType,
2239
const uint8_t bRequest,
2340
const uint16_t wValue,
2441
const uint16_t wIndex,
2542
const uint16_t wLength,
26-
uint8_t *const data)
43+
struct net_buf *const buf)
2744
{
2845
struct usb_setup_packet req = {
2946
.bmRequestType = bmRequestType,
@@ -33,139 +50,188 @@ int usbh_req_setup(const struct device *dev,
3350
.wLength = sys_cpu_to_le16(wLength),
3451
};
3552
struct uhc_transfer *xfer;
36-
struct net_buf *buf;
3753
uint8_t ep = usb_reqtype_is_to_device(&req) ? 0x00 : 0x80;
3854
int ret;
3955

40-
xfer = uhc_xfer_alloc(dev, addr, ep, 0, 64, SETUP_REQ_TIMEOUT, NULL, NULL);
56+
xfer = usbh_xfer_alloc(udev, ep, 0, 64, SETUP_REQ_TIMEOUT, (void *)ch9_req_cb);
4157
if (!xfer) {
4258
return -ENOMEM;
4359
}
4460

4561
memcpy(xfer->setup_pkt, &req, sizeof(req));
4662

47-
if (wLength) {
48-
buf = uhc_xfer_buf_alloc(dev, wLength);
49-
if (!buf) {
50-
ret = -ENOMEM;
51-
goto buf_alloc_err;
52-
}
53-
54-
if (usb_reqtype_is_to_device(&req) && data != NULL) {
55-
net_buf_add_mem(buf, data, wLength);
56-
}
57-
58-
ret = uhc_xfer_buf_add(dev, xfer, buf);
63+
if (wLength && buf != NULL) {
64+
ret = usbh_xfer_buf_add(udev, xfer, buf);
5965
if (ret) {
6066
goto buf_alloc_err;
6167
}
6268
}
6369

64-
return uhc_ep_enqueue(dev, xfer);
70+
ret = usbh_xfer_enqueue(udev, xfer);
71+
if (ret) {
72+
goto buf_alloc_err;
73+
}
74+
75+
k_sem_take(&ch9_req_sync, K_MSEC(SETUP_REQ_TIMEOUT));
76+
ret = xfer->err;
6577

6678
buf_alloc_err:
67-
uhc_xfer_free(dev, xfer);
79+
usbh_xfer_free(udev, xfer);
6880

6981
return ret;
7082
}
7183

72-
int usbh_req_desc(const struct device *dev,
73-
const uint8_t addr,
84+
int usbh_req_desc(struct usb_device *const udev,
7485
const uint8_t type, const uint8_t index,
7586
const uint8_t id,
76-
const uint16_t len)
87+
const uint16_t len,
88+
struct net_buf *const buf)
7789
{
7890
const uint8_t bmRequestType = USB_REQTYPE_DIR_TO_HOST << 7;
7991
const uint8_t bRequest = USB_SREQ_GET_DESCRIPTOR;
8092
const uint16_t wValue = (type << 8) | index;
8193

82-
return usbh_req_setup(dev, addr,
94+
return usbh_req_setup(udev,
8395
bmRequestType, bRequest, wValue, id, len,
84-
NULL);
96+
buf);
8597
}
8698

87-
int usbh_req_desc_dev(const struct device *dev,
88-
const uint8_t addr)
99+
int usbh_req_desc_dev(struct usb_device *const udev,
100+
struct usb_device_descriptor *const desc)
89101
{
90102
const uint8_t type = USB_DESC_DEVICE;
91-
const uint16_t wLength = 18;
103+
const uint16_t wLength = sizeof(struct usb_device_descriptor);
104+
struct net_buf *buf;
105+
int ret;
106+
107+
buf = usbh_xfer_buf_alloc(udev, wLength);
108+
if (!buf) {
109+
return -ENOMEM;
110+
}
111+
112+
ret = usbh_req_desc(udev, type, 0, 0, wLength, buf);
113+
if (ret == 0 && buf->len == wLength) {
114+
memcpy(desc, buf->data, wLength);
115+
desc->bcdUSB = sys_le16_to_cpu(desc->bcdUSB);
116+
desc->idVendor = sys_le16_to_cpu(desc->idVendor);
117+
desc->idProduct = sys_le16_to_cpu(desc->idProduct);
118+
desc->bcdDevice = sys_le16_to_cpu(desc->bcdDevice);
119+
}
92120

93-
return usbh_req_desc(dev, addr, type, 0, 0, wLength);
121+
usbh_xfer_buf_free(udev, buf);
122+
123+
return ret;
94124
}
95125

96-
int usbh_req_desc_cfg(const struct device *dev,
97-
const uint8_t addr,
126+
int usbh_req_desc_cfg(struct usb_device *const udev,
98127
const uint8_t index,
99-
const uint16_t len)
128+
const uint16_t len,
129+
struct usb_cfg_descriptor *const desc)
100130
{
101131
const uint8_t type = USB_DESC_CONFIGURATION;
132+
const uint16_t wLength = len;
133+
struct net_buf *buf;
134+
int ret;
135+
136+
buf = usbh_xfer_buf_alloc(udev, len);
137+
if (!buf) {
138+
return -ENOMEM;
139+
}
102140

103-
return usbh_req_desc(dev, addr, type, index, 0, len);
141+
ret = usbh_req_desc(udev, type, index, 0, wLength, buf);
142+
if (ret == 0) {
143+
memcpy(desc, buf->data, len);
144+
desc->wTotalLength = sys_le16_to_cpu(desc->wTotalLength);
145+
}
146+
147+
usbh_xfer_buf_free(udev, buf);
148+
149+
return ret;
104150
}
105151

106-
int usbh_req_set_address(const struct device *dev,
107-
const uint8_t addr, const uint8_t new)
152+
int usbh_req_set_address(struct usb_device *const udev,
153+
const uint8_t addr)
108154
{
109155
const uint8_t bmRequestType = USB_REQTYPE_DIR_TO_DEVICE << 7;
110156
const uint8_t bRequest = USB_SREQ_SET_ADDRESS;
157+
int ret;
111158

112-
return usbh_req_setup(dev, addr,
113-
bmRequestType, bRequest, new, 0, 0,
114-
NULL);
159+
ret = usbh_req_setup(udev, bmRequestType, bRequest, addr, 0, 0, NULL);
160+
if (ret == 0) {
161+
udev->addr = addr;
162+
if (addr == 0) {
163+
udev->state = USB_STATE_DEFAULT;
164+
}
165+
166+
if (addr != 0 && udev->state == USB_STATE_DEFAULT) {
167+
udev->state = USB_STATE_ADDRESSED;
168+
}
169+
}
170+
171+
return ret;
115172
}
116173

117-
int usbh_req_set_cfg(const struct device *dev,
118-
const uint8_t addr, const uint8_t new)
174+
int usbh_req_set_cfg(struct usb_device *const udev,
175+
const uint8_t cfg)
119176
{
120177
const uint8_t bmRequestType = USB_REQTYPE_DIR_TO_DEVICE << 7;
121178
const uint8_t bRequest = USB_SREQ_SET_CONFIGURATION;
179+
int ret;
122180

123-
return usbh_req_setup(dev, addr,
124-
bmRequestType, bRequest, new, 0, 0,
125-
NULL);
181+
/* Ignore the required state change condition for now. */
182+
ret = usbh_req_setup(udev, bmRequestType, bRequest, cfg, 0, 0, NULL);
183+
if (ret == 0) {
184+
udev->actual_cfg = cfg;
185+
if (cfg == 0) {
186+
udev->state = USB_STATE_ADDRESSED;
187+
}
188+
189+
if (cfg != 0 && udev->state == USB_STATE_ADDRESSED) {
190+
udev->state = USB_STATE_CONFIGURED;
191+
}
192+
}
193+
194+
return ret;
126195
}
127196

128-
int usbh_req_set_alt(const struct device *dev,
129-
const uint8_t addr, const uint8_t iface,
130-
const uint8_t alt)
197+
int usbh_req_set_alt(struct usb_device *const udev,
198+
const uint8_t iface, const uint8_t alt)
131199
{
132200
const uint8_t bmRequestType = USB_REQTYPE_DIR_TO_DEVICE << 7 |
133201
USB_REQTYPE_RECIPIENT_INTERFACE;
134202
const uint8_t bRequest = USB_SREQ_SET_INTERFACE;
135203
const uint16_t wValue = alt;
136204
const uint16_t wIndex = iface;
137205

138-
return usbh_req_setup(dev, addr,
206+
return usbh_req_setup(udev,
139207
bmRequestType, bRequest, wValue, wIndex, 0,
140208
NULL);
141209
}
142210

143-
int usbh_req_set_sfs_rwup(const struct device *dev,
144-
const uint8_t addr)
211+
int usbh_req_set_sfs_rwup(struct usb_device *const udev)
145212
{
146213
const uint8_t bmRequestType = USB_REQTYPE_DIR_TO_DEVICE << 7;
147214
const uint8_t bRequest = USB_SREQ_SET_FEATURE;
148215
const uint16_t wValue = USB_SFS_REMOTE_WAKEUP;
149216

150-
return usbh_req_setup(dev, addr,
217+
return usbh_req_setup(udev,
151218
bmRequestType, bRequest, wValue, 0, 0,
152219
NULL);
153220
}
154221

155-
int usbh_req_clear_sfs_rwup(const struct device *dev,
156-
const uint8_t addr)
222+
int usbh_req_clear_sfs_rwup(struct usb_device *const udev)
157223
{
158224
const uint8_t bmRequestType = USB_REQTYPE_DIR_TO_DEVICE << 7;
159225
const uint8_t bRequest = USB_SREQ_CLEAR_FEATURE;
160226
const uint16_t wValue = USB_SFS_REMOTE_WAKEUP;
161227

162-
return usbh_req_setup(dev, addr,
228+
return usbh_req_setup(udev,
163229
bmRequestType, bRequest, wValue, 0, 0,
164230
NULL);
165231
}
166232

167-
int usbh_req_set_hcfs_ppwr(const struct device *dev,
168-
const uint8_t addr, const uint8_t port)
233+
int usbh_req_set_hcfs_ppwr(struct usb_device *const udev,
234+
const uint8_t port)
169235
{
170236
const uint8_t bmRequestType = USB_REQTYPE_DIR_TO_DEVICE << 7 |
171237
USB_REQTYPE_TYPE_CLASS << 5 |
@@ -174,13 +240,13 @@ int usbh_req_set_hcfs_ppwr(const struct device *dev,
174240
const uint16_t wValue = USB_HCFS_PORT_POWER;
175241
const uint16_t wIndex = port;
176242

177-
return usbh_req_setup(dev, addr,
243+
return usbh_req_setup(udev,
178244
bmRequestType, bRequest, wValue, wIndex, 0,
179245
NULL);
180246
}
181247

182-
int usbh_req_set_hcfs_prst(const struct device *dev,
183-
const uint8_t addr, const uint8_t port)
248+
int usbh_req_set_hcfs_prst(struct usb_device *const udev,
249+
const uint8_t port)
184250
{
185251
const uint8_t bmRequestType = USB_REQTYPE_DIR_TO_DEVICE << 7 |
186252
USB_REQTYPE_TYPE_CLASS << 5 |
@@ -189,7 +255,7 @@ int usbh_req_set_hcfs_prst(const struct device *dev,
189255
const uint16_t wValue = USB_HCFS_PORT_RESET;
190256
const uint16_t wIndex = port;
191257

192-
return usbh_req_setup(dev, addr,
258+
return usbh_req_setup(udev,
193259
bmRequestType, bRequest, wValue, wIndex, 0,
194260
NULL);
195261
}

‎subsys/usb/host/usbh_ch9.h‎

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,49 +10,48 @@
1010
#include <stdint.h>
1111
#include <zephyr/usb/usbh.h>
1212

13-
int usbh_req_setup(const struct device *dev,
14-
const uint8_t addr,
13+
#include "usbh_device.h"
14+
15+
int usbh_req_setup(struct usb_device *const udev,
1516
const uint8_t bmRequestType,
1617
const uint8_t bRequest,
1718
const uint16_t wValue,
1819
const uint16_t wIndex,
1920
const uint16_t wLength,
20-
uint8_t *const data);
21+
struct net_buf *const data);
2122

22-
int usbh_req_desc(const struct device *dev,
23-
const uint8_t addr,
23+
int usbh_req_desc(struct usb_device *const udev,
2424
const uint8_t type, const uint8_t index,
2525
const uint8_t id,
26-
const uint16_t len);
26+
const uint16_t len,
27+
struct net_buf *const data);
2728

28-
int usbh_req_desc_dev(const struct device *dev,
29-
const uint8_t addr);
29+
int usbh_req_desc_dev(struct usb_device *const udev,
30+
struct usb_device_descriptor *const dev);
3031

31-
int usbh_req_desc_cfg(const struct device *dev,
32-
const uint8_t addr,
32+
int usbh_req_desc_cfg(struct usb_device *const udev,
3333
const uint8_t index,
34-
const uint16_t len);
34+
const uint16_t len,
35+
struct usb_cfg_descriptor *const desc);
3536

36-
int usbh_req_set_alt(const struct device *dev,
37-
const uint8_t addr, const uint8_t iface,
37+
int usbh_req_set_alt(struct usb_device *const udev,
38+
const uint8_t iface,
3839
const uint8_t alt);
3940

40-
int usbh_req_set_address(const struct device *dev,
41-
const uint8_t addr, const uint8_t new);
41+
int usbh_req_set_address(struct usb_device *const udev,
42+
const uint8_t addr);
4243

43-
int usbh_req_set_cfg(const struct device *dev,
44-
const uint8_t addr, const uint8_t new);
44+
int usbh_req_set_cfg(struct usb_device *const udev,
45+
const uint8_t cfg);
4546

46-
int usbh_req_set_sfs_rwup(const struct device *dev,
47-
const uint8_t addr);
47+
int usbh_req_set_sfs_rwup(struct usb_device *const udev);
4848

49-
int usbh_req_clear_sfs_rwup(const struct device *dev,
50-
const uint8_t addr);
49+
int usbh_req_clear_sfs_rwup(struct usb_device *const udev);
5150

52-
int usbh_req_set_hcfs_ppwr(const struct device *dev,
53-
const uint8_t addr, const uint8_t port);
51+
int usbh_req_set_hcfs_ppwr(const struct usb_device *udev,
52+
const uint8_t port);
5453

55-
int usbh_req_set_hcfs_prst(const struct device *dev,
56-
const uint8_t addr, const uint8_t port);
54+
int usbh_req_set_hcfs_prst(const struct usb_device *udev,
55+
const uint8_t port);
5756

5857
#endif /* ZEPHYR_INCLUDE_USBH_CH9_H */

0 commit comments

Comments
 (0)