Rename AVRU4U6U9 peripheral driver directory to AVR8.
authorDean Camera <dean@fourwalledcubicle.com>
Mon, 22 Feb 2010 12:05:36 +0000 (12:05 +0000)
committerDean Camera <dean@fourwalledcubicle.com>
Mon, 22 Feb 2010 12:05:36 +0000 (12:05 +0000)
12 files changed:
LUFA/Drivers/Peripheral/ADC.h
LUFA/Drivers/Peripheral/AVR8/ADC.h [new file with mode: 0644]
LUFA/Drivers/Peripheral/AVR8/SPI.h [new file with mode: 0644]
LUFA/Drivers/Peripheral/AVR8/Serial.h [new file with mode: 0644]
LUFA/Drivers/Peripheral/AVR8/TWI.h [new file with mode: 0644]
LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h [deleted file]
LUFA/Drivers/Peripheral/AVRU4U6U7/SPI.h [deleted file]
LUFA/Drivers/Peripheral/AVRU4U6U7/Serial.h [deleted file]
LUFA/Drivers/Peripheral/AVRU4U6U7/TWI.h [deleted file]
LUFA/Drivers/Peripheral/SPI.h
LUFA/Drivers/Peripheral/Serial.h
LUFA/Drivers/Peripheral/TWI.h

index 9823643..ef708b4 100644 (file)
@@ -62,7 +62,7 @@
                     defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB647__) || \\r
                         defined(__AVR_ATmega16U4__)  || defined(__AVR_ATmega32U4__) || \\r
                         defined(__AVR_ATmega32U6__))\r
                     defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB647__) || \\r
                         defined(__AVR_ATmega16U4__)  || defined(__AVR_ATmega32U4__) || \\r
                         defined(__AVR_ATmega32U6__))\r
-                       #include "AVRU4U6U7/ADC.h"\r
+                       #include "AVR8/ADC.h"\r
                #else\r
                        #error "ADC is not available for the currently selected AVR model."\r
                #endif\r
                #else\r
                        #error "ADC is not available for the currently selected AVR model."\r
                #endif\r
