Regenerated arduino aprs project and enable it in nightly tests.

[bertos.git] / bertos / drv / usbser.c

diff --git a/bertos/drv/usbser.c b/bertos/drv/usbser.c
index 78444b136b66446e59087283b03844b838887421..04eb3d82b1526b84ecb23b7107ef939b83761d33 100644 (file)
--- 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 <string.h> /* 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,
 };