Skip to content

Commit 2d90df4

Browse files
jfischer-nonashif
authored andcommitted
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 a1474a9 commit 2d90df4

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
@@ -86,7 +86,7 @@ static void sample_fix_code_triple(struct usbd_context *uds_ctx,
8686
}
8787
}
8888

89-
struct usbd_context *sample_usbd_init_device(usbd_msg_cb_t msg_cb)
89+
struct usbd_context *sample_usbd_setup_device(usbd_msg_cb_t msg_cb)
9090
{
9191
int err;
9292

@@ -173,6 +173,17 @@ struct usbd_context *sample_usbd_init_device(usbd_msg_cb_t msg_cb)
173173
}
174174
}
175175

176+
return &sample_usbd;
177+
}
178+
179+
struct usbd_context *sample_usbd_init_device(usbd_msg_cb_t msg_cb)
180+
{
181+
int err;
182+
183+
if (sample_usbd_setup_device(msg_cb) == NULL) {
184+
return NULL;
185+
}
186+
176187
/* doc device init start */
177188
err = usbd_init(&sample_usbd);
178189
if (err) {

0 commit comments

Comments
 (0)