diff --git a/LUFA/Drivers/Peripheral/AVR8/ADC.h b/LUFA/Drivers/Peripheral/AVR8/ADC.h
new file mode 100644 (file)
index 0000000..06f9d3b
--- /dev/null
@@ -0,0 +1,322 @@
+/*\r
+             LUFA Library\r
+     Copyright (C) Dean Camera, 2010.\r
+              \r
+  dean [at] fourwalledcubicle [dot] com\r
+      www.fourwalledcubicle.com\r
+*/\r
+\r
+/*\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r
+  software without specific, written prior permission.\r
+\r
+  The author disclaim all warranties with regard to this\r
+  software, including all implied warranties of merchantability\r
+  and fitness.  In no event shall the author be liable for any\r
+  special, indirect or consequential damages or any damages\r
+  whatsoever resulting from loss of use, data or profits, whether\r
+  in an action of contract, negligence or other tortious action,\r
+  arising out of or in connection with the use or performance of\r
+  this software.\r
+*/\r
+\r
+/** \file\r
+ *\r
+ *  ADC driver for the 8-Bit AVRs containing a hardware ADC module.\r
+ *\r
+ *  \note This file should not be included directly. It is automatically included as needed by the ADC driver\r
+ *        dispatch header located in LUFA/Drivers/Peripheral/ADC.h.\r
+ */\r
+\r
+/** \ingroup Group_ADC\r
+ *  @defgroup Group_ADC_AVR8 8-Bit AVR ADC Driver\r
+ *\r
+ *  ADC driver for 8-Bit AVRs containing a hardware ADC module.\r
+ *\r
+ *  \note This file should not be included directly. It is automatically included as needed by the ADC driver\r
+ *        dispatch header located in LUFA/Drivers/Peripheral/ADC.h.\r
+ *\r
+ *  @{\r
+ */\r
\r
+#ifndef __ADC_AVR8_H__\r
+#define __ADC_AVR8_H__\r
+\r
+       /* Includes: */\r
+               #include "../../../Common/Common.h"\r
+               \r
+               #include <avr/io.h>\r
+               #include <stdbool.h>\r
+               \r
+       /* Enable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       extern "C" {\r
+               #endif\r
+\r
+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_ADC_H)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/Peripheral/ADC.h instead.\r
+               #endif\r
+\r
+       /* Public Interface - May be used in end-application: */\r
+               /* Macros: */                   \r
+                       /** Reference mask, for using the voltage present at the AVR's AREF pin for the ADC reference. */\r
+                       #define  ADC_REFERENCE_AREF              0\r
+\r
+                       /** Reference mask, for using the voltage present at the AVR's AVCC pin for the ADC reference. */\r
+                       #define  ADC_REFERENCE_AVCC              (1 << REFS0)\r
+\r
+                       /** Reference mask, for using the internally generated 2.56V reference voltage as the ADC reference. */\r
+                       #define  ADC_REFERENCE_INT2560MV         ((1 << REFS1)| (1 << REFS0))\r
+                       \r
+                       /** Left-adjusts the 10-bit ADC result, so that the upper 8 bits of the value returned by the\r
+                        *  ADC_GetResult() macro contain the 8 most significant bits of the result. */\r
+                       #define  ADC_LEFT_ADJUSTED               (1 << ADLAR)\r
+\r
+                       /** Right-adjusts the 10-bit ADC result, so that the lower 8 bits of the value returned by the\r
+                        *  ADC_GetResult() macro contain the 8 least significant bits of the result. */\r
+                       #define  ADC_RIGHT_ADJUSTED              (0 << ADLAR)\r
+                       \r
+                       /** Sets the ADC mode to free running, so that conversions take place continuously as fast as the ADC\r
+                        *  is capable of at the given input clock speed. */\r
+                       #define  ADC_FREE_RUNNING                (1 << ADATE)\r
+\r
+                       /** Sets the ADC mode to single conversion, so that only a single conversion will take place before\r
+                        *  the ADC returns to idle. */\r
+                       #define  ADC_SINGLE_CONVERSION           (0 << ADATE)\r
+                       \r
+                       /** Sets the ADC input clock to prescale by a factor of 2 the AVR's system clock. */\r
+                       #define  ADC_PRESCALE_2                  (1 << ADPS0)\r
+\r
+                       /** Sets the ADC input clock to prescale by a factor of 4 the AVR's system clock. */\r
+                       #define  ADC_PRESCALE_4                  (1 << ADPS1)\r
+\r
+                       /** Sets the ADC input clock to prescale by a factor of 8 the AVR's system clock. */\r
+                       #define  ADC_PRESCALE_8                  ((1 << ADPS0) | (1 << ADPS1))\r
+\r
+                       /** Sets the ADC input clock to prescale by a factor of 16 the AVR's system clock. */\r
+                       #define  ADC_PRESCALE_16                 (1 << ADPS2)\r
+\r
+                       /** Sets the ADC input clock to prescale by a factor of 32 the AVR's system clock. */\r
+                       #define  ADC_PRESCALE_32                 ((1 << ADPS2) | (1 << ADPS0))\r
+\r
+                       /** Sets the ADC input clock to prescale by a factor of 64 the AVR's system clock. */\r
+                       #define  ADC_PRESCALE_64                 ((1 << ADPS2) | (1 << ADPS1))\r
+\r
+                       /** Sets the ADC input clock to prescale by a factor of 128 the AVR's system clock. */\r
+                       #define  ADC_PRESCALE_128                ((1 << ADPS2) | (1 << ADPS1) | (1 << ADPS0))\r
+                       \r
+                       //@{\r
+                       /** MUX mask define for the ADC0 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */\r
+                       #define  ADC_CHANNEL0                    0x00\r
+\r
+                       /** MUX mask define for the ADC1 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */\r
+                       #define  ADC_CHANNEL1                    0x01\r
+\r
+                       #if !(defined(__AVR_ATmega16U4__)  || defined(__AVR_ATmega32U4__) || defined(__DOXYGEN__))\r
+                               /** MUX mask define for the ADC2 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.\r
+                                *\r
+                                *  \note Note available on all AVR models.\r
+                                */\r
+                               #define  ADC_CHANNEL2                    0x02\r
+\r
+                               /** MUX mask define for the ADC3 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.\r
+                                *\r
+                                *  \note Note available on all AVR models.\r
+                                */\r
+                               #define  ADC_CHANNEL3                    0x03\r
+                       #endif\r
+\r
+                       /** MUX mask define for the ADC4 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */\r
+                       #define  ADC_CHANNEL4                    0x04\r
+\r
+                       /** MUX mask define for the ADC5 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */\r
+                       #define  ADC_CHANNEL5                    0x05\r
+\r
+                       /** MUX mask define for the ADC6 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */\r
+                       #define  ADC_CHANNEL6                    0x06\r
+\r
+                       /** MUX mask define for the ADC7 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */\r
+                       #define  ADC_CHANNEL7                    0x07\r
+\r
+                       /** MUX mask define for the internal 1.1V bandgap channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */\r
+                       #define  ADC_1100MV_BANDGAP              0x1E\r
+                       \r
+                       #if (defined(__AVR_ATmega16U4__)  || defined(__AVR_ATmega32U4__) || defined(__DOXYGEN__))\r
+                               /** MUX mask define for the ADC8 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.\r
+                                *\r
+                                *  \note Note available on all AVR models.\r
+                                */\r
+                               #define  ADC_CHANNEL8                0x20\r
+\r
+                               /** MUX mask define for the ADC9 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.\r
+                                *\r
+                                *  \note Note available on all AVR models.\r
+                                */\r
+                               #define  ADC_CHANNEL9                0x21\r
+\r
+                               /** MUX mask define for the ADC10 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.\r
+                                *\r
+                                *  \note Note available on all AVR models.\r
+                                */\r
+                               #define  ADC_CHANNEL10               0x22\r
+\r
+                               /** MUX mask define for the ADC11 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.\r
+                                *\r
+                                *  \note Note available on all AVR models.\r
+                                */\r
+                               #define  ADC_CHANNEL11               0x23\r
+\r
+                               /** MUX mask define for the ADC12 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.\r
+                                *\r
+                                *  \note Note available on all AVR models.\r
+                                */\r
+                               #define  ADC_CHANNEL12               0x24\r
+\r
+                               /** MUX mask define for the ADC13 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.\r
+                                *\r
+                                *  \note Note available on all AVR models.\r
+                                */\r
+                               #define  ADC_CHANNEL13               0x25\r
+\r
+                               /** MUX mask define for the internal temperature sensor channel of the ADC. See \ref ADC_StartReading and\r
+                                *  \ref ADC_GetChannelReading.\r
+                                *\r
+                                *  \note Note available on all AVR models.\r
+                                */\r
+                               #define  ADC_INT_TEMP_SENS           0x27                       \r
+                       #endif\r
+                       //@}\r
+               \r
+               /* Pseudo-Function Macros: */\r
+                       #if defined(__DOXYGEN__)\r
+                               /** Initializes the ADC, ready for conversions. This must be called before any other ADC operations.\r
+                                *  The "mode" parameter should be a mask comprised of a conversion mode (free running or single) and\r
+                                *  prescaler masks.\r
+                                *\r
+                                *  \param[in] Mode  Mask of ADC settings, including adjustment, prescale, mode and reference\r
+                                */\r
+                               static inline void ADC_Init(uint8_t Mode);\r
+\r
+                               /** Turns off the ADC. If this is called, any further ADC operations will require a call to\r
+                                *  \ref ADC_Init() before the ADC can be used again.\r
+                                */\r
+                               static inline void ADC_ShutDown(void);\r
+                               \r
+                               /** Indicates if the ADC is currently enabled.\r
+                                *\r
+                                *  \return Boolean true if the ADC subsystem is currently enabled, false otherwise.\r
+                                */\r
+                               static inline bool ADC_GetStatus(void);\r
+                               \r
+                               /** Indicates if the current ADC conversion is completed, or still in progress.\r
+                                *\r
+                                *  \return Boolean false if the reading is still taking place, or true if the conversion is\r
+                                *          complete and ready to be read out with \ref ADC_GetResult()\r
+                                */\r
+                               static inline bool ADC_IsReadingComplete(void);\r
+                               \r
+                               /** Retrieves the conversion value of the last completed ADC conversion.\r
+                                *\r
+                                *  \return The result of the last ADC conversion\r
+                                */\r
+                               static inline uint16_t ADC_GetResult(void);\r
+                       #else\r
+                               #define  ADC_Init(mode)          MACROS{ ADCSRA = ((1 << ADEN) | mode);         }MACROE\r
+\r
+                               #define  ADC_ShutDown()          MACROS{ ADCSRA = 0;                            }MACROE\r
+                               \r
+                               #define  ADC_GetStatus()               ((ADCSRA & (1 << ADEN)) ? true : false)\r
+\r
+                               #define  ADC_IsReadingComplete()        (ADCSRA & (1 << ADSC))\r
+                               \r
+                               #define  ADC_GetResult()                 ADC                    \r
+                       #endif\r
+                       \r
+               /* Inline Functions: */\r
+                       /** Configures the given ADC channel, ready for ADC conversions. This function sets the\r
+                        *  associated port pin as an input and disables the digital portion of the I/O to reduce\r
+                        *  power consumption.\r
+                        *\r
+                        *  \note This must only be called for ADC channels with are connected to a physical port\r
+                        *        pin of the AVR, denoted by its special alternative function ADCx.\r
+                        *\r
+                        *  \note The channel number must be specified as an integer, and NOT a ADC_CHANNELx mask.\r
+                        *\r
+                        *  \param[in] Channel  ADC channel number to set up for conversions\r
+                        */\r
+                       static inline void ADC_SetupChannel(const uint8_t Channel)\r
+                       {\r
+                               #if (defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB646__) || \\r
+                                        defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB647__) || \\r
+                                        defined(__AVR_ATmega32U6__))                           \r
+                               DDRF  &= ~(1 << Channel);\r
+                               DIDR0 |=  (1 << Channel);\r
+                               #elif (defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__))\r
+                               if (Channel < 8)\r
+                               {\r
+                                       DDRF  &= ~(1 << Channel);\r
+                                       DIDR0 |=  (1 << Channel);\r
+                               }\r
+                               else if (Channel == 8)\r
+                               {\r
+                                       DDRD  &= ~(1 << 4);\r
+                                       DIDR2 |=  (1 << 0);\r
+                               }\r
+                               else if (Channel < 11)\r
+                               {\r
+                                       DDRD  &= ~(1 << (Channel - 3));\r
+                                       DIDR2 |=  (1 << (Channel - 8));\r
+                               }\r
+                               else\r
+                               {\r
+                                       DDRB  &= ~(1 << (Channel - 7));\r
+                                       DIDR2 |=  (1 << (Channel - 8));\r
+                               }\r
+                               #endif\r
+                       }\r
+                       \r
+                       /** Starts the reading of the given channel, but does not wait until the conversion has completed.\r
+                        *  Once executed, the conversion status can be determined via the \ref ADC_IsReadingComplete() macro and\r
+                        *  the result read via the \ref ADC_GetResult() macro.\r
+                        *\r
+                        *  \param[in] MUXMask  Mask comprising of an ADC channel mask, reference mask and adjustment mask\r
+                        */\r
+                       static inline void ADC_StartReading(const uint8_t MUXMask)\r
+                       {\r
+                               ADMUX = MUXMask;\r
+                       \r
+                               ADCSRA |= (1 << ADSC);\r
+                       }\r
+\r
+                       /** Performs a complete single reading from channel, including a polling spin-loop to wait for the\r
+                        *  conversion to complete, and the returning of the converted value.\r
+                        *\r
+                        *  \param[in] MUXMask  Mask comprising of an ADC channel mask, reference mask and adjustment mask\r
+                        */\r
+                       static inline uint16_t ADC_GetChannelReading(const uint8_t MUXMask) ATTR_WARN_UNUSED_RESULT;\r
+                       static inline uint16_t ADC_GetChannelReading(const uint8_t MUXMask)\r
+                       {\r
+                               ADC_StartReading(MUXMask);\r
+       \r
+                               while (!(ADC_IsReadingComplete()));\r
+       \r
+                               return ADC_GetResult();\r
+                       }\r
+\r
+       /* Disable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       }\r
+               #endif\r
+               \r
+#endif\r
+\r
+/** @} */\r
diff --git a/LUFA/Drivers/Peripheral/AVR8/SPI.h b/LUFA/Drivers/Peripheral/AVR8/SPI.h
new file mode 100644 (file)
index 0000000..3440cc9
--- /dev/null
@@ -0,0 +1,189 @@
+/*\r
+             LUFA Library\r
+     Copyright (C) Dean Camera, 2010.\r
+              \r
+  dean [at] fourwalledcubicle [dot] com\r
+      www.fourwalledcubicle.com\r
+*/\r
+\r
+/*\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r
+  software without specific, written prior permission.\r
+\r
+  The author disclaim all warranties with regard to this\r
+  software, including all implied warranties of merchantability\r
+  and fitness.  In no event shall the author be liable for any\r
+  special, indirect or consequential damages or any damages\r
+  whatsoever resulting from loss of use, data or profits, whether\r
+  in an action of contract, negligence or other tortious action,\r
+  arising out of or in connection with the use or performance of\r
+  this software.\r
+*/\r
+\r
+/** \file\r
+ *\r
+ *  SPI driver for the 8-bit AVRs.\r
+ *\r
+ *  \note This file should not be included directly. It is automatically included as needed by the SPI driver\r
+ *        dispatch header located in LUFA/Drivers/Peripheral/SPI.h.\r
+ */\r
\r
+/** \ingroup Group_SPI\r
+ *  @defgroup Group_SPI_AVR8 8-Bit AVR SPI Driver\r
+ *\r
+ *  SPI driver for the 8-bit AVRs.\r
+ *\r
+ *  \note This file should not be included directly. It is automatically included as needed by the ADC driver\r
+ *        dispatch header located in LUFA/Drivers/Peripheral/SPI.h.\r
+ *\r
+ *  @{\r
+ */\r
+\r
+#ifndef __SPI_AVR8_H__\r
+#define __SPI_AVR8_H__\r
+\r
+       /* Includes: */\r
+               #include <stdbool.h>\r
+\r
+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_SPI_H)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/Peripheral/SPI.h instead.\r
+               #endif\r
+\r
+       /* Enable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       extern "C" {\r
+               #endif\r
+\r
+       /* Private Interface - For use in library only: */\r
+       #if !defined(__DOXYGEN__)\r
+               /* Macros: */\r
+                       #define SPI_USE_DOUBLESPEED            (1 << SPE)\r
+       #endif\r
+       \r
+       /* Public Interface - May be used in end-application: */\r
+               /* Macros: */\r
+                       /** SPI prescaler mask for SPI_Init(). Divides the system clock by a factor of 2. */\r
+                       #define SPI_SPEED_FCPU_DIV_2           SPI_USE_DOUBLESPEED\r
+\r
+                       /** SPI prescaler mask for SPI_Init(). Divides the system clock by a factor of 4. */\r
+                       #define SPI_SPEED_FCPU_DIV_4           0\r
+\r
+                       /** SPI prescaler mask for SPI_Init(). Divides the system clock by a factor of 8. */\r
+                       #define SPI_SPEED_FCPU_DIV_8           (SPI_USE_DOUBLESPEED | (1 << SPR0))\r
+\r
+                       /** SPI prescaler mask for SPI_Init(). Divides the system clock by a factor of 16. */\r
+                       #define SPI_SPEED_FCPU_DIV_16          (1 << SPR0)\r
+\r
+                       /** SPI prescaler mask for SPI_Init(). Divides the system clock by a factor of 32. */\r
+                       #define SPI_SPEED_FCPU_DIV_32          (SPI_USE_DOUBLESPEED | (1 << SPR1))\r
+\r
+                       /** SPI prescaler mask for SPI_Init(). Divides the system clock by a factor of 64. */\r
+                       #define SPI_SPEED_FCPU_DIV_64          (SPI_USE_DOUBLESPEED | (1 << SPR1) | (1 << SPR0))\r
+\r
+                       /** SPI prescaler mask for SPI_Init(). Divides the system clock by a factor of 128. */\r
+                       #define SPI_SPEED_FCPU_DIV_128         ((1 << SPR1) | (1 << SPR0))\r
+                       \r
+                       /** SPI clock polarity mask for SPI_Init(). Indicates that the SCK should lead on the rising edge. */\r
+                       #define SPI_SCK_LEAD_RISING            (0 << CPOL)\r
+\r
+                       /** SPI clock polarity mask for SPI_Init(). Indicates that the SCK should lead on the falling edge. */\r
+                       #define SPI_SCK_LEAD_FALLING           (1 << CPOL)\r
+\r
+                       /** SPI data sample mode mask for SPI_Init(). Indicates that the data should sampled on the leading edge. */\r
+                       #define SPI_SAMPLE_LEADING             (0 << CPHA)\r
+\r
+                       /** SPI data sample mode mask for SPI_Init(). Indicates that the data should be sampled on the trailing edge. */\r
+                       #define SPI_SAMPLE_TRAILING            (1 << CPHA)\r
+                       \r
+                       /** SPI mode mask for SPI_Init(). Indicates that the SPI interface should be initialized into slave mode. */\r
+                       #define SPI_MODE_SLAVE                 (0 << MSTR)\r
+\r
+                       /** SPI mode mask for SPI_Init(). Indicates that the SPI interface should be initialized into master mode. */\r
+                       #define SPI_MODE_MASTER                (1 << MSTR)\r
+\r
+               /* Inline Functions: */\r
+                       /** Initialises the SPI subsystem, ready for transfers. Must be called before calling any other\r
+                        *  SPI routines.\r
+                        *\r
+                        *  \param[in] SPIOptions  SPI Options, a mask consisting of one of each of the SPI_SPEED_*,\r
+                        *                         SPI_SCK_*, SPI_SAMPLE_* and SPI_MODE_* masks\r
+                        */\r
+                       static inline void SPI_Init(const uint8_t SPIOptions)\r
+                       {\r
+                               DDRB  |= ((1 << 1) | (1 << 2));\r
+                               PORTB |= ((1 << 0) | (1 << 3));\r
+                               \r
+                               SPCR   = ((1 << SPE) | SPIOptions);\r
+                               \r
+                               if (SPIOptions & SPI_USE_DOUBLESPEED)\r
+                                 SPSR |= (1 << SPI2X);\r
+                               else\r
+                                 SPSR &= ~(1 << SPI2X);\r
+                       }\r
+                       \r
+                       /** Turns off the SPI driver, disabling and returning used hardware to their default configuration. */\r
+                       static inline void SPI_ShutDown(void)\r
+                       {\r
+                               DDRB  &= ~((1 << 1) | (1 << 2));\r
+                               PORTB &= ~((1 << 0) | (1 << 3));\r
+                               \r
+                               SPCR   = 0;\r
+                               SPSR   = 0;\r
+                       }\r
+                       \r
+                       /** Sends and receives a byte through the SPI interface, blocking until the transfer is complete.\r
+                        *\r
+                        *  \param[in] Byte  Byte to send through the SPI interface\r
+                        *\r
+                        *  \return Response byte from the attached SPI device\r
+                        */\r
+                       static inline uint8_t SPI_TransferByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;\r
+                       static inline uint8_t SPI_TransferByte(const uint8_t Byte)\r
+                       {\r
+                               SPDR = Byte;\r
+                               while (!(SPSR & (1 << SPIF)));\r
+                               return SPDR;\r
+                       }\r
+\r
+                       /** Sends a byte through the SPI interface, blocking until the transfer is complete. The response\r
+                        *  byte sent to from the attached SPI device is ignored.\r
+                        *\r
+                        *  \param[in] Byte Byte to send through the SPI interface\r
+                        */\r
+                       static inline void SPI_SendByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;\r
+                       static inline void SPI_SendByte(const uint8_t Byte)\r
+                       {\r
+                               SPDR = Byte;\r
+                               while (!(SPSR & (1 << SPIF)));\r
+                       }\r
+\r
+                       /** Sends a dummy byte through the SPI interface, blocking until the transfer is complete. The response\r
+                        *  byte from the attached SPI device is returned.\r
+                        *\r
+                        *  \return The response byte from the attached SPI device\r
+                        */\r
+                       static inline uint8_t SPI_ReceiveByte(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;\r
+                       static inline uint8_t SPI_ReceiveByte(void)\r
+                       {\r
+                               SPDR = 0x00;\r
+                               while (!(SPSR & (1 << SPIF)));\r
+                               return SPDR;\r
+                       }\r
+\r
+       /* Disable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       }\r
+               #endif\r
+               \r
+#endif\r
+\r
+/** @} */\r
diff --git a/LUFA/Drivers/Peripheral/AVR8/Serial.h b/LUFA/Drivers/Peripheral/AVR8/Serial.h
new file mode 100644 (file)
index 0000000..0421dea
--- /dev/null
@@ -0,0 +1,145 @@
+/*\r
+             LUFA Library\r
+     Copyright (C) Dean Camera, 2010.\r
+              \r
+  dean [at] fourwalledcubicle [dot] com\r
+      www.fourwalledcubicle.com\r
+*/\r
+\r
+/*\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r
+  software without specific, written prior permission.\r
+\r
+  The author disclaim all warranties with regard to this\r
+  software, including all implied warranties of merchantability\r
+  and fitness.  In no event shall the author be liable for any\r
+  special, indirect or consequential damages or any damages\r
+  whatsoever resulting from loss of use, data or profits, whether\r
+  in an action of contract, negligence or other tortious action,\r
+  arising out of or in connection with the use or performance of\r
+  this software.\r
+*/\r
+\r
+/** \file\r
+ *\r
+ *  ADC driver for the 8-bit AVRs.\r
+ *\r
+ *  \note This file should not be included directly. It is automatically included as needed by the USART driver\r
+ *        dispatch header located in LUFA/Drivers/Peripheral/Serial.h.\r
+ */\r
\r
+/** \ingroup Group_Serial\r
+ *  @defgroup Group_Serial_AVR8 8-Bit AVR Serial Driver\r
+ *\r
+ *  Serial driver for the 8-bit AVRs.\r
+ *\r
+ *  \note This file should not be included directly. It is automatically included as needed by the ADC driver\r
+ *        dispatch header located in LUFA/Drivers/Peripheral/USART.h.\r
+ *\r
+ *  @{\r
+ */\r
\r
+#ifndef __SERIAL_AVR8_H__\r
+#define __SERIAL_AVR8_H__\r
+\r
+       /* Includes: */\r
+               #include <avr/io.h>\r
+               #include <avr/pgmspace.h>\r
+               #include <stdbool.h>\r
+               \r
+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_SERIAL_H)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/Peripheral/Serial.h instead.\r
+               #endif\r
+\r
+       /* Public Interface - May be used in end-application: */\r
+               /* Macros: */\r
+                       /** Macro for calculating the baud value from a given baud rate when the U2X (double speed) bit is\r
+                        *  not set.\r
+                        */\r
+                       #define SERIAL_UBBRVAL(baud)    ((((F_CPU / 16) + (baud / 2)) / (baud)) - 1)\r
+\r
+                       /** Macro for calculating the baud value from a given baud rate when the U2X (double speed) bit is\r
+                        *  set.\r
+                        */\r
+                       #define SERIAL_2X_UBBRVAL(baud) ((((F_CPU / 8) + (baud / 2)) / (baud)) - 1)\r
+\r
+               /* Pseudo-Function Macros: */\r
+                       #if defined(__DOXYGEN__)\r
+                               /** Indicates whether a character has been received through the USART.\r
+                                *\r
+                                *  \return Boolean true if a character has been received, false otherwise\r
+                                */\r
+                               static inline bool Serial_IsCharReceived(void);\r
+                       #else\r
+                               #define Serial_IsCharReceived() ((UCSR1A & (1 << RXC1)) ? true : false)\r
+                       #endif\r
+\r
+               /* Inline Functions: */\r
+                       /** Initializes the USART, ready for serial data transmission and reception. This initializes the interface to\r
+                        *  standard 8-bit, no parity, 1 stop bit settings suitable for most applications.\r
+                        *\r
+                        *  \param[in] BaudRate     Serial baud rate, in bits per second\r
+                        *  \param[in] DoubleSpeed  Enables double speed mode when set, halving the sample time to double the baud rate\r
+                        */\r
+                       static inline void Serial_Init(const uint32_t BaudRate, const bool DoubleSpeed)\r
+                       {\r
+                               UCSR1A = (DoubleSpeed ? (1 << U2X1) : 0);\r
+                               UCSR1B = ((1 << TXEN1)  | (1 << RXEN1));\r
+                               UCSR1C = ((1 << UCSZ11) | (1 << UCSZ10));\r
+                               \r
+                               DDRD  |= (1 << 3);      \r
+                               PORTD |= (1 << 2);\r
+                               \r
+                               UBRR1  = (DoubleSpeed ? SERIAL_2X_UBBRVAL(BaudRate) : SERIAL_UBBRVAL(BaudRate));\r
+                       }\r
+\r
+                       /** Turns off the USART driver, disabling and returning used hardware to their default configuration. */\r
+                       static inline void Serial_ShutDown(void)\r
+                       {\r
+                               UCSR1A = 0;\r
+                               UCSR1B = 0;\r
+                               UCSR1C = 0;\r
+                               \r
+                               DDRD  &= ~(1 << 3);     \r
+                               PORTD &= ~(1 << 2);\r
+                               \r
+                               UBRR1  = 0;\r
+                       }\r
+                       \r
+                       /** Transmits a given byte through the USART.\r
+                        *\r
+                        *  \param[in] DataByte  Byte to transmit through the USART\r
+                        */\r
+                       static inline void Serial_TxByte(const char DataByte)\r
+                       {\r
+                               while (!(UCSR1A & (1 << UDRE1)));\r
+                               UDR1 = DataByte;\r
+                       }\r
+\r
+                       /** Receives a byte from the USART.\r
+                        *\r
+                        *  \return Byte received from the USART\r
+                        */\r
+                       static inline uint8_t Serial_RxByte(void)\r
+                       {\r
+                               while (!(UCSR1A & (1 << RXC1)));\r
+                               return UDR1; \r
+                       }\r
+\r
+       /* Disable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       }\r
+               #endif\r
+               \r
+#endif\r
+\r
+/** @} */\r
diff --git a/LUFA/Drivers/Peripheral/AVR8/TWI.h b/LUFA/Drivers/Peripheral/AVR8/TWI.h
new file mode 100644 (file)
index 0000000..673f1b0
--- /dev/null
@@ -0,0 +1,146 @@
+/*\r
+             LUFA Library\r
+     Copyright (C) Dean Camera, 2010.\r
+              \r
+  dean [at] fourwalledcubicle [dot] com\r
+      www.fourwalledcubicle.com\r
+*/\r
+\r
+/*\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r
+  software without specific, written prior permission.\r
+\r
+  The author disclaim all warranties with regard to this\r
+  software, including all implied warranties of merchantability\r
+  and fitness.  In no event shall the author be liable for any\r
+  special, indirect or consequential damages or any damages\r
+  whatsoever resulting from loss of use, data or profits, whether\r
+  in an action of contract, negligence or other tortious action,\r
+  arising out of or in connection with the use or performance of\r
+  this software.\r
+*/\r
+\r
+/** \file\r
+ *\r
+ *  Master mode TWI driver for the 8-Bit AVRs containing a hardware TWI module.\r
+ *\r
+ *  \note This file should not be included directly. It is automatically included as needed by the TWI driver\r
+ *        dispatch header located in LUFA/Drivers/Peripheral/TWI.h.\r
+ */\r
+\r
+/** \ingroup Group_TWI\r
+ *  @defgroup Group_TWI_AVR8 Series U4, U6 and U7 Model TWI Driver\r
+ *\r
+ *  Master mode TWI driver for the 8-Bit AVRs containing a hardware TWI module.\r
+ *\r
+ *  \note This file should not be included directly. It is automatically included as needed by the TWI driver\r
+ *        dispatch header located in LUFA/Drivers/Peripheral/TWI.h.\r
+ *\r
+ *  @{\r
+ */\r
+\r
+#ifndef __TWI_AVR8_H__\r
+#define __TWI_AVR8_H__\r
+\r
+       /* Includes: */\r
+               #include "../../../Common/Common.h"\r
+               \r
+               #include <avr/io.h>\r
+               #include <stdbool.h>\r
+               #include <util/twi.h>\r
+               \r
+       /* Enable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       extern "C" {\r
+               #endif\r
+\r
+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_TWI_H)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/Peripheral/TWI.h instead.\r
+               #endif\r
+\r
+       /* Public Interface - May be used in end-application: */\r
+               /* Pseudo-Function Macros: */\r
+                       #if defined(__DOXYGEN__)\r
+                               /** Initializes the TWI hardware into master mode, ready for data transmission and reception. This must be\r
+                                *  before any other TWI operations.\r
+                                */\r
+                               static inline void TWI_Init(void);\r
+                               \r
+                               /** Turns off the TWI driver hardware. If this is called, any further TWI operations will require a call to\r
+                                *  \ref TWI_Init() before the TWI can be used again.\r
+                                */                             \r
+                               static inline void TWI_ShutDown(void);\r
+                       #else\r
+                               #define TWI_Init()        MACROS{ TWCR |=  (1 << TWEN); }MACROE\r
+                               #define TWI_ShutDown()    MACROS{ TWCR &= ~(1 << TWEN); }MACROE\r
+                       #endif\r
+\r
+               /* Inline Functions: */\r
+                       /** Sends a TWI STOP onto the TWI bus, terminating communication with the currently addressed device. */\r
+                       static inline void TWI_StopTransmission(void)\r
+                       {\r
+                               TWCR = ((1 << TWINT) | (1 << TWSTO) | (1 << TWEN));\r
+                       }\r
+\r
+                       /** Sends a byte to the currently addressed device on the TWI bus.\r
+                        *\r
+                        *  \param[in] Byte  Byte to send to the currently addressed device\r
+                        *\r
+                        *  \return Boolean true if the recipient ACKed the byte, false otherwise\r
+                        */\r
+                       static inline bool TWI_SendByte(uint8_t Byte)\r
+                       {\r
+                               TWDR = Byte;\r
+                               TWCR = ((1 << TWINT) | (1 << TWEN));    \r
+                               while (!(TWCR & (1 << TWINT)));\r
+\r
+                               return ((TWSR & TW_STATUS_MASK) == TW_MT_DATA_ACK);\r
+                       }\r
+\r
+                       /** Receives a byte from the currently addressed device on the TWI bus.\r
+                        *\r
+                        *  \param[in] Byte  Location where the read byte is to be stored\r
+                        *  \param[in] LastByte  Indicates if the byte should be ACKed if false, NAKed if true\r
+                        *\r
+                        *  \return Boolean true if the byte reception sucessfully completed, false otherwise\r
+                        */\r
+                       static inline bool TWI_ReceiveByte(uint8_t* Byte, bool LastByte)\r
+                       {\r
+                               uint8_t TWCRMask = ((1 << TWINT) | (1 << TWEN));\r
+                               \r
+                               if (!(LastByte))\r
+                                 TWCRMask |= (1 << TWEA);\r
+\r
+                               TWCR = TWCRMask;\r
+                               while (!(TWCR & (1 << TWINT)));\r
+                               *Byte = TWDR;\r
+\r
+                               return ((TWSR & TW_STATUS_MASK) == TW_MR_DATA_ACK);\r
+                       }\r
+\r
+               /* Function Prototypes: */\r
+                       /** Begins a master mode TWI bus communication with the given slave device address.\r
+                        *\r
+                        *  \param[in] SlaveAddress  Address of the slave TWI device to communicate with\r
+                        *\r
+                        *  \return Boolean true if the device is ready for data, false otherwise\r
+                        */\r
+                       bool TWI_StartTransmission(uint8_t SlaveAddress);\r
+\r
+       /* Disable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       }\r
+               #endif\r
+\r
+#endif\r
+\r
+/** @} */\r
diff --git a/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h b/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h
deleted file mode 100644 (file)
index 06f9d3b..0000000
+++ /dev/null
@@ -1,322 +0,0 @@
-/*\r
-             LUFA Library\r
-     Copyright (C) Dean Camera, 2010.\r
-              \r
-  dean [at] fourwalledcubicle [dot] com\r
-      www.fourwalledcubicle.com\r
-*/\r
-\r
-/*\r
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
-  Permission to use, copy, modify, distribute, and sell this \r
-  software and its documentation for any purpose is hereby granted\r
-  without fee, provided that the above copyright notice appear in \r
-  all copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting \r
-  documentation, and that the name of the author not be used in \r
-  advertising or publicity pertaining to distribution of the \r
-  software without specific, written prior permission.\r
-\r
-  The author disclaim all warranties with regard to this\r
-  software, including all implied warranties of merchantability\r
-  and fitness.  In no event shall the author be liable for any\r
-  special, indirect or consequential damages or any damages\r
-  whatsoever resulting from loss of use, data or profits, whether\r
-  in an action of contract, negligence or other tortious action,\r
-  arising out of or in connection with the use or performance of\r
-  this software.\r
-*/\r
-\r
-/** \file\r
- *\r
- *  ADC driver for the 8-Bit AVRs containing a hardware ADC module.\r
- *\r
- *  \note This file should not be included directly. It is automatically included as needed by the ADC driver\r
- *        dispatch header located in LUFA/Drivers/Peripheral/ADC.h.\r
- */\r
-\r
-/** \ingroup Group_ADC\r
- *  @defgroup Group_ADC_AVR8 8-Bit AVR ADC Driver\r
- *\r
- *  ADC driver for 8-Bit AVRs containing a hardware ADC module.\r
- *\r
- *  \note This file should not be included directly. It is automatically included as needed by the ADC driver\r
- *        dispatch header located in LUFA/Drivers/Peripheral/ADC.h.\r
- *\r
- *  @{\r
- */\r
\r
-#ifndef __ADC_AVR8_H__\r
-#define __ADC_AVR8_H__\r
-\r
-       /* Includes: */\r
-               #include "../../../Common/Common.h"\r
-               \r
-               #include <avr/io.h>\r
-               #include <stdbool.h>\r
-               \r
-       /* Enable C linkage for C++ Compilers: */\r
-               #if defined(__cplusplus)\r
-                       extern "C" {\r
-               #endif\r
-\r
-       /* Preprocessor Checks: */\r
-               #if !defined(__INCLUDE_FROM_ADC_H)\r
-                       #error Do not include this file directly. Include LUFA/Drivers/Peripheral/ADC.h instead.\r
-               #endif\r
-\r
-       /* Public Interface - May be used in end-application: */\r
-               /* Macros: */                   \r
-                       /** Reference mask, for using the voltage present at the AVR's AREF pin for the ADC reference. */\r
-                       #define  ADC_REFERENCE_AREF              0\r
-\r
-                       /** Reference mask, for using the voltage present at the AVR's AVCC pin for the ADC reference. */\r
-                       #define  ADC_REFERENCE_AVCC              (1 << REFS0)\r
-\r
-                       /** Reference mask, for using the internally generated 2.56V reference voltage as the ADC reference. */\r
-                       #define  ADC_REFERENCE_INT2560MV         ((1 << REFS1)| (1 << REFS0))\r
-                       \r
-                       /** Left-adjusts the 10-bit ADC result, so that the upper 8 bits of the value returned by the\r
-                        *  ADC_GetResult() macro contain the 8 most significant bits of the result. */\r
-                       #define  ADC_LEFT_ADJUSTED               (1 << ADLAR)\r
-\r
-                       /** Right-adjusts the 10-bit ADC result, so that the lower 8 bits of the value returned by the\r
-                        *  ADC_GetResult() macro contain the 8 least significant bits of the result. */\r
-                       #define  ADC_RIGHT_ADJUSTED              (0 << ADLAR)\r
-                       \r
-                       /** Sets the ADC mode to free running, so that conversions take place continuously as fast as the ADC\r
-                        *  is capable of at the given input clock speed. */\r
-                       #define  ADC_FREE_RUNNING                (1 << ADATE)\r
-\r
-                       /** Sets the ADC mode to single conversion, so that only a single conversion will take place before\r
-                        *  the ADC returns to idle. */\r
-                       #define  ADC_SINGLE_CONVERSION           (0 << ADATE)\r
-                       \r
-                       /** Sets the ADC input clock to prescale by a factor of 2 the AVR's system clock. */\r
-                       #define  ADC_PRESCALE_2                  (1 << ADPS0)\r
-\r
-                       /** Sets the ADC input clock to prescale by a factor of 4 the AVR's system clock. */\r
-                       #define  ADC_PRESCALE_4                  (1 << ADPS1)\r
-\r
-                       /** Sets the ADC input clock to prescale by a factor of 8 the AVR's system clock. */\r
-                       #define  ADC_PRESCALE_8                  ((1 << ADPS0) | (1 << ADPS1))\r
-\r
-                       /** Sets the ADC input clock to prescale by a factor of 16 the AVR's system clock. */\r
-                       #define  ADC_PRESCALE_16                 (1 << ADPS2)\r
-\r
-                       /** Sets the ADC input clock to prescale by a factor of 32 the AVR's system clock. */\r
-                       #define  ADC_PRESCALE_32                 ((1 << ADPS2) | (1 << ADPS0))\r
-\r
-                       /** Sets the ADC input clock to prescale by a factor of 64 the AVR's system clock. */\r
-                       #define  ADC_PRESCALE_64                 ((1 << ADPS2) | (1 << ADPS1))\r
-\r
-                       /** Sets the ADC input clock to prescale by a factor of 128 the AVR's system clock. */\r
-                       #define  ADC_PRESCALE_128                ((1 << ADPS2) | (1 << ADPS1) | (1 << ADPS0))\r
-                       \r
-                       //@{\r
-                       /** MUX mask define for the ADC0 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */\r
-                       #define  ADC_CHANNEL0                    0x00\r
-\r
-                       /** MUX mask define for the ADC1 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */\r
-                       #define  ADC_CHANNEL1                    0x01\r
-\r
-                       #if !(defined(__AVR_ATmega16U4__)  || defined(__AVR_ATmega32U4__) || defined(__DOXYGEN__))\r
-                               /** MUX mask define for the ADC2 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.\r
-                                *\r
-                                *  \note Note available on all AVR models.\r
-                                */\r
-                               #define  ADC_CHANNEL2                    0x02\r
-\r
-                               /** MUX mask define for the ADC3 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.\r
-                                *\r
-                                *  \note Note available on all AVR models.\r
-                                */\r
-                               #define  ADC_CHANNEL3                    0x03\r
-                       #endif\r
-\r
-                       /** MUX mask define for the ADC4 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */\r
-                       #define  ADC_CHANNEL4                    0x04\r
-\r
-                       /** MUX mask define for the ADC5 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */\r
-                       #define  ADC_CHANNEL5                    0x05\r
-\r
-                       /** MUX mask define for the ADC6 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */\r
-                       #define  ADC_CHANNEL6                    0x06\r
-\r
-                       /** MUX mask define for the ADC7 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */\r
-                       #define  ADC_CHANNEL7                    0x07\r
-\r
-                       /** MUX mask define for the internal 1.1V bandgap channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */\r
-                       #define  ADC_1100MV_BANDGAP              0x1E\r
-                       \r
-                       #if (defined(__AVR_ATmega16U4__)  || defined(__AVR_ATmega32U4__) || defined(__DOXYGEN__))\r
-                               /** MUX mask define for the ADC8 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.\r
-                                *\r
-                                *  \note Note available on all AVR models.\r
-                                */\r
-                               #define  ADC_CHANNEL8                0x20\r
-\r
-                               /** MUX mask define for the ADC9 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.\r
-                                *\r
-                                *  \note Note available on all AVR models.\r
-                                */\r
-                               #define  ADC_CHANNEL9                0x21\r
-\r
-                               /** MUX mask define for the ADC10 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.\r
-                                *\r
-                                *  \note Note available on all AVR models.\r
-                                */\r
-                               #define  ADC_CHANNEL10               0x22\r
-\r
-                               /** MUX mask define for the ADC11 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.\r
-                                *\r
-                                *  \note Note available on all AVR models.\r
-                                */\r
-                               #define  ADC_CHANNEL11               0x23\r
-\r
-                               /** MUX mask define for the ADC12 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.\r
-                                *\r
-                                *  \note Note available on all AVR models.\r
-                                */\r
-                               #define  ADC_CHANNEL12               0x24\r
-\r
-                               /** MUX mask define for the ADC13 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.\r
-                                *\r
-                                *  \note Note available on all AVR models.\r
-                                */\r
-                               #define  ADC_CHANNEL13               0x25\r
-\r
-                               /** MUX mask define for the internal temperature sensor channel of the ADC. See \ref ADC_StartReading and\r
-                                *  \ref ADC_GetChannelReading.\r
-                                *\r
-                                *  \note Note available on all AVR models.\r
-                                */\r
-                               #define  ADC_INT_TEMP_SENS           0x27                       \r
-                       #endif\r
-                       //@}\r
-               \r
-               /* Pseudo-Function Macros: */\r
-                       #if defined(__DOXYGEN__)\r
-                               /** Initializes the ADC, ready for conversions. This must be called before any other ADC operations.\r
-                                *  The "mode" parameter should be a mask comprised of a conversion mode (free running or single) and\r
-                                *  prescaler masks.\r
-                                *\r
-                                *  \param[in] Mode  Mask of ADC settings, including adjustment, prescale, mode and reference\r
-                                */\r
-                               static inline void ADC_Init(uint8_t Mode);\r
-\r
-                               /** Turns off the ADC. If this is called, any further ADC operations will require a call to\r
-                                *  \ref ADC_Init() before the ADC can be used again.\r
-                                */\r
-                               static inline void ADC_ShutDown(void);\r
-                               \r
-                               /** Indicates if the ADC is currently enabled.\r
-                                *\r
-                                *  \return Boolean true if the ADC subsystem is currently enabled, false otherwise.\r
-                                */\r
-                               static inline bool ADC_GetStatus(void);\r
-                               \r
-                               /** Indicates if the current ADC conversion is completed, or still in progress.\r
-                                *\r
-                                *  \return Boolean false if the reading is still taking place, or true if the conversion is\r
-                                *          complete and ready to be read out with \ref ADC_GetResult()\r
-                                */\r
-                               static inline bool ADC_IsReadingComplete(void);\r
-                               \r
-                               /** Retrieves the conversion value of the last completed ADC conversion.\r
-                                *\r
-                                *  \return The result of the last ADC conversion\r
-                                */\r
-                               static inline uint16_t ADC_GetResult(void);\r
-                       #else\r
-                               #define  ADC_Init(mode)          MACROS{ ADCSRA = ((1 << ADEN) | mode);         }MACROE\r
-\r
-                               #define  ADC_ShutDown()          MACROS{ ADCSRA = 0;                            }MACROE\r
-                               \r
-                               #define  ADC_GetStatus()               ((ADCSRA & (1 << ADEN)) ? true : false)\r
-\r
-                               #define  ADC_IsReadingComplete()        (ADCSRA & (1 << ADSC))\r
-                               \r
-                               #define  ADC_GetResult()                 ADC                    \r
-                       #endif\r
-                       \r
-               /* Inline Functions: */\r
-                       /** Configures the given ADC channel, ready for ADC conversions. This function sets the\r
-                        *  associated port pin as an input and disables the digital portion of the I/O to reduce\r
-                        *  power consumption.\r
-                        *\r
-                        *  \note This must only be called for ADC channels with are connected to a physical port\r
-                        *        pin of the AVR, denoted by its special alternative function ADCx.\r
-                        *\r
-                        *  \note The channel number must be specified as an integer, and NOT a ADC_CHANNELx mask.\r
-                        *\r
-                        *  \param[in] Channel  ADC channel number to set up for conversions\r
-                        */\r
-                       static inline void ADC_SetupChannel(const uint8_t Channel)\r
-                       {\r
-                               #if (defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB646__) || \\r
-                                        defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB647__) || \\r
-                                        defined(__AVR_ATmega32U6__))                           \r
-                               DDRF  &= ~(1 << Channel);\r
-                               DIDR0 |=  (1 << Channel);\r
-                               #elif (defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__))\r
-                               if (Channel < 8)\r
-                               {\r
-                                       DDRF  &= ~(1 << Channel);\r
-                                       DIDR0 |=  (1 << Channel);\r
-                               }\r
-                               else if (Channel == 8)\r
-                               {\r
-                                       DDRD  &= ~(1 << 4);\r
-                                       DIDR2 |=  (1 << 0);\r
-                               }\r
-                               else if (Channel < 11)\r
-                               {\r
-                                       DDRD  &= ~(1 << (Channel - 3));\r
-                                       DIDR2 |=  (1 << (Channel - 8));\r
-                               }\r
-                               else\r
-                               {\r
-                                       DDRB  &= ~(1 << (Channel - 7));\r
-                                       DIDR2 |=  (1 << (Channel - 8));\r
-                               }\r
-                               #endif\r
-                       }\r
-                       \r
-                       /** Starts the reading of the given channel, but does not wait until the conversion has completed.\r
-                        *  Once executed, the conversion status can be determined via the \ref ADC_IsReadingComplete() macro and\r
-                        *  the result read via the \ref ADC_GetResult() macro.\r
-                        *\r
-                        *  \param[in] MUXMask  Mask comprising of an ADC channel mask, reference mask and adjustment mask\r
-                        */\r
-                       static inline void ADC_StartReading(const uint8_t MUXMask)\r
-                       {\r
-                               ADMUX = MUXMask;\r
-                       \r
-                               ADCSRA |= (1 << ADSC);\r
-                       }\r
-\r
-                       /** Performs a complete single reading from channel, including a polling spin-loop to wait for the\r
-                        *  conversion to complete, and the returning of the converted value.\r
-                        *\r
-                        *  \param[in] MUXMask  Mask comprising of an ADC channel mask, reference mask and adjustment mask\r
-                        */\r
-                       static inline uint16_t ADC_GetChannelReading(const uint8_t MUXMask) ATTR_WARN_UNUSED_RESULT;\r
-                       static inline uint16_t ADC_GetChannelReading(const uint8_t MUXMask)\r
-                       {\r
-                               ADC_StartReading(MUXMask);\r
-       \r
-                               while (!(ADC_IsReadingComplete()));\r
-       \r
-                               return ADC_GetResult();\r
-                       }\r
-\r
-       /* Disable C linkage for C++ Compilers: */\r
-               #if defined(__cplusplus)\r
-                       }\r
-               #endif\r
-               \r
-#endif\r
-\r
-/** @} */\r
diff --git a/LUFA/Drivers/Peripheral/AVRU4U6U7/SPI.h b/LUFA/Drivers/Peripheral/AVRU4U6U7/SPI.h
deleted file mode 100644 (file)
index 3440cc9..0000000
+++ /dev/null
@@ -1,189 +0,0 @@
-/*\r
-             LUFA Library\r
-     Copyright (C) Dean Camera, 2010.\r
-              \r
-  dean [at] fourwalledcubicle [dot] com\r
-      www.fourwalledcubicle.com\r
-*/\r
-\r
-/*\r
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
-  Permission to use, copy, modify, distribute, and sell this \r
-  software and its documentation for any purpose is hereby granted\r
-  without fee, provided that the above copyright notice appear in \r
-  all copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting \r
-  documentation, and that the name of the author not be used in \r
-  advertising or publicity pertaining to distribution of the \r
-  software without specific, written prior permission.\r
-\r
-  The author disclaim all warranties with regard to this\r
-  software, including all implied warranties of merchantability\r
-  and fitness.  In no event shall the author be liable for any\r
-  special, indirect or consequential damages or any damages\r
-  whatsoever resulting from loss of use, data or profits, whether\r
-  in an action of contract, negligence or other tortious action,\r
-  arising out of or in connection with the use or performance of\r
-  this software.\r
-*/\r
-\r
-/** \file\r
- *\r
- *  SPI driver for the 8-bit AVRs.\r
- *\r
- *  \note This file should not be included directly. It is automatically included as needed by the SPI driver\r
- *        dispatch header located in LUFA/Drivers/Peripheral/SPI.h.\r
- */\r
\r
-/** \ingroup Group_SPI\r
- *  @defgroup Group_SPI_AVR8 8-Bit AVR SPI Driver\r
- *\r
- *  SPI driver for the 8-bit AVRs.\r
- *\r
- *  \note This file should not be included directly. It is automatically included as needed by the ADC driver\r
- *        dispatch header located in LUFA/Drivers/Peripheral/SPI.h.\r
- *\r
- *  @{\r
- */\r
-\r
-#ifndef __SPI_AVR8_H__\r
-#define __SPI_AVR8_H__\r
-\r
-       /* Includes: */\r
-               #include <stdbool.h>\r
-\r
-       /* Preprocessor Checks: */\r
-               #if !defined(__INCLUDE_FROM_SPI_H)\r
-                       #error Do not include this file directly. Include LUFA/Drivers/Peripheral/SPI.h instead.\r
-               #endif\r
-\r
-       /* Enable C linkage for C++ Compilers: */\r
-               #if defined(__cplusplus)\r
-                       extern "C" {\r
-               #endif\r
-\r
-       /* Private Interface - For use in library only: */\r
-       #if !defined(__DOXYGEN__)\r
-               /* Macros: */\r
-                       #define SPI_USE_DOUBLESPEED            (1 << SPE)\r
-       #endif\r
-       \r
-       /* Public Interface - May be used in end-application: */\r
-               /* Macros: */\r
-                       /** SPI prescaler mask for SPI_Init(). Divides the system clock by a factor of 2. */\r
-                       #define SPI_SPEED_FCPU_DIV_2           SPI_USE_DOUBLESPEED\r
-\r
-                       /** SPI prescaler mask for SPI_Init(). Divides the system clock by a factor of 4. */\r
-                       #define SPI_SPEED_FCPU_DIV_4           0\r
-\r
-                       /** SPI prescaler mask for SPI_Init(). Divides the system clock by a factor of 8. */\r
-                       #define SPI_SPEED_FCPU_DIV_8           (SPI_USE_DOUBLESPEED | (1 << SPR0))\r
-\r
-                       /** SPI prescaler mask for SPI_Init(). Divides the system clock by a factor of 16. */\r
-                       #define SPI_SPEED_FCPU_DIV_16          (1 << SPR0)\r
-\r
-                       /** SPI prescaler mask for SPI_Init(). Divides the system clock by a factor of 32. */\r
-                       #define SPI_SPEED_FCPU_DIV_32          (SPI_USE_DOUBLESPEED | (1 << SPR1))\r
-\r
-                       /** SPI prescaler mask for SPI_Init(). Divides the system clock by a factor of 64. */\r
-                       #define SPI_SPEED_FCPU_DIV_64          (SPI_USE_DOUBLESPEED | (1 << SPR1) | (1 << SPR0))\r
-\r
-                       /** SPI prescaler mask for SPI_Init(). Divides the system clock by a factor of 128. */\r
-                       #define SPI_SPEED_FCPU_DIV_128         ((1 << SPR1) | (1 << SPR0))\r
-                       \r
-                       /** SPI clock polarity mask for SPI_Init(). Indicates that the SCK should lead on the rising edge. */\r
-                       #define SPI_SCK_LEAD_RISING            (0 << CPOL)\r
-\r
-                       /** SPI clock polarity mask for SPI_Init(). Indicates that the SCK should lead on the falling edge. */\r
-                       #define SPI_SCK_LEAD_FALLING           (1 << CPOL)\r
-\r
-                       /** SPI data sample mode mask for SPI_Init(). Indicates that the data should sampled on the leading edge. */\r
-                       #define SPI_SAMPLE_LEADING             (0 << CPHA)\r
-\r
-                       /** SPI data sample mode mask for SPI_Init(). Indicates that the data should be sampled on the trailing edge. */\r
-                       #define SPI_SAMPLE_TRAILING            (1 << CPHA)\r
-                       \r
-                       /** SPI mode mask for SPI_Init(). Indicates that the SPI interface should be initialized into slave mode. */\r
-                       #define SPI_MODE_SLAVE                 (0 << MSTR)\r
-\r
-                       /** SPI mode mask for SPI_Init(). Indicates that the SPI interface should be initialized into master mode. */\r
-                       #define SPI_MODE_MASTER                (1 << MSTR)\r
-\r
-               /* Inline Functions: */\r
-                       /** Initialises the SPI subsystem, ready for transfers. Must be called before calling any other\r
-                        *  SPI routines.\r
-                        *\r
-                        *  \param[in] SPIOptions  SPI Options, a mask consisting of one of each of the SPI_SPEED_*,\r
-                        *                         SPI_SCK_*, SPI_SAMPLE_* and SPI_MODE_* masks\r
-                        */\r
-                       static inline void SPI_Init(const uint8_t SPIOptions)\r
-                       {\r
-                               DDRB  |= ((1 << 1) | (1 << 2));\r
-                               PORTB |= ((1 << 0) | (1 << 3));\r
-                               \r
-                               SPCR   = ((1 << SPE) | SPIOptions);\r
-                               \r
-                               if (SPIOptions & SPI_USE_DOUBLESPEED)\r
-                                 SPSR |= (1 << SPI2X);\r
-                               else\r
-                                 SPSR &= ~(1 << SPI2X);\r
-                       }\r
-                       \r
-                       /** Turns off the SPI driver, disabling and returning used hardware to their default configuration. */\r
-                       static inline void SPI_ShutDown(void)\r
-                       {\r
-                               DDRB  &= ~((1 << 1) | (1 << 2));\r
-                               PORTB &= ~((1 << 0) | (1 << 3));\r
-                               \r
-                               SPCR   = 0;\r
-                               SPSR   = 0;\r
-                       }\r
-                       \r
-                       /** Sends and receives a byte through the SPI interface, blocking until the transfer is complete.\r
-                        *\r
-                        *  \param[in] Byte  Byte to send through the SPI interface\r
-                        *\r
-                        *  \return Response byte from the attached SPI device\r
-                        */\r
-                       static inline uint8_t SPI_TransferByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;\r
-                       static inline uint8_t SPI_TransferByte(const uint8_t Byte)\r
-                       {\r
-                               SPDR = Byte;\r
-                               while (!(SPSR & (1 << SPIF)));\r
-                               return SPDR;\r
-                       }\r
-\r
-                       /** Sends a byte through the SPI interface, blocking until the transfer is complete. The response\r
-                        *  byte sent to from the attached SPI device is ignored.\r
-                        *\r
-                        *  \param[in] Byte Byte to send through the SPI interface\r
-                        */\r
-                       static inline void SPI_SendByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;\r
-                       static inline void SPI_SendByte(const uint8_t Byte)\r
-                       {\r
-                               SPDR = Byte;\r
-                               while (!(SPSR & (1 << SPIF)));\r
-                       }\r
-\r
-                       /** Sends a dummy byte through the SPI interface, blocking until the transfer is complete. The response\r
-                        *  byte from the attached SPI device is returned.\r
-                        *\r
-                        *  \return The response byte from the attached SPI device\r
-                        */\r
-                       static inline uint8_t SPI_ReceiveByte(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;\r
-                       static inline uint8_t SPI_ReceiveByte(void)\r
-                       {\r
-                               SPDR = 0x00;\r
-                               while (!(SPSR & (1 << SPIF)));\r
-                               return SPDR;\r
-                       }\r
-\r
-       /* Disable C linkage for C++ Compilers: */\r
-               #if defined(__cplusplus)\r
-                       }\r
-               #endif\r
-               \r
-#endif\r
-\r
-/** @} */\r
diff --git a/LUFA/Drivers/Peripheral/AVRU4U6U7/Serial.h b/LUFA/Drivers/Peripheral/AVRU4U6U7/Serial.h
deleted file mode 100644 (file)
index 0421dea..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-/*\r
-             LUFA Library\r
-     Copyright (C) Dean Camera, 2010.\r
-              \r
-  dean [at] fourwalledcubicle [dot] com\r
-      www.fourwalledcubicle.com\r
-*/\r
-\r
-/*\r
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
-  Permission to use, copy, modify, distribute, and sell this \r
-  software and its documentation for any purpose is hereby granted\r
-  without fee, provided that the above copyright notice appear in \r
-  all copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting \r
-  documentation, and that the name of the author not be used in \r
-  advertising or publicity pertaining to distribution of the \r
-  software without specific, written prior permission.\r
-\r
-  The author disclaim all warranties with regard to this\r
-  software, including all implied warranties of merchantability\r
-  and fitness.  In no event shall the author be liable for any\r
-  special, indirect or consequential damages or any damages\r
-  whatsoever resulting from loss of use, data or profits, whether\r
-  in an action of contract, negligence or other tortious action,\r
-  arising out of or in connection with the use or performance of\r
-  this software.\r
-*/\r
-\r
-/** \file\r
- *\r
- *  ADC driver for the 8-bit AVRs.\r
- *\r
- *  \note This file should not be included directly. It is automatically included as needed by the USART driver\r
- *        dispatch header located in LUFA/Drivers/Peripheral/Serial.h.\r
- */\r
\r
-/** \ingroup Group_Serial\r
- *  @defgroup Group_Serial_AVR8 8-Bit AVR Serial Driver\r
- *\r
- *  Serial driver for the 8-bit AVRs.\r
- *\r
- *  \note This file should not be included directly. It is automatically included as needed by the ADC driver\r
- *        dispatch header located in LUFA/Drivers/Peripheral/USART.h.\r
- *\r
- *  @{\r
- */\r
\r
-#ifndef __SERIAL_AVR8_H__\r
-#define __SERIAL_AVR8_H__\r
-\r
-       /* Includes: */\r
-               #include <avr/io.h>\r
-               #include <avr/pgmspace.h>\r
-               #include <stdbool.h>\r
-               \r
-       /* Preprocessor Checks: */\r
-               #if !defined(__INCLUDE_FROM_SERIAL_H)\r
-                       #error Do not include this file directly. Include LUFA/Drivers/Peripheral/Serial.h instead.\r
-               #endif\r
-\r
-       /* Public Interface - May be used in end-application: */\r
-               /* Macros: */\r
-                       /** Macro for calculating the baud value from a given baud rate when the U2X (double speed) bit is\r
-                        *  not set.\r
-                        */\r
-                       #define SERIAL_UBBRVAL(baud)    ((((F_CPU / 16) + (baud / 2)) / (baud)) - 1)\r
-\r
-                       /** Macro for calculating the baud value from a given baud rate when the U2X (double speed) bit is\r
-                        *  set.\r
-                        */\r
-                       #define SERIAL_2X_UBBRVAL(baud) ((((F_CPU / 8) + (baud / 2)) / (baud)) - 1)\r
-\r
-               /* Pseudo-Function Macros: */\r
-                       #if defined(__DOXYGEN__)\r
-                               /** Indicates whether a character has been received through the USART.\r
-                                *\r
-                                *  \return Boolean true if a character has been received, false otherwise\r
-                                */\r
-                               static inline bool Serial_IsCharReceived(void);\r
-                       #else\r
-                               #define Serial_IsCharReceived() ((UCSR1A & (1 << RXC1)) ? true : false)\r
-                       #endif\r
-\r
-               /* Inline Functions: */\r
-                       /** Initializes the USART, ready for serial data transmission and reception. This initializes the interface to\r
-                        *  standard 8-bit, no parity, 1 stop bit settings suitable for most applications.\r
-                        *\r
-                        *  \param[in] BaudRate     Serial baud rate, in bits per second\r
-                        *  \param[in] DoubleSpeed  Enables double speed mode when set, halving the sample time to double the baud rate\r
-                        */\r
-                       static inline void Serial_Init(const uint32_t BaudRate, const bool DoubleSpeed)\r
-                       {\r
-                               UCSR1A = (DoubleSpeed ? (1 << U2X1) : 0);\r
-                               UCSR1B = ((1 << TXEN1)  | (1 << RXEN1));\r
-                               UCSR1C = ((1 << UCSZ11) | (1 << UCSZ10));\r
-                               \r
-                               DDRD  |= (1 << 3);      \r
-                               PORTD |= (1 << 2);\r
-                               \r
-                               UBRR1  = (DoubleSpeed ? SERIAL_2X_UBBRVAL(BaudRate) : SERIAL_UBBRVAL(BaudRate));\r
-                       }\r
-\r
-                       /** Turns off the USART driver, disabling and returning used hardware to their default configuration. */\r
-                       static inline void Serial_ShutDown(void)\r
-                       {\r
-                               UCSR1A = 0;\r
-                               UCSR1B = 0;\r
-                               UCSR1C = 0;\r
-                               \r
-                               DDRD  &= ~(1 << 3);     \r
-                               PORTD &= ~(1 << 2);\r
-                               \r
-                               UBRR1  = 0;\r
-                       }\r
-                       \r
-                       /** Transmits a given byte through the USART.\r
-                        *\r
-                        *  \param[in] DataByte  Byte to transmit through the USART\r
-                        */\r
-                       static inline void Serial_TxByte(const char DataByte)\r
-                       {\r
-                               while (!(UCSR1A & (1 << UDRE1)));\r
-                               UDR1 = DataByte;\r
-                       }\r
-\r
-                       /** Receives a byte from the USART.\r
-                        *\r
-                        *  \return Byte received from the USART\r
-                        */\r
-                       static inline uint8_t Serial_RxByte(void)\r
-                       {\r
-                               while (!(UCSR1A & (1 << RXC1)));\r
-                               return UDR1; \r
-                       }\r
-\r
-       /* Disable C linkage for C++ Compilers: */\r
-               #if defined(__cplusplus)\r
-                       }\r
-               #endif\r
-               \r
-#endif\r
-\r
-/** @} */\r
diff --git a/LUFA/Drivers/Peripheral/AVRU4U6U7/TWI.h b/LUFA/Drivers/Peripheral/AVRU4U6U7/TWI.h
deleted file mode 100644 (file)
index 673f1b0..0000000
+++ /dev/null
@@ -1,146 +0,0 @@
-/*\r
-             LUFA Library\r
-     Copyright (C) Dean Camera, 2010.\r
-              \r
-  dean [at] fourwalledcubicle [dot] com\r
-      www.fourwalledcubicle.com\r
-*/\r
-\r
-/*\r
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
-  Permission to use, copy, modify, distribute, and sell this \r
-  software and its documentation for any purpose is hereby granted\r
-  without fee, provided that the above copyright notice appear in \r
-  all copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting \r
-  documentation, and that the name of the author not be used in \r
-  advertising or publicity pertaining to distribution of the \r
-  software without specific, written prior permission.\r
-\r
-  The author disclaim all warranties with regard to this\r
-  software, including all implied warranties of merchantability\r
-  and fitness.  In no event shall the author be liable for any\r
-  special, indirect or consequential damages or any damages\r
-  whatsoever resulting from loss of use, data or profits, whether\r
-  in an action of contract, negligence or other tortious action,\r
-  arising out of or in connection with the use or performance of\r
-  this software.\r
-*/\r
-\r
-/** \file\r
- *\r
- *  Master mode TWI driver for the 8-Bit AVRs containing a hardware TWI module.\r
- *\r
- *  \note This file should not be included directly. It is automatically included as needed by the TWI driver\r
- *        dispatch header located in LUFA/Drivers/Peripheral/TWI.h.\r
- */\r
-\r
-/** \ingroup Group_TWI\r
- *  @defgroup Group_TWI_AVR8 Series U4, U6 and U7 Model TWI Driver\r
- *\r
- *  Master mode TWI driver for the 8-Bit AVRs containing a hardware TWI module.\r
- *\r
- *  \note This file should not be included directly. It is automatically included as needed by the TWI driver\r
- *        dispatch header located in LUFA/Drivers/Peripheral/TWI.h.\r
- *\r
- *  @{\r
- */\r
-\r
-#ifndef __TWI_AVR8_H__\r
-#define __TWI_AVR8_H__\r
-\r
-       /* Includes: */\r
-               #include "../../../Common/Common.h"\r
-               \r
-               #include <avr/io.h>\r
-               #include <stdbool.h>\r
-               #include <util/twi.h>\r
-               \r
-       /* Enable C linkage for C++ Compilers: */\r
-               #if defined(__cplusplus)\r
-                       extern "C" {\r
-               #endif\r
-\r
-       /* Preprocessor Checks: */\r
-               #if !defined(__INCLUDE_FROM_TWI_H)\r
-                       #error Do not include this file directly. Include LUFA/Drivers/Peripheral/TWI.h instead.\r
-               #endif\r
-\r
-       /* Public Interface - May be used in end-application: */\r
-               /* Pseudo-Function Macros: */\r
-                       #if defined(__DOXYGEN__)\r
-                               /** Initializes the TWI hardware into master mode, ready for data transmission and reception. This must be\r
-                                *  before any other TWI operations.\r
-                                */\r
-                               static inline void TWI_Init(void);\r
-                               \r
-                               /** Turns off the TWI driver hardware. If this is called, any further TWI operations will require a call to\r
-                                *  \ref TWI_Init() before the TWI can be used again.\r
-                                */                             \r
-                               static inline void TWI_ShutDown(void);\r
-                       #else\r
-                               #define TWI_Init()        MACROS{ TWCR |=  (1 << TWEN); }MACROE\r
-                               #define TWI_ShutDown()    MACROS{ TWCR &= ~(1 << TWEN); }MACROE\r
-                       #endif\r
-\r
-               /* Inline Functions: */\r
-                       /** Sends a TWI STOP onto the TWI bus, terminating communication with the currently addressed device. */\r
-                       static inline void TWI_StopTransmission(void)\r
-                       {\r
-                               TWCR = ((1 << TWINT) | (1 << TWSTO) | (1 << TWEN));\r
-                       }\r
-\r
-                       /** Sends a byte to the currently addressed device on the TWI bus.\r
-                        *\r
-                        *  \param[in] Byte  Byte to send to the currently addressed device\r
-                        *\r
-                        *  \return Boolean true if the recipient ACKed the byte, false otherwise\r
-                        */\r
-                       static inline bool TWI_SendByte(uint8_t Byte)\r
-                       {\r
-                               TWDR = Byte;\r
-                               TWCR = ((1 << TWINT) | (1 << TWEN));    \r
-                               while (!(TWCR & (1 << TWINT)));\r
-\r
-                               return ((TWSR & TW_STATUS_MASK) == TW_MT_DATA_ACK);\r
-                       }\r
-\r
-                       /** Receives a byte from the currently addressed device on the TWI bus.\r
-                        *\r
-                        *  \param[in] Byte  Location where the read byte is to be stored\r
-                        *  \param[in] LastByte  Indicates if the byte should be ACKed if false, NAKed if true\r
-                        *\r
-                        *  \return Boolean true if the byte reception sucessfully completed, false otherwise\r
-                        */\r
-                       static inline bool TWI_ReceiveByte(uint8_t* Byte, bool LastByte)\r
-                       {\r
-                               uint8_t TWCRMask = ((1 << TWINT) | (1 << TWEN));\r
-                               \r
-                               if (!(LastByte))\r
-                                 TWCRMask |= (1 << TWEA);\r
-\r
-                               TWCR = TWCRMask;\r
-                               while (!(TWCR & (1 << TWINT)));\r
-                               *Byte = TWDR;\r
-\r
-                               return ((TWSR & TW_STATUS_MASK) == TW_MR_DATA_ACK);\r
-                       }\r
-\r
-               /* Function Prototypes: */\r
-                       /** Begins a master mode TWI bus communication with the given slave device address.\r
-                        *\r
-                        *  \param[in] SlaveAddress  Address of the slave TWI device to communicate with\r
-                        *\r
-                        *  \return Boolean true if the device is ready for data, false otherwise\r
-                        */\r
-                       bool TWI_StartTransmission(uint8_t SlaveAddress);\r
-\r
-       /* Disable C linkage for C++ Compilers: */\r
-               #if defined(__cplusplus)\r
-                       }\r
-               #endif\r
-\r
-#endif\r
-\r
-/** @} */\r
index cd2b423..aac3d95 100644 (file)
@@ -62,7 +62,7 @@
                #if defined(__AVR32__)\r
                        #include "AVR32/SPI.h"\r
                #else\r
                #if defined(__AVR32__)\r
                        #include "AVR32/SPI.h"\r
                #else\r
