projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove path from toolchain when creating presets (use the system one).
[bertos.git]
/
bertos
/
drv
/
usbkbd.c
diff --git
a/bertos/drv/usbkbd.c
b/bertos/drv/usbkbd.c
index 02d1c7d9304b1f4d7c1b59e8df984102c1df8b99..bdacc41c2c3549d1ad8b585254fb26ac3e12901a 100644
(file)
--- a/
bertos/drv/usbkbd.c
+++ b/
bertos/drv/usbkbd.c
@@
-36,6
+36,9
@@
*
*/
*
*/
+#include "usb_hid.h"
+#include "usbkbd.h"
+
#include "cfg/cfg_usbkbd.h"
#define LOG_LEVEL USB_KEYBOARD_LOG_LEVEL
#include "cfg/cfg_usbkbd.h"
#define LOG_LEVEL USB_KEYBOARD_LOG_LEVEL
@@
-52,14
+55,12
@@
#include <drv/usb.h>
#include <drv/usb_endpoint.h>
#include <drv/usb.h>
#include <drv/usb_endpoint.h>
-#include "drv/usb_hid.h"
-#include "drv/usbkbd.h"
/*
* HID device configuration (usb-keyboard)
*/
/*
* 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
#define USB_HID_INTERFACES 1
#define USB_HID_ENDPOINTS 1
@@
-183,18
+184,18
@@
static const UsbDescHeader *usb_hid_config[] =
NULL,
};
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"));
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[] =
{
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,
};
NULL,
};