hid

src/usb_ctrl.c

@@ -39,6 +39,8 @@
 #include "gnuk.h"
 #include "stm32f103.h"
 
+static const uint32_t zero = 0;
+
 #ifdef ENABLE_VIRTUAL_COM_PORT
 #include "usb-cdc.h"
 
@@ -116,34 +118,54 @@ vcom_port_data_setup (uint8_t req, uint8_t req_no, uint16_t value)
 #define MSC_NUM_INTERFACES 0
 #endif
 
-#define NUM_INTERFACES (1+VCOM_NUM_INTERFACES+MSC_NUM_INTERFACES)
+#define NUM_INTERFACES (2+VCOM_NUM_INTERFACES+MSC_NUM_INTERFACES)
-#define MSC_INTERFACE_NO (1+VCOM_NUM_INTERFACES)
+#define MSC_INTERFACE_NO (2+VCOM_NUM_INTERFACES)
 
 uint32_t bDeviceState = UNCONNECTED; /* USB device status */
 
+#define USB_HID_REQ_GET_REPORT   1
+#define USB_HID_REQ_GET_IDLE     2
+#define USB_HID_REQ_GET_PROTOCOL 3
+#define USB_HID_REQ_SET_REPORT   9
+#define USB_HID_REQ_SET_IDLE     10
+#define USB_HID_REQ_SET_PROTOCOL 11
+
+static uint8_t hid_idle_rate;	/* in 4ms */
+
 static void
 gnuk_setup_endpoints_for_interface (uint16_t interface, int stop)
 {
   if (interface == 0)
     {
       if (!stop)
-	usb_lld_setup_endpoint (ENDP1, EP_BULK, 0, ENDP1_RXADDR, ENDP1_TXADDR,
+	{
-				GNUK_MAX_PACKET_SIZE);
+	  usb_lld_setup_endpoint (ENDP1, EP_BULK, 0, ENDP1_RXADDR,
+				  ENDP1_TXADDR, GNUK_MAX_PACKET_SIZE);
+	  usb_lld_setup_endpoint (ENDP2, EP_INTERRUPT, 0, 0, ENDP2_TXADDR, 0);
+	}
       else
 	{
 	  usb_lld_stall_rx (ENDP1);
 	  usb_lld_stall_tx (ENDP1);
+	  usb_lld_stall_tx (ENDP2);
 	}
     }
+  else if (interface == 1)
+    {
+      if (!stop)
+	usb_lld_setup_endpoint (ENDP7, EP_INTERRUPT, 0, 0, ENDP7_TXADDR, 0);
+      else
+	usb_lld_stall_tx (ENDP7);
+    }
 #ifdef ENABLE_VIRTUAL_COM_PORT
-  else if (interface == 1)
+  else if (interface == 2)
     {
       if (!stop)
 	usb_lld_setup_endpoint (ENDP4, EP_INTERRUPT, 0, 0, ENDP4_TXADDR, 0);
       else
 	usb_lld_stall_tx (ENDP4);
     }
-  else if (interface == 2)
+  else if (interface == 3)
     {
       if (!stop)
 	{
@@ -312,8 +334,36 @@ usb_cb_setup (uint8_t req, uint8_t req_no,
 		return USB_UNSUPPORT;
 	    }
 	}
-#ifdef ENABLE_VIRTUAL_COM_PORT
       else if (index == 1)
+	{
+	  switch (req_no)
+	    {
+	    case USB_HID_REQ_GET_IDLE:
+	      usb_lld_set_data_to_send (&hid_idle_rate, 1);
+	      return USB_SUCCESS;
+	    case USB_HID_REQ_SET_IDLE:
+	      usb_lld_set_data_to_recv (&hid_idle_rate, 1);
+	      return USB_SUCCESS;
+
+	    case USB_HID_REQ_GET_REPORT:
+	      usb_lld_set_data_to_send (&zero, 2);
+	      return USB_SUCCESS;
+
+	    case USB_HID_REQ_SET_REPORT:
+	      /* Received LED set request!  */
+	      return USB_SUCCESS;
+
+	    case USB_HID_REQ_GET_PROTOCOL:
+	    case USB_HID_REQ_SET_PROTOCOL:
+	      /* This driver doesn't support boot protocol.  */
+	      return USB_UNSUPPORT;
+
+	    default:
+	      return USB_UNSUPPORT;
+	    }
+	}
+#ifdef ENABLE_VIRTUAL_COM_PORT
+      else if (index == 2)
 	return vcom_port_data_setup (req, req_no, value);
 #endif
 #ifdef PINPAD_DND_SUPPORT
@@ -399,8 +449,6 @@ int usb_cb_handle_event (uint8_t event_type, uint16_t value)
 
 int usb_cb_interface (uint8_t cmd, uint16_t interface, uint16_t alt)
 {
-  static uint8_t zero = 0;
-
   if (interface >= NUM_INTERFACES)
     return USB_UNSUPPORT;
 

src/usb_desc.c

@@ -12,6 +12,46 @@
 #include "usb_conf.h"
 #include "usb-cdc.h"
 
+
+/* HID report descriptor.  */
+#define HID_REPORT_DESC_SIZE (sizeof (hid_report_desc))
+
+static const uint8_t hid_report_desc[] = {
+  0x05, 0x01,	    /* USAGE_PAGE (Generic Desktop) */
+  0x09, 0x06,	    /* USAGE (Keyboard) */
+  0xa1, 0x01,	    /* COLLECTION (Application) */
+  0x05, 0x07,	    /*   USAGE_PAGE (Key Codes) */
+  0x19, 0xe0,	    /*   USAGE_MINIMUM (Keyboard LeftControl) */
+  0x29, 0xe7,	    /*   USAGE_MAXIMUM (Keyboard Right GUI) */
+  0x15, 0x00,	    /*   LOGICAL_MINIMUM (0) */
+  0x25, 0x01,	    /*   LOGICAL_MAXIMUM (1) */
+  0x75, 0x01,	    /*   REPORT_SIZE (1) */
+  0x95, 0x08,	    /*   REPORT_COUNT (8) */
+  0x81, 0x02,	    /*   INPUT (Data,Var,Abs); Modifier byte */
+
+  /* NumLock, CapsLock, ScrollLock, Compose, Kana */
+  0x05, 0x08,	    /*   USAGE_PAGE (LEDs) */
+  0x19, 0x01,	    /*   USAGE_MINIMUM (1) */
+  0x29, 0x05,	    /*   USAGE_MAXIMUM (5) */
+  0x95, 0x05,	    /*   REPORT_COUNT (5) */
+  0x75, 0x01,	    /*   REPORT_SIZE (1) */
+  0x91, 0x02,	    /*   OUTPUT (Data,Var,Abs); LED report */
+  0x95, 0x01,	    /*   REPORT_COUNT (1) */
+  0x75, 0x03,	    /*   REPORT_SIZE (3) */
+  0x91, 0x01,	    /*   OUTPUT (Constant); LED report padding */
+
+  0x05, 0x07,	    /*   USAGE_PAGE (Key Codes) */
+  0x19, 0x00,	    /*   USAGE_MINIMUM (Reserved (no event indicated)) */
+  0x29, 0x65,	    /*   USAGE_MAXIMUM (Keyboard Application) */
+  0x15, 0x00,	    /*   LOGICAL_MINIMUM (0) */
+  0x25, 0x65,	    /*   LOGICAL_MAXIMUM (101) */
+  0x95, 0x06,	    /*   REPORT_COUNT (1) */
+  0x75, 0x08,	    /*   REPORT_SIZE (8) */
+  0x81, 0x00,	    /*   INPUT (Data,Ary,Abs); Key arrays (1 bytes) */
+  0xc0		    /* END_COLLECTION */
+};
+
+>>>>>>> hid
 #define USB_ICC_INTERFACE_CLASS 0x0B
 #define USB_ICC_INTERFACE_SUBCLASS 0x00
 #define USB_ICC_INTERFACE_BULK_PROTOCOL 0x00
@@ -36,6 +76,9 @@ static const uint8_t gnukDeviceDescriptor[] = {
 #define ICC_TOTAL_LENGTH (9+9+54+7+7)
 #define ICC_NUM_INTERFACES 1
 
+#define HID_TOTAL_LENGTH (9+9+7)
+#define HID_NUM_INTERFACES 1
+
 #ifdef ENABLE_VIRTUAL_COM_PORT
 #define VCOM_TOTAL_LENGTH (9+5+5+4+5+7+9+7+7)
 #define VCOM_NUM_INTERFACES 2
@@ -52,8 +95,10 @@ static const uint8_t gnukDeviceDescriptor[] = {
 #define MSC_NUM_INTERFACES 0
 #endif
 
-#define W_TOTAL_LENGTH (ICC_TOTAL_LENGTH+VCOM_TOTAL_LENGTH+MSC_TOTAL_LENGTH)
+#define W_TOTAL_LENGTH (ICC_TOTAL_LENGTH + HID_TOTAL_LENGTH     \
-#define NUM_INTERFACES (ICC_NUM_INTERFACES+VCOM_NUM_INTERFACES+MSC_NUM_INTERFACES)
+			+ VCOM_TOTAL_LENGTH + MSC_TOTAL_LENGTH)
+#define NUM_INTERFACES (ICC_NUM_INTERFACES + HID_NUM_INTERFACES \
+			+ VCOM_NUM_INTERFACES + MSC_NUM_INTERFACES)
 
 
 
@@ -152,12 +197,40 @@ static const uint8_t gnukConfigDescriptor[] = {
   0x02,				/* bmAttributes: Bulk */
   USB_ICC_DATA_SIZE, 0x00,	/* wMaxPacketSize: */
   0x00,				/* bInterval */
-#ifdef ENABLE_VIRTUAL_COM_PORT
+
   /* Interface Descriptor */
   9,			         /* bLength: Interface Descriptor size */
   USB_INTERFACE_DESCRIPTOR_TYPE, /* bDescriptorType: Interface */
   0x01,		  /* bInterfaceNumber: Number of Interface */
   0x00,		  /* bAlternateSetting: Alternate setting */
+  0x01,		  /* bNumEndpoints: One endpoint used */
+  0x03,		  /* bInterfaceClass: HID */
+  0x00,		  /* bInterfaceSubClass: no boot */
+  0x00,		  /* bInterfaceProtocol: 0=none */
+  0x00,		  /* iInterface: no string for this interface */
+
+  9,	        /* bLength: HID Descriptor size */
+  0x21,	        /* bDescriptorType: HID */
+  0x10, 0x01,   /* bcdHID: HID Class Spec release number */
+  0x00,	        /* bCountryCode: Hardware target country */
+  0x01,         /* bNumDescriptors: Number of HID class descriptors to follow */
+  0x22,         /* bDescriptorType */
+  HID_REPORT_DESC_SIZE, 0, /* wItemLength: Total length of Report descriptor */
+
+  /*Endpoint IN7 Descriptor*/
+  7,                            /* bLength: Endpoint Descriptor size */
+  USB_ENDPOINT_DESCRIPTOR_TYPE,	/* bDescriptorType: Endpoint */
+  0x87,				/* bEndpointAddress: (IN7) */
+  0x03,				/* bmAttributes: Interrupt */
+  0x02, 0x00,			/* wMaxPacketSize: 2 */
+  0x20,				/* bInterval (32ms) */
+
+#ifdef ENABLE_VIRTUAL_COM_PORT
+  /* Interface Descriptor */
+  9,			      /* bLength: Interface Descriptor size */
+  USB_INTERFACE_DESCRIPTOR_TYPE, /* bDescriptorType: Interface */
+  0x02,		  /* bInterfaceNumber: Number of Interface */
+  0x00,		  /* bAlternateSetting: Alternate setting */
   0x01,		  /* bNumEndpoints: One endpoints used */
   0x02,		  /* bInterfaceClass: Communication Interface Class */
   0x02,		  /* bInterfaceSubClass: Abstract Control Model */
@@ -197,7 +270,7 @@ static const uint8_t gnukConfigDescriptor[] = {
   /*Data class interface descriptor*/
   9,			       /* bLength: Endpoint Descriptor size */
   USB_INTERFACE_DESCRIPTOR_TYPE, /* bDescriptorType: */
-  0x02,			   /* bInterfaceNumber: Number of Interface */
+  0x03,			   /* bInterfaceNumber: Number of Interface */
   0x00,			   /* bAlternateSetting: Alternate setting */
   0x02,			   /* bNumEndpoints: Two endpoints used */
   0x0A,			   /* bInterfaceClass: CDC */
@@ -224,9 +297,9 @@ static const uint8_t gnukConfigDescriptor[] = {
   9,			      /* bLength: Interface Descriptor size */
   USB_INTERFACE_DESCRIPTOR_TYPE, /* bDescriptorType: Interface */
 #ifdef ENABLE_VIRTUAL_COM_PORT
-  0x03,				/* bInterfaceNumber.                */
+  0x04,				/* bInterfaceNumber.                */
 #else
-  0x01,				/* bInterfaceNumber.                */
+  0x02,				/* bInterfaceNumber.                */
 #endif
   0x00,				/* bAlternateSetting.               */
   0x02,				/* bNumEndpoints.                   */
@@ -281,11 +354,13 @@ static const struct desc String_Descriptors[NUM_STRING_DESC] = {
   {sys_version, sizeof (sys_version)},
 };
 
+#define USB_DT_HID			0x21
+#define USB_DT_REPORT			0x22
+
 int
 usb_cb_get_descriptor (uint8_t rcp, uint8_t desc_type, uint8_t desc_index,
 		       uint16_t index)
 {
-  (void)index;
   if (rcp == DEVICE_RECIPIENT)
     {
       if (desc_type == DEVICE_DESCRIPTOR)
@@ -310,6 +385,32 @@ usb_cb_get_descriptor (uint8_t rcp, uint8_t desc_type, uint8_t desc_index,
 	    }
 	}
     }
+  else if (rcp == INTERFACE_RECIPIENT)
+    {
+      if (index == 1)
+	{
+	  if (desc_type == USB_DT_HID)
+	    {
+	      usb_lld_set_data_to_send (gnukConfigDescriptor+ICC_TOTAL_LENGTH+9,
+					9);
+	      return USB_SUCCESS;
+	    }
+	  else if (desc_type == USB_DT_REPORT)
+	    {
+	      usb_lld_set_data_to_send (hid_report_desc, HID_REPORT_DESC_SIZE);
+	      return USB_SUCCESS;
+	    }
+	}
+      else if (desc_type == STRING_DESCRIPTOR)
+	{
+	  if (desc_index < NUM_STRING_DESC)
+	    {
+	      usb_lld_set_data_to_send (String_Descriptors[desc_index].desc,
+					String_Descriptors[desc_index].size);
+	      return USB_SUCCESS;
+	    }
+	}
+    }
 
   return USB_UNSUPPORT;
 }