projects / pub / USBasp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: d784baa)
Minor internal macro renaming for the UC3 devices.
authorDean Camera <dean@fourwalledcubicle.com>
Mon, 20 Jun 2011 13:08:27 +0000 (13:08 +0000)
committerDean Camera <dean@fourwalledcubicle.com>
Mon, 20 Jun 2011 13:08:27 +0000 (13:08 +0000)
LUFA/Drivers/USB/Class/Host/HID.c patch | blob | blame | history
LUFA/Drivers/USB/Core/UC3/Device_UC3.h patch | blob | blame | history
LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.h patch | blob | blame | history
LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h patch | blob | blame | history
LUFA/Drivers/USB/Core/UC3/USBController_UC3.h patch | blob | blame | history
LUFA/Drivers/USB/Core/USBMode.h patch | blob | blame | history
LUFA/ManPages/MainPage.txt patch | blob | blame | history

diff --git a/LUFA/Drivers/USB/Class/Host/HID.c b/LUFA/Drivers/USB/Class/Host/HID.c
index 992f7b3..aab35b1 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/HID.c
+++ b/LUFA/Drivers/USB/Class/Host/HID.c
@@ -112,7 +112,7 @@ uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo
                        DoubleBanked    = HIDInterfaceInfo->Config.DataINPipeDoubleBank;
                        InterruptPeriod = DataINEndpoint->PollingIntervalMS;
 
                        DoubleBanked    = HIDInterfaceInfo->Config.DataINPipeDoubleBank;
                        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.SupportsBootProtocol = (HIDInterface->SubClass != HID_CSCP_NonBootProtocol);
        HIDInterfaceInfo->State.LargestReportSize    = 8;
        HIDInterfaceInfo->State.HIDReportSize        = HIDDescriptor->HIDReportLength;
        HIDInterfaceInfo->State.SupportsBootProtocol = (HIDInterface->SubClass != HID_CSCP_NonBootProtocol);
        HIDInterfaceInfo->State.LargestReportSize    = 8;
-       HIDInterfaceInfo->State.IsActive = true;
+       HIDInterfaceInfo->State.IsActive             = true;
 
        return HID_ENUMERROR_NoError;
 }
 
        return HID_ENUMERROR_NoError;
 }
diff --git a/LUFA/Drivers/USB/Core/UC3/Device_UC3.h b/LUFA/Drivers/USB/Core/UC3/Device_UC3.h
index 22e1746..53d497a 100644 (file)
--- a/LUFA/Drivers/USB/Core/UC3/Device_UC3.h
+++ b/LUFA/Drivers/USB/Core/UC3/Device_UC3.h
@@ -83,7 +83,7 @@
                        //@}\r
                        \r
                        #if (!defined(NO_INTERNAL_SERIAL) && \\r
                        //@}\r
                        \r
                        #if (!defined(NO_INTERNAL_SERIAL) && \\r
