hailey
/
qmk_firmware
mirror of https://github.com/hailey/qmk_firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor internal macro renaming for the UC3 devices.

Browse Source
Dean Camera 14 years ago
parent d784baaa3a
commit 5d7827a573
7 changed files with 15 additions and 15 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      LUFA/Drivers/USB/Class/Host/HID.c
  2. 2
      LUFA/Drivers/USB/Core/UC3/Device_UC3.h
  3. 6
      LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.h
  4. 2
      LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h
  5. 2
      LUFA/Drivers/USB/Core/UC3/USBController_UC3.h
  6. 12
      LUFA/Drivers/USB/Core/USBMode.h
  7. 2
      LUFA/ManPages/MainPage.txt

4
LUFA/Drivers/USB/Class/Host/HID.c
Unescape View File

@ -112,7 +112,7 @@ uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo
DoubleBanked = HIDInterfaceInfo->Config.DataINPipeDoubleBank; DoubleBanked = HIDInterfaceInfo->Config.DataINPipeDoubleBank;
InterruptPeriod = DataINEndpoint->PollingIntervalMS; InterruptPeriod = DataINEndpoint->PollingIntervalMS;
HIDInterfaceInfo->State.DataINPipeSize = DataINEndpoint->EndpointSize; HIDInterfaceInfo->State.DataINPipeSize = DataINEndpoint->EndpointSize;
} }
else if (PipeNum == HIDInterfaceInfo->Config.DataOUTPipeNumber) else if (PipeNum == HIDInterfaceInfo->Config.DataOUTPipeNumber)
{ {
@ -148,7 +148,7 @@ uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo
HIDInterfaceInfo->State.HIDReportSize = HIDDescriptor->HIDReportLength; HIDInterfaceInfo->State.HIDReportSize = HIDDescriptor->HIDReportLength;
HIDInterfaceInfo->State.SupportsBootProtocol = (HIDInterface->SubClass != HID_CSCP_NonBootProtocol); HIDInterfaceInfo->State.SupportsBootProtocol = (HIDInterface->SubClass != HID_CSCP_NonBootProtocol);
HIDInterfaceInfo->State.LargestReportSize = 8; HIDInterfaceInfo->State.LargestReportSize = 8;
HIDInterfaceInfo->State.IsActive = true; HIDInterfaceInfo->State.IsActive = true;
return HID_ENUMERROR_NoError; return HID_ENUMERROR_NoError;
} }

2
LUFA/Drivers/USB/Core/UC3/Device_UC3.h
Unescape View File

