Skip to content

Commit 152644c

Browse files
committed
samples: usb: add samples function to setup USB device only
Add a function similar to sample_usbd_init_device(), but one that does not initialize the device. It allows the application to set additional features, such as additional descriptors. Signed-off-by: Johann Fischer <[email protected]>
1 parent d6afb8f commit 152644c

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

samples/subsys/usb/common/sample_usbd.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,11 @@
2929
*/
3030
struct usbd_context *sample_usbd_init_device(usbd_msg_cb_t msg_cb);
3131

32+
/*
33+
* This function is similar to sample_usbd_init_device(), but does not
34+
* initialize the device. It allows the application to set additional features,
35+
* such as additional descriptors.
36+
*/
37+
struct usbd_context *sample_usbd_setup_device(usbd_msg_cb_t msg_cb);
38+
3239
#endif /* ZEPHYR_SAMPLES_SUBSYS_USB_COMMON_SAMPLE_USBD_H */

samples/subsys/usb/common/sample_usbd_init.c

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static void sample_fix_code_triple(struct usbd_context *uds_ctx,
8282
}
8383
}
8484

85-
struct usbd_context *sample_usbd_init_device(usbd_msg_cb_t msg_cb)
85+
struct usbd_context *sample_usbd_setup_device(usbd_msg_cb_t msg_cb)
8686
{
8787
int err;
8888

@@ -169,6 +169,17 @@ struct usbd_context *sample_usbd_init_device(usbd_msg_cb_t msg_cb)
169169
}
170170
}
171171

172+
return &sample_usbd;
173+
}
174+
175+
struct usbd_context *sample_usbd_init_device(usbd_msg_cb_t msg_cb)
176+
{
177+
int err;
178+
179+
if (sample_usbd_setup_device(msg_cb) == NULL) {
180+
return NULL;
181+
}
182+
172183
/* doc device init start */
173184
err = usbd_init(&sample_usbd);
174185
if (err) {

0 commit comments

Comments
 (0)