Revert changes made for the partial port to the AVR32 architecture.

7 files changed, 12 insertions, 41 deletions

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index ad43258c3..14f1a2547 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -9,7 +9,7 @@
   *  \section Sec_ChangeLogXXXXXX Version XXXXXX

   *

   *  <b>New:</b>

-  *  - Added support for the UC3B0256 AVR32 microcontroller

+  *  - (None)

   *

   *  <b>Changed:</b>

   *  - AVRISP programmer project now has a more robust timeout system, allowing for a doubling of the software USART speed

diff --git a/LUFA/ManPages/CompileTimeTokens.txt b/LUFA/ManPages/CompileTimeTokens.txt
index 5700c3aab..9beeecebe 100644
--- a/LUFA/ManPages/CompileTimeTokens.txt
+++ b/LUFA/ManPages/CompileTimeTokens.txt
@@ -148,7 +148,6 @@
  *  may be defined to a value between 0 and 2 to fix the state variable into one of the three general purpose IO registers inside the AVR

  *  reserved for application use. When defined, the corresponding GPIOR register should not be used within the user application except

  *  implicitly via the library APIs.

- *  \note This compile time option is ignored for the AVR32 UC3B architecture.

  *

  *  <b>FIXED_NUM_CONFIGURATIONS</b>=<i>x</i> - ( \ref Group_Device ) \n

  *  By default, the library determines the number of configurations a USB device supports by reading the device descriptor. This reduces

@@ -187,7 +186,6 @@
  *  may be defined to a value between 0 and 2 to fix the state variable into one of the three general purpose IO registers inside the AVR

  *  reserved for application use. When defined, the corresponding GPIOR register should not be used within the user application except

  *  implicitly via the library APIs.

- *  \note This compile time option is ignored for the AVR32 UC3B architecture.

  *

  *  <b>USB_HOST_TIMEOUT_MS</b>=<i>x</i> - ( \ref Group_Host ) \n

  *  When a control transfer is initiated in host mode to an attached device, a timeout is used to abort the transfer if the attached

diff --git a/LUFA/ManPages/DeviceSupport.txt b/LUFA/ManPages/DeviceSupport.txt
index 98a1c7764..0902b90a2 100644
--- a/LUFA/ManPages/DeviceSupport.txt
+++ b/LUFA/ManPages/DeviceSupport.txt
@@ -20,13 +20,11 @@
  *   - AT90USB647 (USB Host and Device)

  *   - AT90USB1286 (USB Device Only)

  *   - AT90USB1287 (USB Host and Device)

- *   - AT32UC3B0256 (EXPERIMENTAL - see \ref Sec_AVR32Port)

  *

  *  Currently supported Atmel boards:

  *   - AT90USBKEY

  *   - ATAVRUSBRF01

  *   - EVK527

- *   - EVK1101  (EXPERIMENTAL - see \ref Sec_AVR32Port)

  *   - RZUSBSTICK

  *   - STK525

  *   - STK526

diff --git a/LUFA/ManPages/DirectorySummaries.txt b/LUFA/ManPages/DirectorySummaries.txt
index 411cfe80a..13583f5d8 100644
--- a/LUFA/ManPages/DirectorySummaries.txt
+++ b/LUFA/ManPages/DirectorySummaries.txt
@@ -27,19 +27,13 @@
  *  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/AVR8

- *  \brief 8-Bit AVR model peripheral driver files.

+ *  \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 and ADC, on supported

- *  32-Bit AVR models. Its contents should <b>not</b> be included by the user application - the dispatch header file

- *  located in the parent directory should be used instead.

- *

- *  \dir LUFA/Drivers/Peripheral/AVR32

- *  \brief 32-Bit AVR model peripheral driver files.

- *

- *  This folder contains drivers for several of the AVR internal peripherals such as the USART and ADC, on supported

- *  8-Bit AVR models. Its contents should <b>not</b> be included by the user application - the dispatch header file

- *  located in the parent directory should be used instead.

+ *  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

+ *  included by the user application - the dispatch header file located in the parent directory should be used

+ *  instead.

  *

  *  \dir LUFA/Drivers/USB

  *  \brief USB controller peripheral driver files.

diff --git a/LUFA/ManPages/FutureChanges.txt b/LUFA/ManPages/FutureChanges.txt
index 86114f434..38cbf0ccf 100644
--- a/LUFA/ManPages/FutureChanges.txt
+++ b/LUFA/ManPages/FutureChanges.txt
@@ -33,24 +33,7 @@
   *      -# Finish SideShow demo

   *      -# Finish StandaloneProgrammer project

   *  - Ports

+  *      -# AVR32 UC3B series microcontrollers

   *      -# Atmel ARM7 series microcontrollers

   *      -# Other (commercial) C compilers

-  *

-  *  \section Sec_AVR32Port AVR32 Port Status

-  *  The following drivers have been ported:

-  *    - Joystick Board Driver

-  *    - Buttons Board Driver

-  *    - LEDs Board Driver

-  *    - Simple Scheduler

-  *    - Temperature Board Driver

-  *

-  *  The following drivers have been partially ported:

-  *    - SPI Peripheral Driver

-  *    - USB Driver

-  *

-  *  The following drivers have not yet been ported:

-  *    - Dataflash Board Driver

-  *    - Serial Peripheral Driver

-  *    - ADC Peripheral Driver

-  *    - TWI Peripheral Driver

   */

diff --git a/LUFA/ManPages/MainPage.txt b/LUFA/ManPages/MainPage.txt
index ccc8c5ca2..c7ea7db1b 100644
--- a/LUFA/ManPages/MainPage.txt
+++ b/LUFA/ManPages/MainPage.txt
@@ -13,9 +13,9 @@
  *

  *  <b>LUFA is donationware. For author and donation information, see \ref Page_Donating.</b>

  *

- *  LUFA is an open-source USB library for the USB-enabled AVR8 and AVR32 microcontrollers, released under the MIT license. It

- *  supports a large number of USB AVR models and boards (see \ref Page_DeviceSupport). It is designed to provide an easy to use,

- *  feature rich framework for the development of USB peripherals and hosts.

+ *  LUFA is an open-source USB library for the USB-enabled AVR microcontrollers, released under the MIT license. It supports

+ *  a large number of USB AVR models and boards (see \ref Page_DeviceSupport). It is designed to provide an easy to use, feature

+ *  rich framework for the development of USB peripherals and hosts.

  *

  *  LUFA focuses on the microcontroller side of USB development only; it includes no host USB driver development facilities. While

  *  custom USB devices can be made with LUFA, the included demos all use the inbuilt OS drivers for each USB class for simplicity.

diff --git a/LUFA/ManPages/MigrationInformation.txt b/LUFA/ManPages/MigrationInformation.txt
index 206fd45ba..262364070 100644
--- a/LUFA/ManPages/MigrationInformation.txt
+++ b/LUFA/ManPages/MigrationInformation.txt
@@ -13,9 +13,7 @@
  * \section Sec_MigrationXXXXXX Migrating from 100219 to XXXXXX

  *

  * \section Sec_Migration100219 Migrating from 091223 to 100219

- *  <b>Non-USB Library Components</b>

- *    - The "Byte" suffix on the SPI peripheral driver's send and receive routines has been dropped, to make the interface consistant

- *      between the AVR8 driver and the new AVR32 driver, which supports variable width transfers.

+ *    - (None)

  *

  *  <b>Non-USB Library Components</b>

  *    - Due to some ADC channels not being identical to their ADC MUX selection masks for single-ended conversions on some AVR models,