From d14c26fb09ddb40e8310120cd86e6cf0a92d5d5e Mon Sep 17 00:00:00 2001 From: arighi Date: Fri, 24 Sep 2010 12:41:42 +0000 Subject: [PATCH] USB: rename usb_keyboard module in usbkbd git-svn-id: https://src.develer.com/svnoss/bertos/trunk@4292 38d2e660-2303-0410-9eaa-f027e97ec537 --- bertos/cfg/{cfg_usb_keyboard.h => cfg_usbkbd.h} | 6 +++--- bertos/drv/{usb_keyboard.c => usbkbd.c} | 8 ++++---- bertos/drv/{usb_keyboard.h => usbkbd.h} | 14 +++++++------- 3 files changed, 14 insertions(+), 14 deletions(-) rename bertos/cfg/{cfg_usb_keyboard.h => cfg_usbkbd.h} (93%) rename bertos/drv/{usb_keyboard.c => usbkbd.c} (98%) rename bertos/drv/{usb_keyboard.h => usbkbd.h} (85%) diff --git a/bertos/cfg/cfg_usb_keyboard.h b/bertos/cfg/cfg_usbkbd.h similarity index 93% rename from bertos/cfg/cfg_usb_keyboard.h rename to bertos/cfg/cfg_usbkbd.h index 2937c278..f7ade6eb 100644 --- a/bertos/cfg/cfg_usb_keyboard.h +++ b/bertos/cfg/cfg_usbkbd.h @@ -32,11 +32,11 @@ * * \author Andrea Righi * - * \brief Configuration file for the usb-keyboard driver module + * \brief Configuration file for the usbkbd driver module */ -#ifndef CFG_USB_KEYBOARD_H -#define CFG_USB_KEYBOARD_H +#ifndef CFG_USBKBD_H +#define CFG_USBKBD_H /** * Module logging level. diff --git a/bertos/drv/usb_keyboard.c b/bertos/drv/usbkbd.c similarity index 98% rename from bertos/drv/usb_keyboard.c rename to bertos/drv/usbkbd.c index ff39b94f..24608770 100644 --- a/bertos/drv/usb_keyboard.c +++ b/bertos/drv/usbkbd.c @@ -36,7 +36,7 @@ * */ -#include "cfg/cfg_usb_keyboard.h" +#include "cfg/cfg_usbkbd.h" #define LOG_LEVEL USB_KEYBOARD_LOG_LEVEL #define LOG_FORMAT USB_KEYBOARD_LOG_FORMAT @@ -52,7 +52,7 @@ #include #include "drv/usb_hid.h" -#include "drv/usb_keyboard.h" +#include "drv/usbkbd.h" /* * HID device configuration (usb-keyboard) @@ -279,7 +279,7 @@ static int usb_keyboard_hw_init(void) } /* Send a keyboard event */ -void usb_keyboardSendEvent(uint8_t mod, uint8_t code) +void usbkbd_sendEvent(uint8_t mod, uint8_t code) { report[0] = mod; report[2] = code; @@ -291,7 +291,7 @@ void usb_keyboardSendEvent(uint8_t mod, uint8_t code) * * TODO: support more than one device at the same time. */ -int usb_keyboardInit(UNUSED_ARG(int, unit)) +int usbkbd_init(UNUSED_ARG(int, unit)) { #if CONFIG_KERN MOD_CHECK(proc); diff --git a/bertos/drv/usb_keyboard.h b/bertos/drv/usbkbd.h similarity index 85% rename from bertos/drv/usb_keyboard.h rename to bertos/drv/usbkbd.h index 25dad128..1b4cd3e1 100644 --- a/bertos/drv/usb_keyboard.h +++ b/bertos/drv/usbkbd.h @@ -34,15 +34,15 @@ * * \brief Generic USB keyboard device driver. * - * $WIZ$ module_name = "usb_keyboard" - * $WIZ$ module_configuration = "bertos/cfg/cfg_usb_keyboard.h" + * $WIZ$ module_name = "usbkbd" + * $WIZ$ module_configuration = "bertos/cfg/cfg_usbkbd.h" * $WIZ$ module_depends = "usb" */ -#ifndef USB_KEYBOARD_H -#define USB_KEYBOARD_H +#ifndef USBKBD_H +#define USBKBD_H -void usb_keyboardSendEvent(uint8_t mod, uint8_t code); -int usb_keyboardInit(int unit); +void usbkbd_sendEvent(uint8_t mod, uint8_t code); +int usbkbd_init(int unit); -#endif /* USB_KEYBOARD_H */ +#endif /* USBKBD_H */ -- 2.25.1