From 2bb3aef3132932713ad7e588ad250a4e24769796 Mon Sep 17 00:00:00 2001 From: arighi Date: Fri, 24 Sep 2010 12:41:51 +0000 Subject: [PATCH] USB: rename usb_serial module in usbser git-svn-id: https://src.develer.com/svnoss/bertos/trunk@4294 38d2e660-2303-0410-9eaa-f027e97ec537 --- bertos/cfg/{cfg_usb_serial.h => cfg_usbser.h} | 6 +++--- bertos/drv/{usb_serial.c => usbser.c} | 6 +++--- bertos/drv/{usb_serial.h => usbser.h} | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) rename bertos/cfg/{cfg_usb_serial.h => cfg_usbser.h} (95%) rename bertos/drv/{usb_serial.c => usbser.c} (98%) rename bertos/drv/{usb_serial.h => usbser.h} (90%) diff --git a/bertos/cfg/cfg_usb_serial.h b/bertos/cfg/cfg_usbser.h similarity index 95% rename from bertos/cfg/cfg_usb_serial.h rename to bertos/cfg/cfg_usbser.h index 989b17e8..88fcd190 100644 --- a/bertos/cfg/cfg_usb_serial.h +++ b/bertos/cfg/cfg_usbser.h @@ -35,8 +35,8 @@ * \brief Configuration file for the USB serial driver module */ -#ifndef CFG_USB_SERIAL_H -#define CFG_USB_SERIAL_H +#ifndef CFG_USBSER_H +#define CFG_USBSER_H /** * Module logging level. @@ -54,4 +54,4 @@ */ #define USB_SERIAL_LOG_FORMAT LOG_FMT_TERSE -#endif /* CFG_USB_SERIAL_H */ +#endif /* CFG_USBSER_H */ diff --git a/bertos/drv/usb_serial.c b/bertos/drv/usbser.c similarity index 98% rename from bertos/drv/usb_serial.c rename to bertos/drv/usbser.c index be39fe69..b6c7161f 100644 --- a/bertos/drv/usb_serial.c +++ b/bertos/drv/usbser.c @@ -36,7 +36,7 @@ * */ -#include "cfg/cfg_usb_serial.h" +#include "cfg/cfg_usbser.h" #define LOG_LEVEL USB_SERIAL_LOG_LEVEL #define LOG_FORMAT USB_SERIAL_LOG_FORMAT @@ -55,7 +55,7 @@ #include /* memcpy() */ -#include "drv/usb_serial.h" +#include "drv/usbser.h" #define USB_SERIAL_VENDOR_ID 0x05f9 #define USB_SERIAL_PRODUCT_ID 0xffff @@ -293,7 +293,7 @@ static struct KFile *usb_serial_reopen(struct KFile *fd) * * \return 0 if OK, a negative value in case of error. */ -int usb_serialInit(struct USBSerial *fds, int unit) +int usbser_init(struct USBSerial *fds, int unit) { memset(fds, 0, sizeof(*fds)); diff --git a/bertos/drv/usb_serial.h b/bertos/drv/usbser.h similarity index 90% rename from bertos/drv/usb_serial.h rename to bertos/drv/usbser.h index 86ed05b9..bd65a11b 100644 --- a/bertos/drv/usb_serial.h +++ b/bertos/drv/usbser.h @@ -34,13 +34,13 @@ * * \brief Generic USB serial device driver. * - * $WIZ$ module_name = "usb_serial" - * $WIZ$ module_configuration = "bertos/cfg/cfg_usb_serial.h" + * $WIZ$ module_name = "usbser" + * $WIZ$ module_configuration = "bertos/cfg/cfg_usbser.h" * $WIZ$ module_depends = "usb" */ -#ifndef USB_SERIAL_H -#define USB_SERIAL_H +#ifndef USBSER_H +#define USBSER_H #include @@ -71,6 +71,6 @@ INLINE USBSerial *USB_SERIAL_CAST(KFile *fd) return (USBSerial *)fd; } -int usb_serialInit(struct USBSerial *fds, int unit); +int usbser_init(struct USBSerial *fds, int unit); -#endif /* USB_SERIAL_H */ +#endif /* USBSER_H */ -- 2.25.1