X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fusbkbd.c;h=3cf552d00c4263e8cbd53b114b2931267c6aec52;hb=bfe473a7e8951b16edbd6559b828a37e6ce378aa;hp=02d1c7d9304b1f4d7c1b59e8df984102c1df8b99;hpb=46a1dfc5b039beb4495945e534c746bcce91edae;p=bertos.git diff --git a/bertos/drv/usbkbd.c b/bertos/drv/usbkbd.c index 02d1c7d9..3cf552d0 100644 --- 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 @@ -183,18 +183,18 @@ 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", " ", "K", "e", "y", "b", "o", "a", "r", "d")); 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, };