USB: integrate vendor and product ID configuration in the wizard

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@4424 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/bertos/cfg/cfg_usbkbd.h b/bertos/cfg/cfg_usbkbd.h
index 967b541fc2080b53c0128ff0f429e435eba03196..5b6fb65ac7f348b4fe3c28859b669863212b2bb2 100644 (file)
--- a/bertos/cfg/cfg_usbkbd.h
+++ b/bertos/cfg/cfg_usbkbd.h
@@ -61,4 +61,18 @@
  */
 #define USB_KEYBOARD_LOG_FORMAT     LOG_FMT_TERSE
 
+/**
+ * USB vendor ID (please change this in your project, using a valid ID number!).
+ *
+ * $WIZ$ type = "hex"
+ */
+#define USB_KEYBOARD_VENDOR_ID      0x046d
+
+/**
+ * USB product ID (please change this in your project, using a valid ID number!).
+ *
+ * $WIZ$ type = "hex"
+ */
+#define USB_KEYBOARD_PRODUCT_ID     0xffff
+
 #endif /* CFG_USB_KEYBOARD_H */

diff --git a/bertos/cfg/cfg_usbmouse.h b/bertos/cfg/cfg_usbmouse.h
index 89ff4c531ddab571251b1722770b0f0d88fe33b8..731432846b18101c2ebbbe5c8cd060f8722e91b4 100644 (file)
--- a/bertos/cfg/cfg_usbmouse.h
+++ b/bertos/cfg/cfg_usbmouse.h
@@ -61,4 +61,18 @@
  */
 #define USB_MOUSE_LOG_FORMAT     LOG_FMT_TERSE
 
+/**
+ * USB vendor ID (please change this in your project, using a valid ID number!).
+ *
+ * $WIZ$ type = "hex"
+ */
+#define USB_MOUSE_VENDOR_ID      0xffff
+
+/**
+ * USB product ID (please change this in your project, using a valid ID number!).
+ *
+ * $WIZ$ type = "hex"
+ */
+#define USB_MOUSE_PRODUCT_ID     0x0000
+
 #endif /* CFG_USBMOUSE_H */

diff --git a/bertos/cfg/cfg_usbser.h b/bertos/cfg/cfg_usbser.h
index 6e47012a6a012787a41a9a1b4f18c65ddcdbdce3..1fa44e7329320d1419e563f1b8ece35f9759aa8b 100644 (file)
--- a/bertos/cfg/cfg_usbser.h
+++ b/bertos/cfg/cfg_usbser.h
@@ -61,4 +61,18 @@
  */
 #define USB_SERIAL_LOG_FORMAT     LOG_FMT_TERSE
 
+/**
+ * USB vendor ID (please change this in your project, using a valid ID number!).
+ *
+ * $WIZ$ type = "hex"
+ */
+#define USB_SERIAL_VENDOR_ID      0x05f9
+
+/**
+ * USB product ID (please change this in your project, using a valid ID number!).
+ *
+ * $WIZ$ type = "hex"
+ */
+#define USB_SERIAL_PRODUCT_ID     0xffff
+
 #endif /* CFG_USBSER_H */

diff --git a/bertos/drv/usbkbd.c b/bertos/drv/usbkbd.c
index 6d9f40ffaee088a6898baef812125d370ff4d6cc..3cf552d00c4263e8cbd53b114b2931267c6aec52 100644 (file)
--- a/bertos/drv/usbkbd.c
+++ b/bertos/drv/usbkbd.c
@@ -58,8 +58,8 @@
 /*
  * HID device configuration (usb-keyboard)
  */
-#define USB_HID_VENDOR_ID      0xffff /* custom */
-#define USB_HID_PRODUCT_ID     0x0000
+#define USB_HID_VENDOR_ID      USB_KEYBOARD_VENDOR_ID
+#define USB_HID_PRODUCT_ID     USB_KEYBOARD_PRODUCT_ID
 
 #define USB_HID_INTERFACES     1
 #define USB_HID_ENDPOINTS      1

diff --git a/bertos/drv/usbmouse.c b/bertos/drv/usbmouse.c
index b5f5a49d3e104fc39611d4a7b1f17b5077e66cb6..dd1708b026615cc10283e987d6f8f47cfa7b0472 100644 (file)
--- a/bertos/drv/usbmouse.c
+++ b/bertos/drv/usbmouse.c
@@ -58,8 +58,8 @@
 /*
  * 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

diff --git a/bertos/drv/usbser.c b/bertos/drv/usbser.c
index da9750da46973b997504b788b9c55fd2c8f7558c..00377d12cef07b4227905fa3a68e69bc7468261f 100644 (file)
--- a/bertos/drv/usbser.c
+++ b/bertos/drv/usbser.c
@@ -58,8 +58,8 @@
 
 #include "drv/usbser.h"
 
-#define USB_SERIAL_VENDOR_ID   0x05f9
-#define USB_SERIAL_PRODUCT_ID  0xffff
+#define USB_SERIAL_VENDOR_ID   USB_SERIAL_VENDOR_ID
+#define USB_SERIAL_PRODUCT_ID  USB_SERIAL_PRODUCT_ID
 
 #define USB_SERIAL_INTERFACES  1
 #define USB_SERIAL_ENDPOINTS   3