@ -83,7 +83,7 @@
//@} //@}
#if (!defined(NO_INTERNAL_SERIAL) && \ #if (!defined(NO_INTERNAL_SERIAL) && \
(defined(USB_SERIES_UC3A3_AVR) || defined(USB_SERIES_UC3A4_AVR) || \ (defined(USB_SERIES_UC3A3_AVR32) || defined(USB_SERIES_UC3A4_AVR32) || \
defined(__DOXYGEN__))) defined(__DOXYGEN__)))
/** String descriptor index for the device's unique serial number string descriptor within the device. /** String descriptor index for the device's unique serial number string descriptor within the device.
* This unique serial number is used by the host to associate resources to the device (such as drivers or COM port * This unique serial number is used by the host to associate resources to the device (such as drivers or COM port

6
LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.h
Unescape View File

@ -98,7 +98,7 @@
#define _ENDPOINT_GET_BANKS2(EPDetails) _ENDPOINT_GET_BANKS3(EPDetails) #define _ENDPOINT_GET_BANKS2(EPDetails) _ENDPOINT_GET_BANKS3(EPDetails)
#define _ENDPOINT_GET_BANKS3(MaxSize, Banks) (Banks) #define _ENDPOINT_GET_BANKS3(MaxSize, Banks) (Banks)
#if defined(USB_SERIES_UC3A0_AVR) || defined(USB_SERIES_UC3A1_AVR) #if defined(USB_SERIES_UC3A0_AVR32) || defined(USB_SERIES_UC3A1_AVR32)
#define ENDPOINT_DETAILS_MAXEP 7 #define ENDPOINT_DETAILS_MAXEP 7
#define ENDPOINT_DETAILS_EP0 64, 1 #define ENDPOINT_DETAILS_EP0 64, 1
@ -108,7 +108,7 @@
#define ENDPOINT_DETAILS_EP4 64, 2 #define ENDPOINT_DETAILS_EP4 64, 2
#define ENDPOINT_DETAILS_EP5 256, 2 #define ENDPOINT_DETAILS_EP5 256, 2
#define ENDPOINT_DETAILS_EP6 256, 2 #define ENDPOINT_DETAILS_EP6 256, 2
#elif defined(USB_SERIES_UC3A3_AVR) || defined(USB_SERIES_UC3A4_AVR) #elif defined(USB_SERIES_UC3A3_AVR32) || defined(USB_SERIES_UC3A4_AVR32)
#define ENDPOINT_DETAILS_MAXEP 8 #define ENDPOINT_DETAILS_MAXEP 8
#define ENDPOINT_DETAILS_EP0 64, 1 #define ENDPOINT_DETAILS_EP0 64, 1
@ -118,7 +118,7 @@
#define ENDPOINT_DETAILS_EP4 512, 2 #define ENDPOINT_DETAILS_EP4 512, 2
#define ENDPOINT_DETAILS_EP5 512, 2 #define ENDPOINT_DETAILS_EP5 512, 2
#define ENDPOINT_DETAILS_EP6 512, 2 #define ENDPOINT_DETAILS_EP6 512, 2
#elif defined(USB_SERIES_UC3B0_AVR) || defined(USB_SERIES_UC3B1_AVR) #elif defined(USB_SERIES_UC3B0_AVR32) || defined(USB_SERIES_UC3B1_AVR32)
#define ENDPOINT_DETAILS_MAXEP 7 #define ENDPOINT_DETAILS_MAXEP 7
#define ENDPOINT_DETAILS_EP0 64, 1 #define ENDPOINT_DETAILS_EP0 64, 1

2
LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h
Unescape View File

@ -168,7 +168,7 @@
*/ */
#define PIPE_CONTROLPIPE_DEFAULT_SIZE 64 #define PIPE_CONTROLPIPE_DEFAULT_SIZE 64
#if defined(USB_SERIES_UC3A3_AVR) || defined(USB_SERIES_UC3A4_AVR) || defined(__DOXYGEN__) #if defined(USB_SERIES_UC3A3_AVR32) || defined(USB_SERIES_UC3A4_AVR32) || defined(__DOXYGEN__)
/** Total number of pipes (including the default control pipe at address 0) which may be used in /** Total number of pipes (including the default control pipe at address 0) which may be used in
* the device. * the device.
*/ */

2
LUFA/Drivers/USB/Core/UC3/USBController_UC3.h
Unescape View File

@ -298,7 +298,7 @@
/* Private Interface - For use in library only: */ /* Private Interface - For use in library only: */
#if !defined(__DOXYGEN__) #if !defined(__DOXYGEN__)
/* Macros: */ /* Macros: */
#if (defined(USB_SERIES_UC3A3_AVR) || defined(USB_SERIES_UC3A4_AVR)) #if (defined(USB_SERIES_UC3A3_AVR32) || defined(USB_SERIES_UC3A4_AVR32))
#define USB_CLOCK_REQUIRED_FREQ 12000000UL #define USB_CLOCK_REQUIRED_FREQ 12000000UL
#else #else
#define USB_CLOCK_REQUIRED_FREQ 48000000UL #define USB_CLOCK_REQUIRED_FREQ 48000000UL

12
LUFA/Drivers/USB/Core/USBMode.h
Unescape View File

