Add another HID interface using the consumer HID class for media keys. Resolves #32.

right/src/usb_interfaces/usb_interface_basic_keyboard.c

@@ -0,0 +1,112 @@
+#include "main.h"
+#include "action.h"
+#include "fsl_port.h"
+#include "usb_api.h"
+#include "usb_composite_device.h"
+#include "peripherials/test_led.h"
+#include "fsl_i2c.h"
+#include "i2c.h"
+#include "i2c_addresses.h"
+
+static usb_device_endpoint_struct_t UsbBasicKeyboardEndpoints[USB_BASIC_KEYBOARD_ENDPOINT_COUNT] = {{
+    USB_BASIC_KEYBOARD_ENDPOINT_INDEX | (USB_IN << USB_DESCRIPTOR_ENDPOINT_ADDRESS_DIRECTION_SHIFT),
+    USB_ENDPOINT_INTERRUPT,
+    USB_BASIC_KEYBOARD_INTERRUPT_IN_PACKET_SIZE,
+}};
+
+static usb_device_interface_struct_t UsbBasicKeyboardInterface[] = {{
+    USB_INTERFACE_ALTERNATE_SETTING_NONE,
+    {USB_BASIC_KEYBOARD_ENDPOINT_COUNT, UsbBasicKeyboardEndpoints},
+    NULL,
+}};
+
+static usb_device_interfaces_struct_t UsbBasicKeyboardInterfaces[USB_BASIC_KEYBOARD_INTERFACE_COUNT] = {{
+    USB_CLASS_HID,
+    USB_HID_SUBCLASS_BOOT,
+    USB_HID_PROTOCOL_KEYBOARD,
+    USB_BASIC_KEYBOARD_INTERFACE_INDEX,
+    UsbBasicKeyboardInterface,
+    sizeof(UsbBasicKeyboardInterface) / sizeof(usb_device_interfaces_struct_t),
+}};
+
+static usb_device_interface_list_t UsbBasicKeyboardInterfaceList[USB_DEVICE_CONFIGURATION_COUNT] = {{
+    USB_BASIC_KEYBOARD_INTERFACE_COUNT,
+    UsbBasicKeyboardInterfaces,
+}};
+
+usb_device_class_struct_t UsbBasicKeyboardClass = {
+    UsbBasicKeyboardInterfaceList,
+    kUSB_DeviceClassTypeHid,
+    USB_DEVICE_CONFIGURATION_COUNT,
+};
+
+static usb_basic_keyboard_report_t usbBasicKeyboardReports[2];
+usb_basic_keyboard_report_t* ActiveUsbBasicKeyboardReport = usbBasicKeyboardReports;
+bool IsUsbBasicKeyboardReportSent = false;
+
+usb_basic_keyboard_report_t* getInactiveUsbBasicKeyboardReport()
+{
+    return ActiveUsbBasicKeyboardReport == usbBasicKeyboardReports ? usbBasicKeyboardReports+1 : usbBasicKeyboardReports;
+}
+
+void SwitchActiveUsbBasicKeyboardReport()
+{
+    ActiveUsbBasicKeyboardReport = getInactiveUsbBasicKeyboardReport();
+}
+
+void ResetActiveUsbBasicKeyboardReport()
+{
+    bzero(ActiveUsbBasicKeyboardReport, USB_BASIC_KEYBOARD_REPORT_LENGTH);
+}
+
+static usb_status_t UsbBasicKeyboardAction(void)
+{
+    usb_status_t status = USB_DeviceHidSend(
+        UsbCompositeDevice.basicKeyboardHandle, USB_BASIC_KEYBOARD_ENDPOINT_INDEX,
+        (uint8_t*)getInactiveUsbBasicKeyboardReport(), USB_BASIC_KEYBOARD_REPORT_LENGTH);
+    IsUsbBasicKeyboardReportSent = true;
+    return status;
+}
+
+usb_status_t UsbBasicKeyboardCallback(class_handle_t handle, uint32_t event, void *param)
+{
+    usb_status_t error = kStatus_USB_Error;
+
+    switch (event) {
+        case kUSB_DeviceHidEventSendResponse:
+            if (UsbCompositeDevice.attach) {
+                return UsbBasicKeyboardAction();
+            }
+            break;
+        case kUSB_DeviceHidEventGetReport:
+        case kUSB_DeviceHidEventSetReport:
+        case kUSB_DeviceHidEventRequestReportBuffer:
+            error = kStatus_USB_InvalidRequest;
+            break;
+        case kUSB_DeviceHidEventGetIdle:
+        case kUSB_DeviceHidEventGetProtocol:
+        case kUSB_DeviceHidEventSetIdle:
+        case kUSB_DeviceHidEventSetProtocol:
+            break;
+        default:
+            break;
+    }
+
+    return error;
+}
+
+usb_status_t UsbBasicKeyboardSetConfiguration(class_handle_t handle, uint8_t configuration)
+{
+    if (USB_COMPOSITE_CONFIGURATION_INDEX == configuration) {
+        return UsbBasicKeyboardAction();
+    }
+    return kStatus_USB_Error;
+}
+
+usb_status_t UsbBasicKeyboardSetInterface(class_handle_t handle, uint8_t interface, uint8_t alternateSetting)
+{
+    if (USB_BASIC_KEYBOARD_INTERFACE_INDEX == interface) {
+        return UsbBasicKeyboardAction();
+    }
+    return kStatus_USB_Error;
+}

