X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fusbser.c;h=04eb3d82b1526b84ecb23b7107ef939b83761d33;hb=ce0a95c32a39e3eed1d3f2aa5ff4395bebdb99ed;hp=78444b136b66446e59087283b03844b838887421;hpb=46a1dfc5b039beb4495945e534c746bcce91edae;p=bertos.git diff --git a/bertos/drv/usbser.c b/bertos/drv/usbser.c index 78444b13..04eb3d82 100644 --- a/bertos/drv/usbser.c +++ b/bertos/drv/usbser.c @@ -36,6 +36,8 @@ * */ +#include "usbser.h" + #include "cfg/cfg_usbser.h" #define LOG_LEVEL USB_SERIAL_LOG_LEVEL @@ -56,10 +58,6 @@ #include /* memcpy() */ -#include "drv/usbser.h" - -#define USB_SERIAL_VENDOR_ID 0x05f9 -#define USB_SERIAL_PRODUCT_ID 0xffff #define USB_SERIAL_INTERFACES 1 #define USB_SERIAL_ENDPOINTS 3 @@ -149,20 +147,20 @@ static const UsbDescHeader *usb_serial_config[] = NULL, }; -static DEFINE_USB_STRING(language_str, "\x09\x04"); // Language ID: en_US -static DEFINE_USB_STRING(manufacturer_str, +static const DEFINE_USB_STRING(language_str, "\x09\x04"); // Language ID: en_US +static const DEFINE_USB_STRING(manufacturer_str, USB_STRING("B", "e", "R", "T", "O", "S")); -static DEFINE_USB_STRING(product_str, +static const DEFINE_USB_STRING(product_str, USB_STRING("U", "S", "B", "-", "s", "e", "r", "i", "a", "l")); -static DEFINE_USB_STRING(serial_str, +static const DEFINE_USB_STRING(serial_str, USB_STRING("0", "0", "1")); static const UsbStringDesc *usb_serial_strings[] = { - (UsbStringDesc *)&language_str, - (UsbStringDesc *)&manufacturer_str, - (UsbStringDesc *)&product_str, - (UsbStringDesc *)&serial_str, + (const UsbStringDesc *)&language_str, + (const UsbStringDesc *)&manufacturer_str, + (const UsbStringDesc *)&product_str, + (const UsbStringDesc *)&serial_str, NULL, };