diff options
author | thirdpin <n_lazareva@mail.ru> | 2016-07-13 21:18:00 +0300 |
---|---|---|
committer | thirdpin <n_lazareva@mail.ru> | 2016-07-13 21:18:00 +0300 |
commit | f3bc0a6b2c361c941d6cbd2700cdbaf305342cdc (patch) | |
tree | 2d7fcfd8e1fa33c8e787499e275b465cc1dbb56b /emb/pastilda/lib | |
parent | 84ff767e27055b020d9fe5ffebcb7b5e2ace70f6 (diff) |
add GPL to all files
Diffstat (limited to 'emb/pastilda/lib')
-rw-r--r-- | emb/pastilda/lib/libusbhost/usbh_config.h | 4 | ||||
-rw-r--r-- | emb/pastilda/lib/libusbhost/usbh_driver_hid_kbd.c | 16 | ||||
-rw-r--r-- | emb/pastilda/lib/libusbhost/usbh_driver_hid_kbd.h | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/emb/pastilda/lib/libusbhost/usbh_config.h b/emb/pastilda/lib/libusbhost/usbh_config.h index 7a7f8df..0d0f5b0 100644 --- a/emb/pastilda/lib/libusbhost/usbh_config.h +++ b/emb/pastilda/lib/libusbhost/usbh_config.h @@ -39,8 +39,12 @@ // MOUSE #define USBH_HID_MOUSE_MAX_DEVICES (2) +#define USBH_HID_KBD_MAX_DEVICES (1) + #define USBH_HID_MOUSE_BUFFER (32) +#define USBH_HID_KBD_BUFFER (32) + // MIDI // Maximal number of midi devices connected to whatever hub #define USBH_AC_MIDI_MAX_DEVICES (4) diff --git a/emb/pastilda/lib/libusbhost/usbh_driver_hid_kbd.c b/emb/pastilda/lib/libusbhost/usbh_driver_hid_kbd.c index 010d3fa..2f68cef 100644 --- a/emb/pastilda/lib/libusbhost/usbh_driver_hid_kbd.c +++ b/emb/pastilda/lib/libusbhost/usbh_driver_hid_kbd.c @@ -1,9 +1,9 @@ #include "usbh_hubbed.h" #include "usbh_device_driver.h" #include "usbh_driver_hid_kbd.h" -//#include "usart_helpers.h" #include <libopencm3/usb/usbstd.h> +#include <stdint.h> enum STATES { STATE_INACTIVE, @@ -16,7 +16,7 @@ enum STATES { struct _hid_kbd_device { usbh_device_t *usbh_device; - uint8_t buffer[USBH_HID_MOUSE_BUFFER]; + uint8_t buffer[USBH_HID_KBD_BUFFER]; uint16_t endpoint_in_maxpacketsize; uint8_t endpoint_in_address; enum STATES state_next; @@ -26,11 +26,9 @@ struct _hid_kbd_device { }; typedef struct _hid_kbd_device hid_kbd_device_t; -static hid_kbd_device_t kbd_device[USBH_HID_MOUSE_MAX_DEVICES]; +static hid_kbd_device_t kbd_device[USBH_HID_KBD_MAX_DEVICES]; static const hid_kbd_config_t *kbd_config; -#include <stdint.h> - static bool initialized = false; void hid_kbd_driver_init(const hid_kbd_config_t *config) @@ -39,7 +37,7 @@ void hid_kbd_driver_init(const hid_kbd_config_t *config) initialized = true; kbd_config = config; - for (i = 0; i < USBH_HID_MOUSE_MAX_DEVICES; i++) { + for (i = 0; i < USBH_HID_KBD_MAX_DEVICES; i++) { kbd_device[i].state_next = STATE_INACTIVE; } } @@ -54,7 +52,7 @@ static void *init(void *usbh_dev) hid_kbd_device_t *drvdata = 0; // find free data space for mouse device - for (i = 0; i < USBH_HID_MOUSE_MAX_DEVICES; i++) { + for (i = 0; i < USBH_HID_KBD_MAX_DEVICES; i++) { if (kbd_device[i].state_next == STATE_INACTIVE) { drvdata = &kbd_device[i]; drvdata->device_id = i; @@ -238,8 +236,8 @@ static const usbh_dev_driver_info_t driver_info = { .idVendor = -1, .idProduct = -1, .ifaceClass = 0x03, - .ifaceSubClass = 1, //-1 - .ifaceProtocol = 0x01 //0x02 + .ifaceSubClass = 1, + .ifaceProtocol = 0x01 }; const usbh_dev_driver_t usbh_hid_kbd_driver = { diff --git a/emb/pastilda/lib/libusbhost/usbh_driver_hid_kbd.h b/emb/pastilda/lib/libusbhost/usbh_driver_hid_kbd.h index 43f29ac..a511afc 100644 --- a/emb/pastilda/lib/libusbhost/usbh_driver_hid_kbd.h +++ b/emb/pastilda/lib/libusbhost/usbh_driver_hid_kbd.h @@ -6,8 +6,6 @@ BEGIN_DECLS -typedef void (*t_read_kbd)(void* data, uint8_t data_len); - struct _hid_kbd_config { void (*kbd_in_message_handler)(uint8_t device_id, const uint8_t *data); }; |