right/src/usb_interfaces/usb_interface_basic_keyboard.h

@@ -0,0 +1,45 @@
+#ifndef __USB_INTERFACE_BASIC_KEYBOARD_H__
+#define __USB_INTERFACE_BASIC_KEYBOARD_H__
+
+// Includes:
+
+    #include "fsl_common.h"
+    #include "usb_api.h"
+    #include "usb_descriptors/usb_descriptor_basic_keyboard_report.h"
+
+// Macros:
+
+    #define USB_BASIC_KEYBOARD_INTERFACE_INDEX 1
+
+    #define USB_BASIC_KEYBOARD_ENDPOINT_INDEX 3
+    #define USB_BASIC_KEYBOARD_ENDPOINT_COUNT 1
+
+    #define USB_BASIC_KEYBOARD_INTERRUPT_IN_PACKET_SIZE 8
+    #define USB_BASIC_KEYBOARD_INTERRUPT_IN_INTERVAL 4
+
+    #define USB_BASIC_KEYBOARD_REPORT_LENGTH 8
+
+// Typedefs:
+
+    typedef struct {
+        uint8_t modifiers;
+        uint8_t reserved; // Always must be 0
+        uint8_t scancodes[USB_BASIC_KEYBOARD_MAX_KEYS];
+    } __attribute__ ((packed)) usb_basic_keyboard_report_t;
+
+// Variables:
+
+    extern bool IsUsbBasicKeyboardReportSent;
+    extern usb_device_class_struct_t UsbBasicKeyboardClass;
+    extern usb_basic_keyboard_report_t* ActiveUsbBasicKeyboardReport;
+
+// Functions:
+
+    extern usb_status_t UsbBasicKeyboardCallback(class_handle_t handle, uint32_t event, void *param);
+    extern usb_status_t UsbBasicKeyboardSetConfiguration(class_handle_t handle, uint8_t configuration);
+    extern usb_status_t UsbBasicKeyboardSetInterface(class_handle_t handle, uint8_t interface, uint8_t alternateSetting);
+
+    extern void ResetActiveUsbBasicKeyboardReport();
+    extern void SwitchActiveUsbBasicKeyboardReport();
+
+#endif

right/src/usb_interfaces/usb_interface_keyboard.c

