diff options
Diffstat (limited to 'LUFA')
| -rw-r--r-- | LUFA/Drivers/Peripheral/ADC.h | 2 | ||||
| -rw-r--r-- | LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h (renamed from LUFA/Drivers/Peripheral/AT90USBXXX67/ADC.h) | 6 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/Class/Host/HIDParser.c | 2 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/Class/Host/HIDParser.h | 4 | ||||
| -rw-r--r-- | LUFA/ManPages/ChangeLog.txt | 4 | ||||
| -rw-r--r-- | LUFA/ManPages/DirectorySummaries.txt | 5 | ||||
| -rw-r--r-- | LUFA/ManPages/FutureChanges.txt | 3 | ||||
| -rw-r--r-- | LUFA/ManPages/MigrationInformation.txt | 7 |
8 files changed, 21 insertions, 12 deletions
diff --git a/LUFA/Drivers/Peripheral/ADC.h b/LUFA/Drivers/Peripheral/ADC.h index 2be4c2ab9..32c826117 100644 --- a/LUFA/Drivers/Peripheral/ADC.h +++ b/LUFA/Drivers/Peripheral/ADC.h @@ -63,7 +63,7 @@ defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB647__) || \
defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__) || \
defined(__AVR_ATmega32U6__))
- #include "AT90USBXXX67/ADC.h"
+ #include "AVRU4U6U7/ADC.h"
#else
#error "ADC is not available for the currently selected AVR model."
#endif
diff --git a/LUFA/Drivers/Peripheral/AT90USBXXX67/ADC.h b/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h index edcbc5781..3824145bf 100644 --- a/LUFA/Drivers/Peripheral/AT90USBXXX67/ADC.h +++ b/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h @@ -37,13 +37,13 @@ */
/** \ingroup Group_ADC
- * @defgroup Group_ADC_AT90USBXXX67 AT90USBXXX6 and AT90USBXXX7 Models
+ * @defgroup Group_ADC_AVRU4U6U7 Series U4, U6 and U7 Model ADC Driver
*
* @{
*/
-#ifndef __ADC_AT90USBXXX67_H__
-#define __ADC_AT90USBXXX67_H__
+#ifndef __ADC_AVRU4U6U7_H__
+#define __ADC_AVRU4U6U7_H__
/* Includes: */
#include "../../../Common/Common.h"
diff --git a/LUFA/Drivers/USB/Class/Host/HIDParser.c b/LUFA/Drivers/USB/Class/Host/HIDParser.c index 4d433e56e..f3763081d 100644 --- a/LUFA/Drivers/USB/Class/Host/HIDParser.c +++ b/LUFA/Drivers/USB/Class/Host/HIDParser.c @@ -271,7 +271,7 @@ uint8_t USB_ProcessHIDReport(const uint8_t* ReportData, uint16_t ReportSize, HID if (ParserData->LargestReportSizeBits < CurrReportIDInfo->ReportSizeBits[ReportSizeIndex])
ParserData->LargestReportSizeBits = CurrReportIDInfo->ReportSizeBits[ReportSizeIndex];
- if (!(ReportItemData & IOF_CONSTANT) && CALLBACK_HIDParser_FilterHIDReportItem(&CurrStateTable->Attributes))
+ if (!(ReportItemData & IOF_CONSTANT) && CALLBACK_HIDParser_FilterHIDReportItem(&NewReportItem))
{
if (ParserData->TotalReportItems == HID_MAX_REPORTITEMS)
return HID_PARSE_InsufficientReportItems;
diff --git a/LUFA/Drivers/USB/Class/Host/HIDParser.h b/LUFA/Drivers/USB/Class/Host/HIDParser.h index e9716f3fc..de98967a2 100644 --- a/LUFA/Drivers/USB/Class/Host/HIDParser.h +++ b/LUFA/Drivers/USB/Class/Host/HIDParser.h @@ -288,11 +288,11 @@ * HID_ReportInfo_t structure. This can be used to filter only those items the application will be using, so that
* no RAM is wasted storing the attributes for report items which will never be referenced by the application.
*
- * \param[in] CurrentItemAttributes Pointer to the current report item attributes for user checking
+ * \param[in] CurrentItem Pointer to the current report item for user checking
*
* \return Boolean true if the item should be stored into the HID_ReportInfo_t structure, false if it should be ignored
*/
- bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_Attributes_t* CurrentItemAttributes);
+ bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* CurrentItem);
/* Private Interface - For use in library only: */
#if !defined(__DOXYGEN__)
diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt index 7b50da95e..6c25c584a 100644 --- a/LUFA/ManPages/ChangeLog.txt +++ b/LUFA/ManPages/ChangeLog.txt @@ -24,6 +24,10 @@ * - Audio class Device mode demos now work at both 16MHz and 8MHz, rather than just at 8MHz
* - The previous USBtoSerial demo has been moved into the projects directory, as it was just a modified CDC demo
* - The Endpoint/Pipe functions now use the const qualifier on the input buffer
+ * - Changed the CALLBACK_HIDParser_FilterHIDReportItem() callback to pass a HID_ReportItem_t rather than just the current
+ * item's attributes, to expose more information on the item (including it's type, collection path, etc.)
+ * - Changed MouseHostWithParser demos to check that the report items have a Mouse usage collection as a parent at some point,
+ * to prevent Joysticks from enumerating with the demo
*
* <b>Fixed:</b>
* - Fixed PrinterHost demo returning invalid Device ID data when the attached device does not have a
diff --git a/LUFA/ManPages/DirectorySummaries.txt b/LUFA/ManPages/DirectorySummaries.txt index c6691d7d8..13583f5d8 100644 --- a/LUFA/ManPages/DirectorySummaries.txt +++ b/LUFA/ManPages/DirectorySummaries.txt @@ -27,9 +27,8 @@ * This folder contains drivers for several of the AVR internal peripherals such as the USART, compatible with
* all USB AVR models.
*
- * \dir LUFA/Drivers/Peripheral/AT90USBXXX67
- * \brief AT90USBXXX6, AT90USBXXX7 and ATMEGAXXU4 AVR model peripheral driver files. Its original name is due to legacy
- * reasons.
+ * \dir LUFA/Drivers/Peripheral/AVRU4U6U7
+ * \brief AT90USBXXX6, AT90USBXXX7 and ATMEGAXXU4 AVR model peripheral driver files.
*
* This folder contains drivers for several of the AVR internal peripherals such as the USART, compatible only with
* the AT90USBXXX6, AT90USBXXX7 and ATMEGAXXU4 USB AVR models, such as the AT90USB1287. Its contents should <b>not</b> be
diff --git a/LUFA/ManPages/FutureChanges.txt b/LUFA/ManPages/FutureChanges.txt index dc2b47a08..bba01ffa4 100644 --- a/LUFA/ManPages/FutureChanges.txt +++ b/LUFA/ManPages/FutureChanges.txt @@ -23,9 +23,10 @@ * - Change makefiles to allow for absolute LUFA location to be used
* - Add RNDIS Host Class driver
* - Add unit testing to APIs
+ * - Add board overviews
* - Make new demos
* -# Keyboard/Mouse Dual Class Host
- * -# Multiple-report HID device
+ * -# Multiple-Report HID device
* -# Mouse/CDC Dual Class Device
* -# Joystick Host
* - Port LUFA to other architectures
diff --git a/LUFA/ManPages/MigrationInformation.txt b/LUFA/ManPages/MigrationInformation.txt index 4d2df219f..a429d3d3c 100644 --- a/LUFA/ManPages/MigrationInformation.txt +++ b/LUFA/ManPages/MigrationInformation.txt @@ -11,7 +11,12 @@ * areas relevant to making older projects compatible with the API changes of each new release.
*
* \section Sec_MigrationXXXXXX Migrating from 090924 to XXXXXX
- * <b>No Migration information for this release - all library elements are backwards-compatible with 090924.</b>
+ *
+ * <b>Host Mode</b>
+ * - The \ref CALLBACK_HIDParser_FilterHIDReportItem() HID Parser callback now passes a complete HID_ReportItem_t to the
+ * user application, instead of just its attributes.
+ *
+ <b>No Migration information for this release - all library elements are backwards-compatible with 090924.</b>
*
* \section Sec_Migration090924 Migrating from 090810 to 090924
*
|