Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

usb: device: next: class: gs_usb: catch up with changes in Zephyr main branch #49

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions subsys/usb/device_next/class/gs_usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -832,7 +832,6 @@ static struct net_buf *gs_usb_buf_alloc(struct gs_usb_data *data, uint8_t ep)
}

bi = udc_get_buf_info(buf);
memset(bi, 0, sizeof(struct udc_buf_info));
bi->ep = ep;

return buf;
Expand Down Expand Up @@ -1539,8 +1538,6 @@ static int gs_usb_init(struct usbd_class_data *c_data)
struct gs_usb_data *data = dev->data;
struct gs_usb_desc *desc = data->desc;

desc->iad.bFirstInterface = desc->if0.bInterfaceNumber;

LOG_DBG("initialized class instance %p, interface number %u", c_data,
desc->iad.bFirstInterface);

Expand Down Expand Up @@ -1685,7 +1682,7 @@ struct usbd_class_api gs_usb_api = {
USBD_DEFINE_CLASS(gs_usb_##n, &gs_usb_api, (void *)DEVICE_DT_GET(DT_DRV_INST(n)), \
&gs_usb_vendor_requests); \
\
NET_BUF_POOL_FIXED_DEFINE(gs_usb_pool_##n, CONFIG_USBD_GS_USB_POOL_SIZE, \
UDC_BUF_POOL_DEFINE(gs_usb_pool_##n, CONFIG_USBD_GS_USB_POOL_SIZE, \
GS_USB_HOST_FRAME_MAX_SIZE, sizeof(struct udc_buf_info), NULL); \
\
static struct gs_usb_data gs_usb_data_##n = { \
Expand Down