@@ -1,112 +0,0 @@
-#include "main.h"
-#include "action.h"
-#include "fsl_port.h"
-#include "usb_api.h"
-#include "usb_composite_device.h"
-#include "peripherials/test_led.h"
-#include "fsl_i2c.h"
-#include "i2c.h"
-#include "i2c_addresses.h"
-
-static usb_device_endpoint_struct_t UsbKeyboardEndpoints[USB_KEYBOARD_ENDPOINT_COUNT] = {{
-    USB_KEYBOARD_ENDPOINT_INDEX | (USB_IN << USB_DESCRIPTOR_ENDPOINT_ADDRESS_DIRECTION_SHIFT),
-    USB_ENDPOINT_INTERRUPT,
-    USB_KEYBOARD_INTERRUPT_IN_PACKET_SIZE,
-}};
-
-static usb_device_interface_struct_t UsbKeyboardInterface[] = {{
-    USB_INTERFACE_ALTERNATE_SETTING_NONE,
-    {USB_KEYBOARD_ENDPOINT_COUNT, UsbKeyboardEndpoints},
-    NULL,
-}};
-
-static usb_device_interfaces_struct_t UsbKeyboardInterfaces[USB_KEYBOARD_INTERFACE_COUNT] = {{
-    USB_CLASS_HID,
-    USB_HID_SUBCLASS_BOOT,
-    USB_HID_PROTOCOL_KEYBOARD,
-    USB_KEYBOARD_INTERFACE_INDEX,
-    UsbKeyboardInterface,
-    sizeof(UsbKeyboardInterface) / sizeof(usb_device_interfaces_struct_t),
-}};
-
-static usb_device_interface_list_t UsbKeyboardInterfaceList[USB_DEVICE_CONFIGURATION_COUNT] = {{
-    USB_KEYBOARD_INTERFACE_COUNT,
-    UsbKeyboardInterfaces,
-}};
-
-usb_device_class_struct_t UsbKeyboardClass = {
-    UsbKeyboardInterfaceList,
-    kUSB_DeviceClassTypeHid,
-    USB_DEVICE_CONFIGURATION_COUNT,
-};
-
-static usb_keyboard_report_t usbKeyboardReports[2];
-usb_keyboard_report_t* ActiveUsbKeyboardReport = usbKeyboardReports;
-bool IsUsbKeyboardReportSent = false;
-
-usb_keyboard_report_t* getInactiveUsbKeyboardReport()
-{
-    return ActiveUsbKeyboardReport == usbKeyboardReports ? usbKeyboardReports+1 : usbKeyboardReports;
-}
-
-void SwitchActiveUsbKeyboardReport()
-{
-    ActiveUsbKeyboardReport = getInactiveUsbKeyboardReport();
-}
-
-void ResetActiveUsbKeyboardReport()
-{
-    bzero(ActiveUsbKeyboardReport, USB_KEYBOARD_REPORT_LENGTH);
-}
-
-static usb_status_t UsbKeyboardAction(void)
-{
-    usb_status_t status = USB_DeviceHidSend(
-        UsbCompositeDevice.keyboardHandle, USB_KEYBOARD_ENDPOINT_INDEX,
-        (uint8_t*)getInactiveUsbKeyboardReport(), USB_KEYBOARD_REPORT_LENGTH);
-    IsUsbKeyboardReportSent = true;
-    return status;
-}
-
-usb_status_t UsbKeyboardCallback(class_handle_t handle, uint32_t event, void *param)
-{
-    usb_status_t error = kStatus_USB_Error;
-
-    switch (event) {
-        case kUSB_DeviceHidEventSendResponse:
-            if (UsbCompositeDevice.attach) {
-                return UsbKeyboardAction();
-            }
-            break;
-        case kUSB_DeviceHidEventGetReport:
-        case kUSB_DeviceHidEventSetReport:
-        case kUSB_DeviceHidEventRequestReportBuffer:
-            error = kStatus_USB_InvalidRequest;
-            break;
-        case kUSB_DeviceHidEventGetIdle:
-        case kUSB_DeviceHidEventGetProtocol:
-        case kUSB_DeviceHidEventSetIdle:
-        case kUSB_DeviceHidEventSetProtocol:
-            break;
-        default:
-            break;
-    }
-
-    return error;
-}
-
-usb_status_t UsbKeyboardSetConfiguration(class_handle_t handle, uint8_t configuration)
-{
-    if (USB_COMPOSITE_CONFIGURATION_INDEX == configuration) {
-        return UsbKeyboardAction();
-    }
-    return kStatus_USB_Error;
-}
-
-usb_status_t UsbKeyboardSetInterface(class_handle_t handle, uint8_t interface, uint8_t alternateSetting)
-{
-    if (USB_KEYBOARD_INTERFACE_INDEX == interface) {
-        return UsbKeyboardAction();
-    }
-    return kStatus_USB_Error;
-}

right/src/usb_interfaces/usb_interface_keyboard.h