@ -144,34 +144,34 @@
#define USB_CAN_BE_HOST #define USB_CAN_BE_HOST
#elif (defined(__AVR32_UC3A0512__) || defined(__AVR32_UC3A0256__) || \ #elif (defined(__AVR32_UC3A0512__) || defined(__AVR32_UC3A0256__) || \
defined(__AVR32_UC3A0128__) || defined(__AVR32_UC3A064__)) defined(__AVR32_UC3A0128__) || defined(__AVR32_UC3A064__))
#define USB_SERIES_UC3A0_AVR #define USB_SERIES_UC3A0_AVR32
#define USB_CAN_BE_DEVICE #define USB_CAN_BE_DEVICE
#define USB_CAN_BE_HOST #define USB_CAN_BE_HOST
#elif (defined(__AVR32_UC3A1512__) || defined(__AVR32_UC3A1256__) || \ #elif (defined(__AVR32_UC3A1512__) || defined(__AVR32_UC3A1256__) || \
defined(__AVR32_UC3A1128__) || defined(__AVR32_UC3A164__)) defined(__AVR32_UC3A1128__) || defined(__AVR32_UC3A164__))
#define USB_SERIES_UC3A1_AVR #define USB_SERIES_UC3A1_AVR32
#define USB_CAN_BE_DEVICE #define USB_CAN_BE_DEVICE
#define USB_CAN_BE_HOST #define USB_CAN_BE_HOST
#elif (defined(__AVR32_UC3A3256__) || defined(__AVR32_UC3A3256S__) || \ #elif (defined(__AVR32_UC3A3256__) || defined(__AVR32_UC3A3256S__) || \
defined(__AVR32_UC3A3128__) || defined(__AVR32_UC3A3128S__) || \ defined(__AVR32_UC3A3128__) || defined(__AVR32_UC3A3128S__) || \
defined(__AVR32_UC3A364__) || defined(__AVR32_UC3A364S__)) defined(__AVR32_UC3A364__) || defined(__AVR32_UC3A364S__))
#define USB_SERIES_UC3A3_AVR #define USB_SERIES_UC3A3_AVR32
#define USB_CAN_BE_DEVICE #define USB_CAN_BE_DEVICE
#define USB_CAN_BE_HOST #define USB_CAN_BE_HOST
#elif (defined(__AVR32_UC3A4256__) || defined(__AVR32_UC3A4256S__) || \ #elif (defined(__AVR32_UC3A4256__) || defined(__AVR32_UC3A4256S__) || \
defined(__AVR32_UC3A4128__) || defined(__AVR32_UC3A4128S__) || \ defined(__AVR32_UC3A4128__) || defined(__AVR32_UC3A4128S__) || \
defined(__AVR32_UC3A464__) || defined(__AVR32_UC3A464S__)) defined(__AVR32_UC3A464__) || defined(__AVR32_UC3A464S__))
#define USB_SERIES_UC3A4_AVR #define USB_SERIES_UC3A4_AVR32
#define USB_CAN_BE_DEVICE #define USB_CAN_BE_DEVICE
#define USB_CAN_BE_HOST #define USB_CAN_BE_HOST
#elif (defined(__AVR32_UC3B0512__) || defined(__AVR32_UC3B0256__) || \ #elif (defined(__AVR32_UC3B0512__) || defined(__AVR32_UC3B0256__) || \
defined(__AVR32_UC3B0128__) || defined(__AVR32_UC3B064__)) defined(__AVR32_UC3B0128__) || defined(__AVR32_UC3B064__))
#define USB_SERIES_UC3B0_AVR #define USB_SERIES_UC3B0_AVR32
#define USB_CAN_BE_DEVICE #define USB_CAN_BE_DEVICE
#define USB_CAN_BE_HOST #define USB_CAN_BE_HOST
#elif (defined(__AVR32_UC3B1512__) || defined(__AVR32_UC3B1256__) || \ #elif (defined(__AVR32_UC3B1512__) || defined(__AVR32_UC3B1256__) || \
defined(__AVR32_UC3B1128__) || defined(__AVR32_UC3B164__)) defined(__AVR32_UC3B1128__) || defined(__AVR32_UC3B164__))
#define USB_SERIES_UC3B1_AVR #define USB_SERIES_UC3B1_AVR32
#define USB_CAN_BE_DEVICE #define USB_CAN_BE_DEVICE
#define USB_CAN_BE_HOST #define USB_CAN_BE_HOST
#endif #endif

2
LUFA/ManPages/MainPage.txt
Unescape View File

@ -8,7 +8,7 @@
* \mainpage * \mainpage
* *
* \image html LUFA.png * \image html LUFA.png
* <div align="center"><small><i>Logo design by <a href="http://ryophotography.wordpress.com">Ryo Photography</a></i></small></div> * <div align="center"><small><i>Logo design by <a href="http://www.studiomonsoon.com">Studio Monsoon Photography</a></i></small></div>
* \n * \n
* <div align="center"><a href="http://www.lufa-lib.org">http://www.lufa-lib.org</a></div> * <div align="center"><a href="http://www.lufa-lib.org">http://www.lufa-lib.org</a></div>
* \n * \n

Write Preview
Loading…
Cancel
Save