From a0091f18c71a19d68cf1c0de4ceb3d9e90c23c39 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Sun, 30 Jan 2011 22:43:33 +0100 Subject: Cosmetics, consistency fixes, fix compiler warnings. --- lib/usb/usb.c | 3 +-- lib/usb/usb_standard.c | 11 +++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'lib/usb') diff --git a/lib/usb/usb.c b/lib/usb/usb.c index f24f2f9..dbdb822 100644 --- a/lib/usb/usb.c +++ b/lib/usb/usb.c @@ -46,7 +46,7 @@ int usbd_init(const usbd_driver *driver, const struct usb_device_descriptor *dev, const struct usb_config_descriptor *conf, const char **strings) { - _usbd_device.driver = driver; + _usbd_device.driver = (usbd_driver *)driver; _usbd_device.desc = dev; _usbd_device.config = conf; _usbd_device.strings = strings; @@ -127,4 +127,3 @@ u8 usbd_ep_stall_get(u8 addr) { return _usbd_device.driver->ep_stall_get(addr); } - diff --git a/lib/usb/usb_standard.c b/lib/usb/usb_standard.c index adfaa23..5995387 100644 --- a/lib/usb/usb_standard.c +++ b/lib/usb/usb_standard.c @@ -137,6 +137,8 @@ static int usb_standard_set_address(struct usb_setup_data *req, u8 **buf, static int usb_standard_set_configuration(struct usb_setup_data *req, u8 **buf, u16 *len) { + int i; + (void)req; (void)buf; (void)len; @@ -151,10 +153,11 @@ static int usb_standard_set_configuration(struct usb_setup_data *req, _usbd_hw_endpoints_reset(); if (_usbd_device.user_callback_set_config) { - /* Flush control callbacks. These will be reregistered - * by the user handler. */ - int i; - for(i = 0; i < MAX_USER_CONTROL_CALLBACK; i++) + /* + * Flush control callbacks. These will be reregistered + * by the user handler. + */ + for (i = 0; i < MAX_USER_CONTROL_CALLBACK; i++) _usbd_device.user_control_callback[i].cb = NULL; _usbd_device.user_callback_set_config(req->wValue); -- cgit v1.2.3