@@ -1,45 +0,0 @@
-#ifndef __USB_INTERFACE_KEYBOARD_H__
-#define __USB_INTERFACE_KEYBOARD_H__
-
-// Includes:
-
-    #include "fsl_common.h"
-    #include "usb_api.h"
-    #include "usb_descriptors/usb_descriptor_keyboard_report.h"
-
-// Macros:
-
-    #define USB_KEYBOARD_INTERFACE_INDEX 1
-
-    #define USB_KEYBOARD_ENDPOINT_INDEX 3
-    #define USB_KEYBOARD_ENDPOINT_COUNT 1
-
-    #define USB_KEYBOARD_INTERRUPT_IN_PACKET_SIZE 8
-    #define USB_KEYBOARD_INTERRUPT_IN_INTERVAL 4
-
-    #define USB_KEYBOARD_REPORT_LENGTH 8
-
-// Typedefs:
-
-    typedef struct {
-        uint8_t modifiers;
-        uint8_t reserved; // Always must be 0
-        uint8_t scancodes[USB_KEYBOARD_MAX_KEYS];
-    } __attribute__ ((packed)) usb_keyboard_report_t;
-
-// Variables:
-
-    extern bool IsUsbKeyboardReportSent;
-    extern usb_device_class_struct_t UsbKeyboardClass;
-    extern usb_keyboard_report_t* ActiveUsbKeyboardReport;
-
-// Functions:
-
-    extern usb_status_t UsbKeyboardCallback(class_handle_t handle, uint32_t event, void *param);
-    extern usb_status_t UsbKeyboardSetConfiguration(class_handle_t handle, uint8_t configuration);
-    extern usb_status_t UsbKeyboardSetInterface(class_handle_t handle, uint8_t interface, uint8_t alternateSetting);
-
-    extern void ResetActiveUsbKeyboardReport();
-    extern void SwitchActiveUsbKeyboardReport();
-
-#endif

right/src/usb_interfaces/usb_interface_media_keyboard.c

@@ -0,0 +1,112 @@
+#include "main.h"
+#include "action.h"
+#include "fsl_port.h"
+#include "usb_api.h"
+#include "usb_composite_device.h"
+#include "peripherials/test_led.h"
+#include "fsl_i2c.h"
+#include "i2c.h"
+#include "i2c_addresses.h"
+
+static usb_device_endpoint_struct_t UsbMediaKeyboardEndpoints[USB_MEDIA_KEYBOARD_ENDPOINT_COUNT] = {{
+    USB_MEDIA_KEYBOARD_ENDPOINT_INDEX | (USB_IN << USB_DESCRIPTOR_ENDPOINT_ADDRESS_DIRECTION_SHIFT),
+    USB_ENDPOINT_INTERRUPT,
+    USB_MEDIA_KEYBOARD_INTERRUPT_IN_PACKET_SIZE,
+}};
+
+static usb_device_interface_struct_t UsbMediaKeyboardInterface[] = {{
+    USB_INTERFACE_ALTERNATE_SETTING_NONE,
+    {USB_MEDIA_KEYBOARD_ENDPOINT_COUNT, UsbMediaKeyboardEndpoints},
+    NULL,
+}};
+
+static usb_device_interfaces_struct_t UsbMediaKeyboardInterfaces[USB_MEDIA_KEYBOARD_INTERFACE_COUNT] = {{
+    USB_CLASS_HID,
+    USB_HID_SUBCLASS_BOOT,
+    USB_HID_PROTOCOL_KEYBOARD,
+    USB_MEDIA_KEYBOARD_INTERFACE_INDEX,
+    UsbMediaKeyboardInterface,
+    sizeof(UsbMediaKeyboardInterface) / sizeof(usb_device_interfaces_struct_t),
+}};
+
+static usb_device_interface_list_t UsbMediaKeyboardInterfaceList[USB_DEVICE_CONFIGURATION_COUNT] = {{
+    USB_MEDIA_KEYBOARD_INTERFACE_COUNT,
+    UsbMediaKeyboardInterfaces,
+}};
+
+usb_device_class_struct_t UsbMediaKeyboardClass = {
+    UsbMediaKeyboardInterfaceList,
+    kUSB_DeviceClassTypeHid,
+    USB_DEVICE_CONFIGURATION_COUNT,
+};
+
+static usb_media_keyboard_report_t usbMediaKeyboardReports[2];
+usb_media_keyboard_report_t* ActiveUsbMediaKeyboardReport = usbMediaKeyboardReports;
+bool IsUsbMediaKeyboardReportSent = false;
+
+usb_media_keyboard_report_t* getInactiveUsbMediaKeyboardReport()
+{
+    return ActiveUsbMediaKeyboardReport == usbMediaKeyboardReports ? usbMediaKeyboardReports+1 : usbMediaKeyboardReports;
+}
+
+void SwitchActiveUsbMediaKeyboardReport()
+{
+    ActiveUsbMediaKeyboardReport = getInactiveUsbMediaKeyboardReport();
+}
+
+void ResetActiveUsbMediaKeyboardReport()
+{
+    bzero(ActiveUsbMediaKeyboardReport, USB_MEDIA_KEYBOARD_REPORT_LENGTH);
+}
+
+static usb_status_t UsbMediaKeyboardAction(void)
+{
+    usb_status_t status = USB_DeviceHidSend(
+        UsbCompositeDevice.mediaKeyboardHandle, USB_MEDIA_KEYBOARD_ENDPOINT_INDEX,
+        (uint8_t*)getInactiveUsbMediaKeyboardReport(), USB_MEDIA_KEYBOARD_REPORT_LENGTH);
+    IsUsbMediaKeyboardReportSent = true;
+    return status;
+}
+
+usb_status_t UsbMediaKeyboardCallback(class_handle_t handle, uint32_t event, void *param)
+{
+    usb_status_t error = kStatus_USB_Error;
+
+    switch (event) {
+        case kUSB_DeviceHidEventSendResponse:
+            if (UsbCompositeDevice.attach) {
+                return UsbMediaKeyboardAction();
+            }
+            break;
+        case kUSB_DeviceHidEventGetReport:
+        case kUSB_DeviceHidEventSetReport:
+        case kUSB_DeviceHidEventRequestReportBuffer:
+            error = kStatus_USB_InvalidRequest;
+            break;
+        case kUSB_DeviceHidEventGetIdle:
+        case kUSB_DeviceHidEventGetProtocol:
+        case kUSB_DeviceHidEventSetIdle:
+        case kUSB_DeviceHidEventSetProtocol:
+            break;
+        default:
+            break;
+    }
+
+    return error;
+}
+
+usb_status_t UsbMediaKeyboardSetConfiguration(class_handle_t handle, uint8_t configuration)
+{
+    if (USB_COMPOSITE_CONFIGURATION_INDEX == configuration) {
+        return UsbMediaKeyboardAction();
+    }
+    return kStatus_USB_Error;
+}
+
+usb_status_t UsbMediaKeyboardSetInterface(class_handle_t handle, uint8_t interface, uint8_t alternateSetting)
+{
+    if (USB_MEDIA_KEYBOARD_INTERFACE_INDEX == interface) {
+        return UsbMediaKeyboardAction();
+    }
+    return kStatus_USB_Error;
+}

