X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fusbmouse.c;h=ba468ca54aa74aa065e1ae8325242018f3e100fe;hb=7911a6f01bc8a19f220f98e2fdc8595f65996853;hp=a562f58287feaa0da985811d9dd81298cbc92448;hpb=46a1dfc5b039beb4495945e534c746bcce91edae;p=bertos.git

diff --git a/bertos/drv/usbmouse.c b/bertos/drv/usbmouse.c
index a562f582..ba468ca5 100644
--- a/bertos/drv/usbmouse.c
+++ b/bertos/drv/usbmouse.c
@@ -34,8 +34,13 @@
  *
  * \brief Generic USB mouse device driver.
  *
+ * notest: avr
+ * notest: arm
  */
 
+#include "usb_hid.h"
+#include "usbmouse.h"
+
 #include "cfg/cfg_usbmouse.h"
 
 #define LOG_LEVEL  USB_MOUSE_LOG_LEVEL
@@ -52,14 +57,12 @@
 #include <drv/usb.h>
 #include <drv/usb_endpoint.h>
 
-#include "drv/usb_hid.h"
-#include "drv/usbmouse.h"
 
 /*
  * HID device configuration (usb-mouse)
  */
-#define USB_HID_VENDOR_ID	0xffff /* custom */
-#define USB_HID_PRODUCT_ID	0x0000
+#define USB_HID_VENDOR_ID	USB_MOUSE_VENDOR_ID
+#define USB_HID_PRODUCT_ID	USB_MOUSE_PRODUCT_ID
 
 #define USB_HID_INTERFACES	1
 #define USB_HID_ENDPOINTS	1
@@ -172,17 +175,17 @@ static const UsbDescHeader *usb_hid_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", " ", "M", "o", "u", "s", "e"));
 
 static const UsbStringDesc *usb_hid_strings[] =
 {
-	(UsbStringDesc *)&language_str,
-	(UsbStringDesc *)&manufacturer_str,
-	(UsbStringDesc *)&product_str,
+	(const UsbStringDesc *)&language_str,
+	(const UsbStringDesc *)&manufacturer_str,
+	(const UsbStringDesc *)&product_str,
 	NULL,
 };