X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=bertos%2Fdrv%2Fusbmouse.c;h=b5f5a49d3e104fc39611d4a7b1f17b5077e66cb6;hb=bce79ae17dc4b489639cd102fa7563acd129898f;hp=b725a8f46c8a667fc095bc9201631a11c7c62367;hpb=decd8b673fa117699c29f80ce29a3972320237d4;p=bertos.git diff --git a/bertos/drv/usbmouse.c b/bertos/drv/usbmouse.c index b725a8f4..b5f5a49d 100644 --- a/bertos/drv/usbmouse.c +++ b/bertos/drv/usbmouse.c @@ -50,6 +50,7 @@ #include // cpu_relax() #include +#include #include "drv/usb_hid.h" #include "drv/usbmouse.h" @@ -66,7 +67,7 @@ #define USB_STRING_MANUFACTURER 1 #define USB_STRING_PRODUCT 2 -#define USB_HID_REPORT_EP (USB_DIR_IN | 1) +#define USB_HID_REPORT_EP (USB_DIR_IN | USB_MOUSE_EP_REPORT) static UsbDeviceDesc usb_hid_device_descriptor = { @@ -171,17 +172,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, };