right/src/usb_interfaces/usb_interface_media_keyboard.h

@@ -0,0 +1,43 @@
+#ifndef __USB_INTERFACE_MEDIA_KEYBOARD_H__
+#define __USB_INTERFACE_MEDIA_KEYBOARD_H__
+
+// Includes:
+
+    #include "fsl_common.h"
+    #include "usb_api.h"
+    #include "usb_descriptors/usb_descriptor_media_keyboard_report.h"
+
+// Macros:
+
+    #define USB_MEDIA_KEYBOARD_INTERFACE_INDEX 3
+
+    #define USB_MEDIA_KEYBOARD_ENDPOINT_INDEX 5
+    #define USB_MEDIA_KEYBOARD_ENDPOINT_COUNT 1
+
+    #define USB_MEDIA_KEYBOARD_INTERRUPT_IN_PACKET_SIZE 8
+    #define USB_MEDIA_KEYBOARD_INTERRUPT_IN_INTERVAL 4
+
+    #define USB_MEDIA_KEYBOARD_REPORT_LENGTH 8
+
+// Typedefs:
+
+    typedef struct {
+        uint16_t scancodes[USB_MEDIA_KEYBOARD_MAX_KEYS];
+    } __attribute__ ((packed)) usb_media_keyboard_report_t;
+
+// Variables:
+
+    extern bool IsUsbMediaKeyboardReportSent;
+    extern usb_device_class_struct_t UsbMediaKeyboardClass;
+    extern usb_media_keyboard_report_t* ActiveUsbMediaKeyboardReport;
+
+// Functions:
+
+    extern usb_status_t UsbMediaKeyboardCallback(class_handle_t handle, uint32_t event, void *param);
+    extern usb_status_t UsbMediaKeyboardSetConfiguration(class_handle_t handle, uint8_t configuration);
+    extern usb_status_t UsbMediaKeyboardSetInterface(class_handle_t handle, uint8_t interface, uint8_t alternateSetting);
+
+    extern void ResetActiveUsbMediaKeyboardReport();
+    extern void SwitchActiveUsbMediaKeyboardReport();
+
+#endif