From: arighi Date: Fri, 24 Sep 2010 10:36:33 +0000 (+0000) Subject: USB: coding style fixes X-Git-Tag: 2.6.0~114 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=1c1d583a5bbb547f449de508cf42f3affead7ecd;p=bertos.git USB: coding style fixes git-svn-id: https://src.develer.com/svnoss/bertos/trunk@4287 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/bertos/drv/usb_hid.h b/bertos/drv/usb_hid.h index 0253809d..7cf09d52 100644 --- a/bertos/drv/usb_hid.h +++ b/bertos/drv/usb_hid.h @@ -65,7 +65,7 @@ /* * USB HID descriptor */ -typedef struct usb_hid_descriptor +typedef struct usb_HidDesc { uint8_t bLength; uint8_t bDescriptorType; @@ -74,6 +74,6 @@ typedef struct usb_hid_descriptor uint8_t bNumDescriptors; uint8_t bDescriptorHidType; uint16_t wDescriptorLength; -} PACKED usb_hid_descriptor_t; +} PACKED usb_HidDesc; #endif /* USB_HID_H */ diff --git a/bertos/drv/usb_keyboard.c b/bertos/drv/usb_keyboard.c index 69ad6417..ff39b94f 100644 --- a/bertos/drv/usb_keyboard.c +++ b/bertos/drv/usb_keyboard.c @@ -151,7 +151,7 @@ static const uint8_t hid_report_descriptor[] = 0xC0, // End Collection }; -static const usb_hid_descriptor_t usb_hid_descriptor = +static const usb_HidDesc usb_hid_descriptor = { .bLength = sizeof(usb_hid_descriptor), .bDescriptorType = HID_DT_HID, @@ -279,7 +279,7 @@ static int usb_keyboard_hw_init(void) } /* Send a keyboard event */ -void usb_keyboard_send_event(uint8_t mod, uint8_t code) +void usb_keyboardSendEvent(uint8_t mod, uint8_t code) { report[0] = mod; report[2] = code; @@ -291,7 +291,7 @@ void usb_keyboard_send_event(uint8_t mod, uint8_t code) * * TODO: support more than one device at the same time. */ -int usb_keyboard_init(UNUSED_ARG(int, unit)) +int usb_keyboardInit(UNUSED_ARG(int, unit)) { #if CONFIG_KERN MOD_CHECK(proc); diff --git a/bertos/drv/usb_keyboard.h b/bertos/drv/usb_keyboard.h index d3a331c6..25dad128 100644 --- a/bertos/drv/usb_keyboard.h +++ b/bertos/drv/usb_keyboard.h @@ -42,7 +42,7 @@ #ifndef USB_KEYBOARD_H #define USB_KEYBOARD_H -void usb_keyboard_send_event(uint8_t mod, uint8_t code); -int usb_keyboard_init(int unit); +void usb_keyboardSendEvent(uint8_t mod, uint8_t code); +int usb_keyboardInit(int unit); #endif /* USB_KEYBOARD_H */ diff --git a/bertos/drv/usb_mouse.c b/bertos/drv/usb_mouse.c index 748ffc3b..7a59c769 100644 --- a/bertos/drv/usb_mouse.c +++ b/bertos/drv/usb_mouse.c @@ -140,7 +140,7 @@ static const uint8_t hid_report_descriptor[] = 0xC0 // End Collection }; -static const usb_hid_descriptor_t usb_hid_descriptor = +static const usb_HidDesc usb_hid_descriptor = { .bLength = sizeof(usb_hid_descriptor), .bDescriptorType = HID_DT_HID,