-                       #include "AVRU4U6U7/SPI.h"              \r
+                       #include "AVR8/SPI.h"           \r
                #endif\r
                \r
 #endif\r
                #endif\r
                \r
 #endif\r
index 51600f4..a2e06fa 100644 (file)
@@ -63,7 +63,7 @@
                #if defined(__AVR32__)\r
                        #include "AVR32/Serial.h"\r
                #else\r
                #if defined(__AVR32__)\r
                        #include "AVR32/Serial.h"\r
                #else\r
-                       #include "AVRU4U6U7/Serial.h"           \r
+                       #include "AVR8/Serial.h"                \r
                #endif\r
                \r
                #include "../../Common/Common.h"\r
                #endif\r
                \r
                #include "../../Common/Common.h"\r
index 29c0afe..fbb95e4 100644 (file)
@@ -61,7 +61,7 @@
                     defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB647__) || \\r
                         defined(__AVR_ATmega16U4__)  || defined(__AVR_ATmega32U4__) || \\r
                         defined(__AVR_ATmega32U6__))\r
                     defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB647__) || \\r
                         defined(__AVR_ATmega16U4__)  || defined(__AVR_ATmega32U4__) || \\r
                         defined(__AVR_ATmega32U6__))\r
-                       #include "AVRU4U6U7/TWI.h"\r
+                       #include "AVR8/TWI.h"\r
                #else\r
                        #error "TWI is not available for the currently selected AVR model."\r
                #endif\r
                #else\r
                        #error "TWI is not available for the currently selected AVR model."\r
                #endif\r