diff options
Diffstat (limited to 'LUFA/Drivers/USB/Class/Common')
-rw-r--r-- | LUFA/Drivers/USB/Class/Common/AndroidAccessoryClassCommon.h | 1 | ||||
-rw-r--r-- | LUFA/Drivers/USB/Class/Common/AudioClassCommon.h | 6 | ||||
-rw-r--r-- | LUFA/Drivers/USB/Class/Common/CDCClassCommon.h | 6 | ||||
-rw-r--r-- | LUFA/Drivers/USB/Class/Common/HIDClassCommon.h | 12 | ||||
-rw-r--r-- | LUFA/Drivers/USB/Class/Common/HIDParser.c | 3 | ||||
-rw-r--r-- | LUFA/Drivers/USB/Class/Common/HIDParser.h | 2 | ||||
-rw-r--r-- | LUFA/Drivers/USB/Class/Common/HIDReportData.h | 8 | ||||
-rw-r--r-- | LUFA/Drivers/USB/Class/Common/MassStorageClassCommon.h | 10 | ||||
-rw-r--r-- | LUFA/Drivers/USB/Class/Common/PrinterClassCommon.h | 4 | ||||
-rw-r--r-- | LUFA/Drivers/USB/Class/Common/RNDISClassCommon.h | 6 |
10 files changed, 30 insertions, 28 deletions
diff --git a/LUFA/Drivers/USB/Class/Common/AndroidAccessoryClassCommon.h b/LUFA/Drivers/USB/Class/Common/AndroidAccessoryClassCommon.h index 45e7ca540..b9a8dd53a 100644 --- a/LUFA/Drivers/USB/Class/Common/AndroidAccessoryClassCommon.h +++ b/LUFA/Drivers/USB/Class/Common/AndroidAccessoryClassCommon.h @@ -125,3 +125,4 @@ /** @} */
+ diff --git a/LUFA/Drivers/USB/Class/Common/AudioClassCommon.h b/LUFA/Drivers/USB/Class/Common/AudioClassCommon.h index 32a66409b..8f9a10758 100644 --- a/LUFA/Drivers/USB/Class/Common/AudioClassCommon.h +++ b/LUFA/Drivers/USB/Class/Common/AudioClassCommon.h @@ -218,7 +218,7 @@ * allows for pitch adjustments to be made via control requests directed at the endpoint. */ #define AUDIO_EP_PITCH_CONTROL (1 << 1) - + /* Enums: */ /** Enum for possible Class, Subclass and Protocol values of device and interface descriptors relating to the Audio * device class. @@ -244,7 +244,7 @@ * interface belongs to the Streaming Audio protocol. */ }; - + /** Audio class specific interface description subtypes, for the Audio Control interface. */ enum Audio_CSInterface_AC_SubTypes_t { @@ -287,7 +287,7 @@ AUDIO_REQ_GetMemory = 0x85, /**< Audio class-specific request to get the memory value of a parameter within the device. */ AUDIO_REQ_GetStatus = 0xFF, /**< Audio class-specific request to get the device status. */ }; - + /** Enum for Audio class specific Endpoint control modifiers which can be set and retrieved by a USB host, if the corresponding * endpoint control is indicated to be supported in the Endpoint's Audio-class specific endpoint descriptor. */ diff --git a/LUFA/Drivers/USB/Class/Common/CDCClassCommon.h b/LUFA/Drivers/USB/Class/Common/CDCClassCommon.h index 45e0c5851..1d01c82f5 100644 --- a/LUFA/Drivers/USB/Class/Common/CDCClassCommon.h +++ b/LUFA/Drivers/USB/Class/Common/CDCClassCommon.h @@ -111,7 +111,7 @@ */ #define CDC_CONTROL_LINE_IN_OVERRUNERROR (1 << 6) //@} - + /** Macro to define a CDC class-specific functional descriptor. CDC functional descriptors have a * uniform structure but variable sized data payloads, thus cannot be represented accurately by * a single typedef struct. A macro is used instead so that functional descriptors can be created @@ -161,7 +161,7 @@ * belongs to no specific protocol of the CDC data class. */ }; - + /** Enum for the CDC class specific control requests that can be issued by the USB bus host. */ enum CDC_ClassRequests_t { @@ -355,7 +355,7 @@ uint8_t bMasterInterface; /**< Interface number of the CDC Control interface. */ uint8_t bSlaveInterface0; /**< Interface number of the CDC Data interface. */ } ATTR_PACKED USB_CDC_StdDescriptor_FunctionalUnion_t; - + /** \brief CDC Virtual Serial Port Line Encoding Settings Structure. * * Type define for a CDC Line Encoding structure, used to hold the various encoding parameters for a virtual diff --git a/LUFA/Drivers/USB/Class/Common/HIDClassCommon.h b/LUFA/Drivers/USB/Class/Common/HIDClassCommon.h index 95b3484fd..6e5187bbf 100644 --- a/LUFA/Drivers/USB/Class/Common/HIDClassCommon.h +++ b/LUFA/Drivers/USB/Class/Common/HIDClassCommon.h @@ -91,7 +91,7 @@ /** Constant for a keyboard report modifier byte, indicating that the keyboard's right GUI key is currently pressed. */ #define HID_KEYBOARD_MODIFIER_RIGHTGUI (1 << 7) //@} - + /** \name Keyboard Standard Report LED Masks */ //@{ /** Constant for a keyboard output report LED byte, indicating that the host's NUM LOCK mode is currently set. */ @@ -108,7 +108,7 @@ //@} /** \name Keyboard Standard Report Key Scan-codes */ - //@{ + //@{ #define HID_KEYBOARD_SC_ERROR_ROLLOVER 0x01 #define HID_KEYBOARD_SC_POST_FAIL 0x02 #define HID_KEYBOARD_SC_ERROR_UNDEFINED 0x03 @@ -208,7 +208,7 @@ #define HID_KEYBOARD_SC_KEYPAD_9_AND_PAGE_UP 0x61 #define HID_KEYBOARD_SC_KEYPAD_0_AND_INSERT 0x62 #define HID_KEYBOARD_SC_KEYPAD_DOT_AND_DELETE 0x63 - #define HID_KEYBOARD_SC_NON_US_BACKSLASH_AND_PIPE 0x64 + #define HID_KEYBOARD_SC_NON_US_BACKSLASH_AND_PIPE 0x64 #define HID_KEYBOARD_SC_POWER 0x66 #define HID_KEYBOARD_SC_EQUAL_SIGN 0x67 #define HID_KEYBOARD_SC_F13 0x68 @@ -496,7 +496,7 @@ * \param[in] VendorPageNum Vendor Defined HID Usage Page index, ranging from 0x00 to 0xFF. * \param[in] CollectionUsage Vendor Usage for the encompassing report IN and OUT collection, ranging from 0x00 to 0xFF. * \param[in] DataINUsage Vendor Usage for the IN report data, ranging from 0x00 to 0xFF. - * \param[in] DataOUTUsage Vendor Usage for the OUT report data, ranging from 0x00 to 0xFF. + * \param[in] DataOUTUsage Vendor Usage for the OUT report data, ranging from 0x00 to 0xFF. * \param[in] NumBytes Length of the data IN and OUT reports. */ #define HID_DESCRIPTOR_VENDOR(VendorPageNum, CollectionUsage, DataINUsage, DataOUTUsage, NumBytes) \ @@ -517,7 +517,7 @@ HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE), \ HID_RI_END_COLLECTION(0) //@} - + /* Type Defines: */ /** Enum for possible Class, Subclass and Protocol values of device and interface descriptors relating to the HID * device class. @@ -543,7 +543,7 @@ * belongs to the Mouse HID boot protocol. */ }; - + /** Enum for the HID class specific control requests that can be issued by the USB bus host. */ enum HID_ClassRequests_t { diff --git a/LUFA/Drivers/USB/Class/Common/HIDParser.c b/LUFA/Drivers/USB/Class/Common/HIDParser.c index 903b039df..24b284c1d 100644 --- a/LUFA/Drivers/USB/Class/Common/HIDParser.c +++ b/LUFA/Drivers/USB/Class/Common/HIDParser.c @@ -98,7 +98,7 @@ uint8_t USB_ProcessHIDReport(const uint8_t* ReportData, case HID_RI_USAGE_PAGE(0): if ((HIDReportItem & HID_RI_DATA_SIZE_MASK) == HID_RI_DATA_BITS_32) CurrStateTable->Attributes.Usage.Page = (ReportItemData >> 16); - + CurrStateTable->Attributes.Usage.Page = ReportItemData; break; case HID_RI_LOGICAL_MINIMUM(0): @@ -359,3 +359,4 @@ uint16_t USB_GetHIDReportSize(HID_ReportInfo_t* const ParserData, return 0; } + diff --git a/LUFA/Drivers/USB/Class/Common/HIDParser.h b/LUFA/Drivers/USB/Class/Common/HIDParser.h index 3e3bb237e..25e201b36 100644 --- a/LUFA/Drivers/USB/Class/Common/HIDParser.h +++ b/LUFA/Drivers/USB/Class/Common/HIDParser.h @@ -71,7 +71,7 @@ #include "HIDReportData.h" #include "HIDClassCommon.h" - + /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) extern "C" { diff --git a/LUFA/Drivers/USB/Class/Common/HIDReportData.h b/LUFA/Drivers/USB/Class/Common/HIDReportData.h index 2b96eeabc..2c36e8ea8 100644 --- a/LUFA/Drivers/USB/Class/Common/HIDReportData.h +++ b/LUFA/Drivers/USB/Class/Common/HIDReportData.h @@ -63,15 +63,15 @@ #define HID_RI_DATA_BITS_32 0x03 #define HID_RI_DATA_BITS(DataBits) HID_RI_DATA_BITS_ ## DataBits - #define _HID_RI_ENCODE_0(Data) + #define _HID_RI_ENCODE_0(Data) #define _HID_RI_ENCODE_8(Data) , (Data & 0xFF) #define _HID_RI_ENCODE_16(Data) _HID_RI_ENCODE_8(Data) _HID_RI_ENCODE_8(Data >> 8) #define _HID_RI_ENCODE_32(Data) _HID_RI_ENCODE_16(Data) _HID_RI_ENCODE_16(Data >> 16) #define _HID_RI_ENCODE(DataBits, ...) _HID_RI_ENCODE_ ## DataBits(__VA_ARGS__) - + #define _HID_RI_ENTRY(Type, Tag, DataBits, ...) (Type | Tag | HID_RI_DATA_BITS(DataBits)) _HID_RI_ENCODE(DataBits, (__VA_ARGS__)) #endif - + /* Public Interface - May be used in end-application: */ /* Macros: */ /** \name HID Input, Output and Feature Report Descriptor Item Flags */ @@ -95,7 +95,7 @@ #define HID_IOF_BUFFERED_BYTES (1 << 8) #define HID_IOF_BITFIELD (0 << 8) //@} - + /** \name HID Report Descriptor Item Macros */ //@{ #define HID_RI_INPUT(DataBits, ...) _HID_RI_ENTRY(HID_RI_TYPE_MAIN , 0x80, DataBits, __VA_ARGS__) diff --git a/LUFA/Drivers/USB/Class/Common/MassStorageClassCommon.h b/LUFA/Drivers/USB/Class/Common/MassStorageClassCommon.h index 49246ba7d..9d37b3db5 100644 --- a/LUFA/Drivers/USB/Class/Common/MassStorageClassCommon.h +++ b/LUFA/Drivers/USB/Class/Common/MassStorageClassCommon.h @@ -117,7 +117,7 @@ /** SCSI Command Code for a MODE SENSE (10) command. */ #define SCSI_CMD_MODE_SENSE_10 0x5A //@} - + /** \name SCSI Sense Key Values */ //@{ /** SCSI Sense Code to indicate no error has occurred. */ @@ -164,7 +164,7 @@ /** SCSI Sense Code to indicate that the source data did not match the data read from the medium. */ #define SCSI_SENSE_KEY_MISCOMPARE 0x0E //@} - + /** \name SCSI Additional Sense Codes */ //@{ /** SCSI Additional Sense Code to indicate no additional sense information is available. */ @@ -196,7 +196,7 @@ /** SCSI Additional Sense Code to indicate that no removable medium is inserted into the device. */ #define SCSI_ASENSE_MEDIUM_NOT_PRESENT 0x3A //@} - + /** \name SCSI Additional Sense Key Code Qualifiers */ //@{ /** SCSI Additional Sense Qualifier Code to indicate no additional sense qualifier information is available. */ @@ -213,7 +213,7 @@ /** SCSI Additional Sense Qualifier Code to indicate that an operation is currently in progress. */ #define SCSI_ASENSEQ_OPERATION_IN_PROGRESS 0x07 //@} - + /* Enums: */ /** Enum for possible Class, Subclass and Protocol values of device and interface descriptors relating to the Mass * Storage device class. @@ -231,7 +231,7 @@ * belongs to the Bulk Only Transport protocol of the Mass Storage class. */ }; - + /** Enum for the Mass Storage class specific control requests that can be issued by the USB bus host. */ enum MS_ClassRequests_t { diff --git a/LUFA/Drivers/USB/Class/Common/PrinterClassCommon.h b/LUFA/Drivers/USB/Class/Common/PrinterClassCommon.h index 3d52be306..c370bbc9b 100644 --- a/LUFA/Drivers/USB/Class/Common/PrinterClassCommon.h +++ b/LUFA/Drivers/USB/Class/Common/PrinterClassCommon.h @@ -92,7 +92,7 @@ * belongs to the Bidirectional protocol of the Printer class. */ }; - + /** Enum for the Printer class specific control requests that can be issued by the USB bus host. */ enum PRNT_ClassRequests_t { @@ -106,7 +106,7 @@ PRNT_REQ_SoftReset = 0x02, /**< Printer class-specific request to reset the device, ready for new * printer commands. */ - }; + }; /* Disable C linkage for C++ Compilers: */ #if defined(__cplusplus) diff --git a/LUFA/Drivers/USB/Class/Common/RNDISClassCommon.h b/LUFA/Drivers/USB/Class/Common/RNDISClassCommon.h index 30840f5a3..82c2a9592 100644 --- a/LUFA/Drivers/USB/Class/Common/RNDISClassCommon.h +++ b/LUFA/Drivers/USB/Class/Common/RNDISClassCommon.h @@ -113,7 +113,7 @@ #define REMOTE_NDIS_MEDIA_STATE_CONNECTED 0x00000000UL #define REMOTE_NDIS_MEDIA_STATE_DISCONNECTED 0x00000001UL //@} - + /** \name RNDIS Media Types */ //@{ #define REMOTE_NDIS_MEDIUM_802_3 0x00000000UL @@ -124,7 +124,7 @@ #define REMOTE_NDIS_DF_CONNECTIONLESS 0x00000001UL #define REMOTE_NDIS_DF_CONNECTION_ORIENTED 0x00000002UL //@} - + /** \name RNDIS Packet Types */ //@{ #define REMOTE_NDIS_PACKET_DIRECTED 0x00000001UL @@ -140,7 +140,7 @@ #define REMOTE_NDIS_PACKET_FUNCTIONAL 0x00004000UL #define REMOTE_NDIS_PACKET_MAC_FRAME 0x00008000UL //@} - + /** \name RNDIS OID Values */ //@{ #define OID_GEN_SUPPORTED_LIST 0x00010101UL |