From e251a8be505a6fe8ae4f76ab9bc5dd0d0fd64271 Mon Sep 17 00:00:00 2001 From: Jacob Alexander Date: Sat, 1 Nov 2014 14:42:55 -0700 Subject: [PATCH 1/1] Fixing pjrc bug affecting Mac OSX CDC driver - Also updating usbMuxUart header with most recent keyboard defines --- Output/pjrcUSB/arm/usb_desc.c | 2 +- Output/usbMuxUart/output_com.h | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Output/pjrcUSB/arm/usb_desc.c b/Output/pjrcUSB/arm/usb_desc.c index e5d8af5..ac24823 100644 --- a/Output/pjrcUSB/arm/usb_desc.c +++ b/Output/pjrcUSB/arm/usb_desc.c @@ -435,7 +435,7 @@ static uint8_t config_descriptor[CONFIG_DESC_SIZE] = { 0x24, // bDescriptorType 0x01, // bDescriptorSubtype 0x01, // bmCapabilities - 1, // bDataInterface + CDC_DATA_INTERFACE, // bDataInterface // - 4 bytes - // Abstract Control Management Functional Descriptor, CDC Spec 5.2.3.3, Table 28 4, // bFunctionLength diff --git a/Output/usbMuxUart/output_com.h b/Output/usbMuxUart/output_com.h index 30f7b54..b76b525 100644 --- a/Output/usbMuxUart/output_com.h +++ b/Output/usbMuxUart/output_com.h @@ -50,8 +50,10 @@ typedef enum USBKeyChangeState { USBKeyChangeState_Modifiers = 0x01, USBKeyChangeState_MainKeys = 0x02, USBKeyChangeState_SecondaryKeys = 0x04, - USBKeyChangeState_System = 0x08, - USBKeyChangeState_Consumer = 0x10, + USBKeyChangeState_TertiaryKeys = 0x08, + USBKeyChangeState_System = 0x10, + USBKeyChangeState_Consumer = 0x20, + USBKeyChangeState_All = 0x3F, } USBKeyChangeState; -- 2.39.2