projects
/
pub
/
USBasp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
cf41d16
)
Minor documentation improvements.
author
Dean Camera
<dean@fourwalledcubicle.com>
Sun, 27 Oct 2013 17:16:07 +0000
(18:16 +0100)
committer
Dean Camera
<dean@fourwalledcubicle.com>
Sun, 27 Oct 2013 17:16:07 +0000
(18:16 +0100)
LUFA/Build/lufa_hid.mk
patch
|
blob
|
blame
|
history
LUFA/Drivers/USB/Class/Common/AudioClassCommon.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/USB/Class/Common/CDCClassCommon.h
patch
|
blob
|
blame
|
history
diff --git
a/LUFA/Build/lufa_hid.mk
b/LUFA/Build/lufa_hid.mk
index
a5a742d
..
6755e3f
100644
(file)
--- a/
LUFA/Build/lufa_hid.mk
+++ b/
LUFA/Build/lufa_hid.mk
@@
-9,9
+9,9
@@
LUFA_BUILD_MODULES += HID
LUFA_BUILD_TARGETS += hid hid-ee teensy teensy-ee
LUFA_BUILD_MANDATORY_VARS += MCU TARGET
LUFA_BUILD_MODULES += HID
LUFA_BUILD_TARGETS += hid hid-ee teensy teensy-ee
LUFA_BUILD_MANDATORY_VARS += MCU TARGET
-LUFA_BUILD_OPTIONAL_VARS +=
-LUFA_BUILD_PROVIDED_VARS +=
-LUFA_BUILD_PROVIDED_MACROS +=
+LUFA_BUILD_OPTIONAL_VARS +=
+LUFA_BUILD_PROVIDED_VARS +=
+LUFA_BUILD_PROVIDED_MACROS +=
# -----------------------------------------------------------------------------
# LUFA HID Bootloader Buildsystem Makefile Module.
# -----------------------------------------------------------------------------
# LUFA HID Bootloader Buildsystem Makefile Module.
@@
-76,7
+76,7
@@
hid-ee: $(TARGET).eep $(MAKEFILE_LIST)
@echo $(MSG_OBJCPY_CMD) Converting \"$<\" to a binary file \"InputEEData.bin\"
avr-objcopy -I ihex -O binary $< $(patsubst %/,%,$(LUFA_PATH))/Build/HID_EEPROM_Loader/InputEEData.bin
@echo $(MSG_MAKE_CMD) Making EEPROM loader application for \"$<\"
@echo $(MSG_OBJCPY_CMD) Converting \"$<\" to a binary file \"InputEEData.bin\"
avr-objcopy -I ihex -O binary $< $(patsubst %/,%,$(LUFA_PATH))/Build/HID_EEPROM_Loader/InputEEData.bin
@echo $(MSG_MAKE_CMD) Making EEPROM loader application for \"$<\"
-
make
-C $(patsubst %/,%,$(LUFA_PATH))/Build/HID_EEPROM_Loader/ MCU=$(MCU) clean hid
+
$(MAKE)
-C $(patsubst %/,%,$(LUFA_PATH))/Build/HID_EEPROM_Loader/ MCU=$(MCU) clean hid
# Programs in the target FLASH memory using the TEENSY_BOOTLOADER_CLI tool
teensy: $(TARGET).hex $(MAKEFILE_LIST)
# Programs in the target FLASH memory using the TEENSY_BOOTLOADER_CLI tool
teensy: $(TARGET).hex $(MAKEFILE_LIST)
@@
-88,7
+88,7
@@
teensy-ee: $(TARGET).hex $(MAKEFILE_LIST)
@echo $(MSG_OBJCPY_CMD) Converting \"$<\" to a binary file \"InputEEData.bin\"
avr-objcopy -I ihex -O binary $< $(patsubst %/,%,$(LUFA_PATH))/Build/HID_EEPROM_Loader/InputEEData.bin
@echo $(MSG_MAKE_CMD) Making EEPROM loader application for \"$<\"
@echo $(MSG_OBJCPY_CMD) Converting \"$<\" to a binary file \"InputEEData.bin\"
avr-objcopy -I ihex -O binary $< $(patsubst %/,%,$(LUFA_PATH))/Build/HID_EEPROM_Loader/InputEEData.bin
@echo $(MSG_MAKE_CMD) Making EEPROM loader application for \"$<\"
-
make
-s -C $(patsubst %/,%,$(LUFA_PATH))/Build/HID_EEPROM_Loader/ MCU=$(MCU) clean hid-teensy
-
+
$(MAKE)
-s -C $(patsubst %/,%,$(LUFA_PATH))/Build/HID_EEPROM_Loader/ MCU=$(MCU) clean hid-teensy
+
# Phony build targets for this module
.PHONY: hid hid-ee teensy teensy-ee
# Phony build targets for this module
.PHONY: hid hid-ee teensy teensy-ee
diff --git
a/LUFA/Drivers/USB/Class/Common/AudioClassCommon.h
b/LUFA/Drivers/USB/Class/Common/AudioClassCommon.h
index
6e40873
..
bd74ded
100644
(file)
--- a/
LUFA/Drivers/USB/Class/Common/AudioClassCommon.h
+++ b/
LUFA/Drivers/USB/Class/Common/AudioClassCommon.h
@@
-618,7
+618,7
@@
/** \brief 24-Bit Audio Frequency Structure.
*
/** \brief 24-Bit Audio Frequency Structure.
*
- * Type define for a 24bit audio sample frequency structure. As GCC does not contain a built in 24-bit datatype,
+ * Type define for a 24
-
bit audio sample frequency structure. As GCC does not contain a built in 24-bit datatype,
* this this structure is used to build up the value instead. Fill this structure with the \ref AUDIO_SAMPLE_FREQ() macro.
*
* \note Regardless of CPU architecture, these values should be stored as little endian.
* this this structure is used to build up the value instead. Fill this structure with the \ref AUDIO_SAMPLE_FREQ() macro.
*
* \note Regardless of CPU architecture, these values should be stored as little endian.
diff --git
a/LUFA/Drivers/USB/Class/Common/CDCClassCommon.h
b/LUFA/Drivers/USB/Class/Common/CDCClassCommon.h
index
5f451b0
..
5a862f2
100644
(file)
--- a/
LUFA/Drivers/USB/Class/Common/CDCClassCommon.h
+++ b/
LUFA/Drivers/USB/Class/Common/CDCClassCommon.h
@@
-289,7
+289,7
@@
* must be \ref CDC_DSUBTYPE_CSInterface_ACM.
*/
uint8_t Capabilities; /**< Capabilities of the ACM interface, given as a bit mask. For most devices,
* must be \ref CDC_DSUBTYPE_CSInterface_ACM.
*/
uint8_t Capabilities; /**< Capabilities of the ACM interface, given as a bit mask. For most devices,
- * this should be set to a fixed value of 0x06 - for other capabilities, refer
+ * this should be set to a fixed value of
\c
0x06 - for other capabilities, refer
* to the CDC ACM specification.
*/
} ATTR_PACKED USB_CDC_Descriptor_FunctionalACM_t;
* to the CDC ACM specification.
*/
} ATTR_PACKED USB_CDC_Descriptor_FunctionalACM_t;