-                            (defined(USB_SERIES_UC3A3_AVR) || defined(USB_SERIES_UC3A4_AVR) || \\r
+                            (defined(USB_SERIES_UC3A3_AVR32) || defined(USB_SERIES_UC3A4_AVR32) || \\r
                                  defined(__DOXYGEN__)))\r
                                /** String descriptor index for the device's unique serial number string descriptor within the device.\r
                                 *  This unique serial number is used by the host to associate resources to the device (such as drivers or COM port\r
                                  defined(__DOXYGEN__)))\r
                                /** String descriptor index for the device's unique serial number string descriptor within the device.\r
                                 *  This unique serial number is used by the host to associate resources to the device (such as drivers or COM port\r
diff --git a/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.h b/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.h
index 41ab165..98067e6 100644 (file)
--- a/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.h
+++ b/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.h
@@ -98,7 +98,7 @@
                        #define _ENDPOINT_GET_BANKS2(EPDetails)           _ENDPOINT_GET_BANKS3(EPDetails)\r
                        #define _ENDPOINT_GET_BANKS3(MaxSize, Banks)      (Banks)\r
 \r
                        #define _ENDPOINT_GET_BANKS2(EPDetails)           _ENDPOINT_GET_BANKS3(EPDetails)\r
                        #define _ENDPOINT_GET_BANKS3(MaxSize, Banks)      (Banks)\r
 \r
-                       #if defined(USB_SERIES_UC3A0_AVR) || defined(USB_SERIES_UC3A1_AVR)\r
+                       #if defined(USB_SERIES_UC3A0_AVR32) || defined(USB_SERIES_UC3A1_AVR32)\r
                                #define ENDPOINT_DETAILS_MAXEP                 7\r
 \r
                                #define ENDPOINT_DETAILS_EP0                   64,  1\r
                                #define ENDPOINT_DETAILS_MAXEP                 7\r
 \r
                                #define ENDPOINT_DETAILS_EP0                   64,  1\r
@@ -108,7 +108,7 @@
                                #define ENDPOINT_DETAILS_EP4                   64,  2\r
                                #define ENDPOINT_DETAILS_EP5                   256, 2\r
                                #define ENDPOINT_DETAILS_EP6                   256, 2\r
                                #define ENDPOINT_DETAILS_EP4                   64,  2\r
                                #define ENDPOINT_DETAILS_EP5                   256, 2\r
                                #define ENDPOINT_DETAILS_EP6                   256, 2\r
-                       #elif defined(USB_SERIES_UC3A3_AVR) || defined(USB_SERIES_UC3A4_AVR)\r
+                       #elif defined(USB_SERIES_UC3A3_AVR32) || defined(USB_SERIES_UC3A4_AVR32)\r
                                #define ENDPOINT_DETAILS_MAXEP                 8\r
 \r
                                #define ENDPOINT_DETAILS_EP0                   64,  1\r
                                #define ENDPOINT_DETAILS_MAXEP                 8\r
 \r
                                #define ENDPOINT_DETAILS_EP0                   64,  1\r
@@ -118,7 +118,7 @@
                                #define ENDPOINT_DETAILS_EP4                   512, 2\r
                                #define ENDPOINT_DETAILS_EP5                   512, 2\r
                                #define ENDPOINT_DETAILS_EP6                   512, 2                   \r
                                #define ENDPOINT_DETAILS_EP4                   512, 2\r
                                #define ENDPOINT_DETAILS_EP5                   512, 2\r
                                #define ENDPOINT_DETAILS_EP6                   512, 2                   \r
-                       #elif defined(USB_SERIES_UC3B0_AVR) || defined(USB_SERIES_UC3B1_AVR) \r
+                       #elif defined(USB_SERIES_UC3B0_AVR32) || defined(USB_SERIES_UC3B1_AVR32) \r
                                #define ENDPOINT_DETAILS_MAXEP                 7\r
 \r
                                #define ENDPOINT_DETAILS_EP0                   64,  1\r
                                #define ENDPOINT_DETAILS_MAXEP                 7\r
 \r
                                #define ENDPOINT_DETAILS_EP0                   64,  1\r
diff --git a/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h b/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h
index b82b27e..2444a2c 100644 (file)
--- a/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h
+++ b/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h
@@ -168,7 +168,7 @@
                         */\r
                        #define PIPE_CONTROLPIPE_DEFAULT_SIZE   64\r
 \r
                         */\r
                        #define PIPE_CONTROLPIPE_DEFAULT_SIZE   64\r
 \r
-                       #if defined(USB_SERIES_UC3A3_AVR) || defined(USB_SERIES_UC3A4_AVR) || defined(__DOXYGEN__)\r
+                       #if defined(USB_SERIES_UC3A3_AVR32) || defined(USB_SERIES_UC3A4_AVR32) || defined(__DOXYGEN__)\r
                                /** Total number of pipes (including the default control pipe at address 0) which may be used in\r
                                 *  the device.\r
                                 */\r
                                /** Total number of pipes (including the default control pipe at address 0) which may be used in\r
                                 *  the device.\r
                                 */\r
diff --git a/LUFA/Drivers/USB/Core/UC3/USBController_UC3.h b/LUFA/Drivers/USB/Core/UC3/USBController_UC3.h
index da32b3e..eaff222 100644 (file)
--- a/LUFA/Drivers/USB/Core/UC3/USBController_UC3.h
+++ b/LUFA/Drivers/USB/Core/UC3/USBController_UC3.h
@@ -298,7 +298,7 @@
        /* Private Interface - For use in library only: */\r
        #if !defined(__DOXYGEN__)\r
                /* Macros: */                   \r
        /* Private Interface - For use in library only: */\r
        #if !defined(__DOXYGEN__)\r
                /* Macros: */                   \r
-                       #if (defined(USB_SERIES_UC3A3_AVR) || defined(USB_SERIES_UC3A4_AVR))\r
+                       #if (defined(USB_SERIES_UC3A3_AVR32) || defined(USB_SERIES_UC3A4_AVR32))\r
                                #define USB_CLOCK_REQUIRED_FREQ  12000000UL\r
                        #else\r
                                #define USB_CLOCK_REQUIRED_FREQ  48000000UL\r
                                #define USB_CLOCK_REQUIRED_FREQ  12000000UL\r
                        #else\r
                                #define USB_CLOCK_REQUIRED_FREQ  48000000UL\r
