summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2014-04-25 05:52:47 +0200
committertmk <nobody@nowhere>2014-04-25 06:39:35 +0200
commitfc3a20c534c370944b7471adc60b8982d586d69c (patch)
treee2c5e1bab9571c366ed74b2e524ada3fb076a8c0
parentad4cba172b2eea37697ca531016c4c3b4defaeb7 (diff)
downloadqmk_firmware-fc3a20c534c370944b7471adc60b8982d586d69c.tar.gz
qmk_firmware-fc3a20c534c370944b7471adc60b8982d586d69c.tar.xz
Add LUFA git repository(release 140302)
-rw-r--r--.gitmodules3
-rw-r--r--protocol/lufa.mk8
m---------protocol/lufa/LUFA-git0
-rw-r--r--protocol/lufa/descriptor.c12
-rw-r--r--protocol/lufa/descriptor.h9
5 files changed, 24 insertions, 8 deletions
diff --git a/.gitmodules b/.gitmodules
index 3e34a635c..17a20decb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
[submodule "protocol/usb_hid/USB_Host_Shield_2.0"]
path = protocol/usb_hid/USB_Host_Shield_2.0
url = git@github.com:tmk/USB_Host_Shield_2.0.git
+[submodule "protocol/lufa/LUFA-git"]
+ path = protocol/lufa/LUFA-git
+ url = https://github.com/abcminiuser/lufa.git
diff --git a/protocol/lufa.mk b/protocol/lufa.mk
index 10a922f90..48ce9ae87 100644
--- a/protocol/lufa.mk
+++ b/protocol/lufa.mk
@@ -1,8 +1,12 @@
LUFA_DIR = protocol/lufa
# Path to the LUFA library
-LUFA_PATH ?= protocol/lufa/LUFA-120730
-#LUFA_PATH ?= protocol/lufa/LUFA-130901
+ifeq (, $(wildcard $(TOP_DIR)/$(LUFA_DIR)/LUFA-git))
+ LUFA_PATH ?= $(LUFA_DIR)/LUFA-120730
+else
+ LUFA_PATH ?= $(LUFA_DIR)/LUFA-git
+endif
+
# Create the LUFA source path variables by including the LUFA makefile
ifneq (, $(wildcard $(TOP_DIR)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk))
diff --git a/protocol/lufa/LUFA-git b/protocol/lufa/LUFA-git
new file mode 160000
+Subproject b6c18b2a7c544653efbe12a1d4e8ba65e7d83c3
diff --git a/protocol/lufa/descriptor.c b/protocol/lufa/descriptor.c
index d88b59654..c13a81bda 100644
--- a/protocol/lufa/descriptor.c
+++ b/protocol/lufa/descriptor.c
@@ -230,7 +230,7 @@ const USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
{
.Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
- .USBSpecification = VERSION_BCD(01.10),
+ .USBSpecification = VERSION_BCD(1,1,0),
.Class = USB_CSCP_NoDeviceClass,
.SubClass = USB_CSCP_NoDeviceSubclass,
.Protocol = USB_CSCP_NoDeviceProtocol,
@@ -292,7 +292,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{
.Header = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID},
- .HIDSpec = VERSION_BCD(01.11),
+ .HIDSpec = VERSION_BCD(1,1,1),
.CountryCode = 0x00,
.TotalReportDescriptors = 1,
.HIDReportType = HID_DTYPE_Report,
@@ -333,7 +333,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{
.Header = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID},
- .HIDSpec = VERSION_BCD(01.11),
+ .HIDSpec = VERSION_BCD(1,1,1),
.CountryCode = 0x00,
.TotalReportDescriptors = 1,
.HIDReportType = HID_DTYPE_Report,
@@ -375,7 +375,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{
.Header = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID},
- .HIDSpec = VERSION_BCD(01.11),
+ .HIDSpec = VERSION_BCD(1,1,1),
.CountryCode = 0x00,
.TotalReportDescriptors = 1,
.HIDReportType = HID_DTYPE_Report,
@@ -417,7 +417,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{
.Header = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID},
- .HIDSpec = VERSION_BCD(01.11),
+ .HIDSpec = VERSION_BCD(1,1,1),
.CountryCode = 0x00,
.TotalReportDescriptors = 1,
.HIDReportType = HID_DTYPE_Report,
@@ -469,7 +469,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{
.Header = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID},
- .HIDSpec = VERSION_BCD(01.11),
+ .HIDSpec = VERSION_BCD(1,1,1),
.CountryCode = 0x00,
.TotalReportDescriptors = 1,
.HIDReportType = HID_DTYPE_Report,
diff --git a/protocol/lufa/descriptor.h b/protocol/lufa/descriptor.h
index 9ee1c04d7..e0acec805 100644
--- a/protocol/lufa/descriptor.h
+++ b/protocol/lufa/descriptor.h
@@ -159,4 +159,13 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
const void** const DescriptorAddress)
ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
+
+/* new API */
+#if LUFA_VERSION_INTEGER < 0x140302
+ #define VERSION_BCD(Major, Minor, Revision) \
+ CPU_TO_LE16( ((Major & 0xFF) << 8) | \
+ ((Minor & 0x0F) << 4) | \
+ (Revision & 0x0F) )
+#endif
+
#endif