From 43443ee9ba206b0963c49123bd03c250ed8e7b26 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 7 Jun 2015 01:33:33 +0100 Subject: finished! --- app/keyboard.c | 145 +++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 121 insertions(+), 24 deletions(-) (limited to 'app/keyboard.c') diff --git a/app/keyboard.c b/app/keyboard.c index 44eb6c6..a20e070 100644 --- a/app/keyboard.c +++ b/app/keyboard.c @@ -1,5 +1,7 @@ #include "project.h" +#define KEY_LIST_LEN 6 + static const uint8_t keyboard_report_descriptor[] = { 0x05, 0x01, /* Usage Page (Generic Desktop) */ 0x09, 0x06, /* Usage (Keyboard) */ @@ -27,21 +29,35 @@ static const uint8_t keyboard_report_descriptor[] = { // 0x29, 0x65, /* Usage maximum (101) */ // 0x2A, 0xff, 0x03, /* Usage maximum (1023) */ 0x81, 0x00, /* Input (data, array) */ - 0x05, 0x01, /* USAGE_PAGE (Generic Desktop) */ - 0x09, 0x80, /* USAGE (System Control) */ - 0xA1, 0x01, /* COLLECTION (Application) */ - 0x75, 0x02, /* REPORT_SIZE (2) */ - 0x95, 0x01, /* REPORT_COUNT (1) */ - 0x15, 0x01, /* LOGICAL_MIN (1) */ - 0x25, 0x03, /* LOGICAL_MAX (3) */ - 0x09, 0x82, /* USAGE (System Sleep) */ - 0x09, 0x81, /* USAGE (System Power Down) */ - 0x09, 0x83, /* USAGE (System Wake Up) */ - 0x81, 0x60, /* INPUT (Data Ary Abs NPrf Null) */ - 0x75, 0x06, /* REPORT_SIZE (6) */ - 0x81, 0x03, /* INPUT (Cnst Var Abs) */ - 0xc0, /* END COLLECTION */ -0xC0 /* End Collection */ + + 0x05, 0x08, /* Usage page (leds) */ + 0x75, 0x01, /* Report size (1) */ + 0x95, 0x03, /* Report count (3) */ + 0x19, 0x01, /* Usage minimum (1) */ + 0x29, 0x03, /* Usage maximum (3) */ + 0x91, 0x02, /* Output (data, variable, absolute ) */ + 0x75, 0x05, /* Report size (5) */ + 0x95, 0x01, /* Report count (1) */ + 0x91, 0x01, /* Output (constant ) */ + + 0x05, 0x01, /* USAGE_PAGE (Generic Desktop) */ + 0x09, 0x80, /* USAGE (System Control) */ + + 0xA1, 0x01, /* COLLECTION (Application) */ + 0x75, 0x02, /* REPORT_SIZE (2) */ + 0x95, 0x01, /* REPORT_COUNT (1) */ + 0x15, 0x01, /* LOGICAL_MIN (1) */ + 0x25, 0x03, /* LOGICAL_MAX (3) */ + 0x09, 0x82, /* USAGE (System Sleep) */ + 0x09, 0x81, /* USAGE (System Power Down) */ + 0x09, 0x83, /* USAGE (System Wake Up) */ + 0x81, 0x60, /* INPUT (Data Ary Abs NPrf Null) */ + 0x75, 0x06, /* REPORT_SIZE (6) */ + 0x81, 0x03, /* INPUT (Cnst Var Abs) */ + 0xc0, /* END COLLECTION */ + + + 0xC0 /* End Collection */ }; @@ -68,7 +84,7 @@ static const struct const struct usb_endpoint_descriptor keyboard_endpoint = { .bLength = USB_DT_ENDPOINT_SIZE, .bDescriptorType = USB_DT_ENDPOINT, - .bEndpointAddress = 0x81, + .bEndpointAddress = KEYBOARD_EP, .bmAttributes = USB_ENDPOINT_ATTR_INTERRUPT, .wMaxPacketSize = 9, .bInterval = 0x1 //0x20, @@ -100,18 +116,99 @@ keyboard_get_descriptor (uint8_t ** buf, uint16_t * len) *len = sizeof (keyboard_report_descriptor); } -void -keyboard_test (void) + + +static void +keyboard_send (uint8_t modifiers, uint8_t *key_list) +{ + /*Last byte is the power wakeup stuff that we don't yet support */ + uint8_t buf[KEYBOARD_EP_TXN_SIZE] = { modifiers, 0, key_list[0], key_list[1], key_list[2], key_list[3], key_list[4], key_list[5] ,0}; + + usbd_ep_write_packet (usbd_dev, KEYBOARD_EP, buf, sizeof(buf)); +} + +void keyboard_dispatch(int sc,int updown) { - static int c = 0; - uint8_t buf[9] = { 0, 0, 0, 0, 0, 0, 0, 0 ,0}; +static uint8_t modifiers; +static uint8_t key_list[KEY_LIST_LEN]; +int i; +/*Windows needs the modifiers spliting out, so we do this as per our + * descriptor, others need them in the list so we do that as well */ - buf[0] = (c >> 1) & 7; +switch (sc) { + case USB_K_SC_LEFTCTRL: + case USB_K_SC_LEFTSHIFT: + case USB_K_SC_LEFTALT: + case USB_K_SC_LEFTMETA: + case USB_K_SC_RIGHTCTRL: + case USB_K_SC_RIGHTSHIFT: + case USB_K_SC_RIGHTALT: + case USB_K_SC_RIGHTMETA: + if (updown) + modifiers |= 1 <<(sc-USB_K_SC_LEFTCTRL); + else + modifiers &= ~(1 <<(sc-USB_K_SC_LEFTCTRL)); +} - buf[2] = (c & 1) ? 12 : 0; - c++; +/* Some oses are picky and need these not to move about so we make + * a list of the down keys */ - usbd_ep_write_packet (usbd_dev, 0x81, buf, 9); +if (updown) { +for (i=0;i %02x %02x %02x %02x %02x %02x %02x\r\n",modifiers, key_list[0], key_list[1], key_list[2], key_list[3], key_list[4], key_list[5]); +#endif + +keyboard_send(modifiers,key_list); + + +} + +int keyboard_control_request(usbd_device * usbd_dev, struct usb_setup_data *req, + uint8_t ** buf, uint16_t * len, + void (**complete) (usbd_device * usbd_dev, + struct usb_setup_data * req)) +{ +uint8_t at_leds=0; + + if (req->bmRequestType != (USB_REQ_TYPE_CLASS|USB_REQ_TYPE_INTERFACE)) return 0; + if (req->bRequest!=USB_REQ_SET_CONFIGURATION) return 0; + if (req->wValue!=0x200) return 0; + if (req->wIndex) return 0; + if (!len) return 0; + if (*len!=1) return 0; + if (!buf || !*buf) return 0; + + + if (**buf & USB_LED_CAPS) at_leds|=AT_LED_CAPS; + if (**buf & USB_LED_NUMLOCK) at_leds|=AT_LED_NUMLOCK; + if (**buf & USB_LED_SCROLLLOCK) at_leds|=AT_LED_SCROLLLOCK; + + +#ifdef DEBUG + printf("LEDS> %x\r\n",at_leds); +#endif + + atkbd_set_leds (at_leds); + + return 1; +} + + -- cgit v1.2.3