diff --git a/LUFA/Drivers/USB/Core/USBMode.h b/LUFA/Drivers/USB/Core/USBMode.h
index 905b568..fad9422 100644 (file)
--- a/LUFA/Drivers/USB/Core/USBMode.h
+++ b/LUFA/Drivers/USB/Core/USBMode.h
@@ -144,34 +144,34 @@
                                #define USB_CAN_BE_HOST
                        #elif (defined(__AVR32_UC3A0512__) || defined(__AVR32_UC3A0256__) || \
                               defined(__AVR32_UC3A0128__) || defined(__AVR32_UC3A064__))
                                #define USB_CAN_BE_HOST
                        #elif (defined(__AVR32_UC3A0512__) || defined(__AVR32_UC3A0256__) || \
                               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_HOST
                        #elif (defined(__AVR32_UC3A1512__) || defined(__AVR32_UC3A1256__) || \
                               defined(__AVR32_UC3A1128__) || defined(__AVR32_UC3A164__))
                                #define USB_CAN_BE_DEVICE
                                #define USB_CAN_BE_HOST
                        #elif (defined(__AVR32_UC3A1512__) || defined(__AVR32_UC3A1256__) || \
                               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_HOST
                        #elif (defined(__AVR32_UC3A3256__) || defined(__AVR32_UC3A3256S__) || \
                               defined(__AVR32_UC3A3128__) || defined(__AVR32_UC3A3128S__) || \
                               defined(__AVR32_UC3A364__)  || defined(__AVR32_UC3A364S__))
                                #define USB_CAN_BE_DEVICE
                                #define USB_CAN_BE_HOST
                        #elif (defined(__AVR32_UC3A3256__) || defined(__AVR32_UC3A3256S__) || \
                               defined(__AVR32_UC3A3128__) || defined(__AVR32_UC3A3128S__) || \
                               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_HOST
                        #elif (defined(__AVR32_UC3A4256__) || defined(__AVR32_UC3A4256S__) || \
                               defined(__AVR32_UC3A4128__) || defined(__AVR32_UC3A4128S__) || \
                               defined(__AVR32_UC3A464__)  || defined(__AVR32_UC3A464S__))
                                #define USB_CAN_BE_DEVICE
                                #define USB_CAN_BE_HOST
                        #elif (defined(__AVR32_UC3A4256__) || defined(__AVR32_UC3A4256S__) || \
                               defined(__AVR32_UC3A4128__) || defined(__AVR32_UC3A4128S__) || \
                               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_HOST
                        #elif (defined(__AVR32_UC3B0512__) || defined(__AVR32_UC3B0256__) || \
                               defined(__AVR32_UC3B0128__) || defined(__AVR32_UC3B064__))
                                #define USB_CAN_BE_DEVICE
                                #define USB_CAN_BE_HOST
                        #elif (defined(__AVR32_UC3B0512__) || defined(__AVR32_UC3B0256__) || \
                               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_HOST
                        #elif (defined(__AVR32_UC3B1512__) || defined(__AVR32_UC3B1256__) || \
                               defined(__AVR32_UC3B1128__) || defined(__AVR32_UC3B164__))
                                #define USB_CAN_BE_DEVICE
                                #define USB_CAN_BE_HOST
                        #elif (defined(__AVR32_UC3B1512__) || defined(__AVR32_UC3B1256__) || \
                               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_HOST
                        #endif
                                #define USB_CAN_BE_DEVICE
                                #define USB_CAN_BE_HOST
                        #endif
diff --git a/LUFA/ManPages/MainPage.txt b/LUFA/ManPages/MainPage.txt
index f18a6a2..0ab9d56 100644 (file)
--- a/LUFA/ManPages/MainPage.txt
+++ b/LUFA/ManPages/MainPage.txt
@@ -8,7 +8,7 @@
  *  \mainpage
  *
  *  \image html LUFA.png
  *  \mainpage
  *
  *  \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
  *  <div align="center"><a href="http://www.lufa-lib.org">http://www.lufa-lib.org</a></div>
  *  \n
  *  \n
  *  <div align="center"><a href="http://www.lufa-lib.org">http://www.lufa-lib.org</a></div>
  *  \n
USB isp AVR programmer