forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More updates to remove architecture-specific comments from the documentation, alter USBMode.h preprocessor logic to support future architectures more easily.

Browse Source
pull/1469/head
Dean Camera 14 years ago
parent 28a1ee29a1
commit f3ec62b5c6
20 changed files with 62 additions and 54 deletions
Show Stats Download Patch File Download Diff File

2
LUFA/CodeTemplates/DriverStubs/Dataflash.h
Unescape View File

@ -80,7 +80,7 @@
/* Inline Functions: */ /* Inline Functions: */
/** Initialises the dataflash driver so that commands and data may be sent to an attached dataflash IC. /** Initialises the dataflash driver so that commands and data may be sent to an attached dataflash IC.
* The AVR's SPI driver MUST be initialized before any of the dataflash commands are used. * The microcontroller's SPI driver MUST be initialized before any of the dataflash commands are used.
*/ */
static inline void Dataflash_Init(void) static inline void Dataflash_Init(void)
{ {

3
LUFA/CodeTemplates/DriverStubs/Joystick.h
Unescape View File

@ -36,8 +36,7 @@
inside the application's folder. inside the application's folder.
This stub is for the board-specific component of the LUFA Joystick This stub is for the board-specific component of the LUFA Joystick
driver, a small surface mount four-way (plus button) digital joystick driver, for a digital four-way (plus button) joystick.
on most USB AVR boards.
*/ */
#ifndef __JOYSTICK_USER_H__ #ifndef __JOYSTICK_USER_H__

2
LUFA/CodeTemplates/DriverStubs/LEDs.h
Unescape View File

@ -36,7 +36,7 @@
inside the application's folder. inside the application's folder.
This stub is for the board-specific component of the LUFA LEDs driver, This stub is for the board-specific component of the LUFA LEDs driver,
for the LEDs (up to four) mounted on most USB AVR boards. for the LEDs (up to four) mounted on most development boards.
*/ */
#ifndef __LEDS_USER_H__ #ifndef __LEDS_USER_H__

4
LUFA/Common/Attributes.h
Unescape View File

@ -29,7 +29,7 @@
*/ */
/** \file /** \file
* \brief AVR-GCC special function/variable attribute macros. * \brief GCC special function/variable attribute macros.
* *
* \copydetails Group_GCCAttributes * \copydetails Group_GCCAttributes
* *
@ -39,7 +39,7 @@
/** \ingroup Group_Common /** \ingroup Group_Common
* \defgroup Group_GCCAttributes Function/Variable Attributes * \defgroup Group_GCCAttributes Function/Variable Attributes
* \brief AVR-GCC special function/variable attribute macros. * \brief GCC special function/variable attribute macros.
* *
* This module contains macros for applying GCC specific attributes to functions and variables to control various * This module contains macros for applying GCC specific attributes to functions and variables to control various
* optimiser and code generation features of the compiler. Attributes may be placed in the function prototype * optimiser and code generation features of the compiler. Attributes may be placed in the function prototype

15
LUFA/Common/Common.h
Unescape View File

@ -144,10 +144,11 @@
#define JTAG_DEBUG_BREAK() __asm__ __volatile__ ("BREAK" ::) #define JTAG_DEBUG_BREAK() __asm__ __volatile__ ("BREAK" ::)
#if !defined(pgm_read_ptr) || defined(__DOXYGEN__) #if !defined(pgm_read_ptr) || defined(__DOXYGEN__)
/** Reads a pointer out of PROGMEM space. This is currently a wrapper for the avr-libc \c pgm_read_ptr() /** Reads a pointer out of PROGMEM space on the AVR8 architecture. This is currently a wrapper for the
* macro with a \c void* cast, so that its value can be assigned directly to a pointer variable or used * avr-libc \c pgm_read_ptr() macro with a \c void* cast, so that its value can be assigned directly
* in pointer arithmetic without further casting in C. In a future avr-libc distribution this will be * to a pointer variable or used in pointer arithmetic without further casting in C. In a future
* part of the standard API and will be implemented in a more formal manner. * avr-libc distribution this will be part of the standard API and will be implemented in a more formal
* manner.
* *
* \param[in] Addr Address of the pointer to read. * \param[in] Addr Address of the pointer to read.
* *
@ -165,8 +166,8 @@
#define JTAG_DEBUG_ASSERT(Condition) MACROS{ if (!(Condition)) { JTAG_DEBUG_BREAK(); } }MACROE #define JTAG_DEBUG_ASSERT(Condition) MACROS{ if (!(Condition)) { JTAG_DEBUG_BREAK(); } }MACROE
/** Macro for testing condition "x" and writing debug data to the stdout stream if \c false. The stdout stream /** Macro for testing condition "x" and writing debug data to the stdout stream if \c false. The stdout stream
* must be pre-initialized before this macro is run and linked to an output device, such as the AVR's USART * must be pre-initialized before this macro is run and linked to an output device, such as the microcontroller's
* peripheral. * USART peripheral.
* *
* The output takes the form "{FILENAME}: Function {FUNCTION NAME}, Line {LINE NUMBER}: Assertion {Condition} failed." * The output takes the form "{FILENAME}: Function {FUNCTION NAME}, Line {LINE NUMBER}: Assertion {Condition} failed."
* *
@ -179,7 +180,7 @@
__FILE__, __func__, __LINE__, #Condition); } }MACROE __FILE__, __func__, __LINE__, #Condition); } }MACROE
#endif #endif
/** Forces GCC to use pointer indirection (via the AVR's pointer register pairs) when accessing the given /** Forces GCC to use pointer indirection (via the device's pointer register pairs) when accessing the given
* struct pointer. In some cases GCC will emit non-optimal assembly code when accessing a structure through * struct pointer. In some cases GCC will emit non-optimal assembly code when accessing a structure through
* a pointer, resulting in a larger binary. When this macro is used on a (non \c const) structure pointer before * a pointer, resulting in a larger binary. When this macro is used on a (non \c const) structure pointer before
* use, it will force GCC to use pointer indirection on the elements rather than direct store and load * use, it will force GCC to use pointer indirection on the elements rather than direct store and load

2
LUFA/Drivers/Board/Dataflash.h
Unescape View File

@ -151,7 +151,7 @@
/* Inline Functions: */ /* Inline Functions: */
/** Initialises the dataflash driver so that commands and data may be sent to an attached dataflash IC. /** Initialises the dataflash driver so that commands and data may be sent to an attached dataflash IC.
* *
* \note The AVR's SPI driver must be initialized before any of the dataflash commands are used. * \note The microcontroller's SPI driver must be initialized before any of the dataflash commands are used.
*/ */
static inline void Dataflash_Init(void); static inline void Dataflash_Init(void);

2
LUFA/Drivers/Board/EVK527/Dataflash.h
Unescape View File

@ -83,7 +83,7 @@
/* Inline Functions: */ /* Inline Functions: */
/** Initialises the dataflash driver so that commands and data may be sent to an attached dataflash IC. /** Initialises the dataflash driver so that commands and data may be sent to an attached dataflash IC.
* The AVR's SPI driver MUST be initialized before any of the dataflash commands are used. * The microcontroller's SPI driver MUST be initialized before any of the dataflash commands are used.
*/ */
static inline void Dataflash_Init(void) static inline void Dataflash_Init(void)
{ {

2
LUFA/Drivers/Board/STK525/Dataflash.h
Unescape View File

@ -83,7 +83,7 @@
/* Inline Functions: */ /* Inline Functions: */
/** Initialises the dataflash driver so that commands and data may be sent to an attached dataflash IC. /** Initialises the dataflash driver so that commands and data may be sent to an attached dataflash IC.
* The AVR's SPI driver MUST be initialized before any of the dataflash commands are used. * The microcontroller's SPI driver MUST be initialized before any of the dataflash commands are used.
*/ */
static inline void Dataflash_Init(void) static inline void Dataflash_Init(void)
{ {

2
LUFA/Drivers/Board/STK526/Dataflash.h
Unescape View File

@ -83,7 +83,7 @@
/* Inline Functions: */ /* Inline Functions: */
/** Initialises the dataflash driver so that commands and data may be sent to an attached dataflash IC. /** Initialises the dataflash driver so that commands and data may be sent to an attached dataflash IC.
* The AVR's SPI driver MUST be initialized before any of the dataflash commands are used. * The microcontroller's SPI driver MUST be initialized before any of the dataflash commands are used.
*/ */
static inline void Dataflash_Init(void) static inline void Dataflash_Init(void)
{ {

2
LUFA/Drivers/Board/USBKEY/Dataflash.h
Unescape View File

@ -86,7 +86,7 @@
/* Inline Functions: */ /* Inline Functions: */
/** Initialises the dataflash driver so that commands and data may be sent to an attached dataflash IC. /** Initialises the dataflash driver so that commands and data may be sent to an attached dataflash IC.
* The AVR's SPI driver MUST be initialized before any of the dataflash commands are used. * The microcontroller's SPI driver MUST be initialized before any of the dataflash commands are used.
*/ */
static inline void Dataflash_Init(void) static inline void Dataflash_Init(void)
{ {

2
LUFA/Drivers/Board/XPLAIN/Dataflash.h
Unescape View File

@ -89,7 +89,7 @@
/* Inline Functions: */ /* Inline Functions: */
/** Initialises the dataflash driver so that commands and data may be sent to an attached dataflash IC. /** Initialises the dataflash driver so that commands and data may be sent to an attached dataflash IC.
* The AVR's SPI driver MUST be initialized before any of the dataflash commands are used. * The microcontroller's SPI driver MUST be initialized before any of the dataflash commands are used.
*/ */
static inline void Dataflash_Init(void) static inline void Dataflash_Init(void)
{ {

2
LUFA/Drivers/USB/Class/Device/CDC.h
Unescape View File

@ -295,7 +295,7 @@
void CDC_Device_SendControlLineStateChange(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1); void CDC_Device_SendControlLineStateChange(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
/** Creates a standard character stream for the given CDC Device instance so that it can be used with all the regular /** Creates a standard character stream for the given CDC Device instance so that it can be used with all the regular
* functions in the avr-libc <stdio.h> library that accept a \c FILE stream as a destination (e.g. \c fprintf). The created * functions in the standard <stdio.h> library that accept a \c FILE stream as a destination (e.g. \c fprintf). The created
* stream is bidirectional and can be used for both input and output functions. * stream is bidirectional and can be used for both input and output functions.
* *
* Reading data from this stream is non-blocking, i.e. in most instances, complete strings cannot be read in by a single * Reading data from this stream is non-blocking, i.e. in most instances, complete strings cannot be read in by a single

2
LUFA/Drivers/USB/Class/Host/CDC.h
Unescape View File

@ -285,7 +285,7 @@
uint8_t CDC_Host_Flush(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1); uint8_t CDC_Host_Flush(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
/** Creates a standard character stream for the given CDC Device instance so that it can be used with all the regular /** Creates a standard character stream for the given CDC Device instance so that it can be used with all the regular
* functions in the avr-libc \c <stdio.h> library that accept a \c FILE stream as a destination (e.g. \c fprintf). The created * functions in the standard \c <stdio.h> library that accept a \c FILE stream as a destination (e.g. \c fprintf). The created
* stream is bidirectional and can be used for both input and output functions. * stream is bidirectional and can be used for both input and output functions.
* *
* Reading data from this stream is non-blocking, i.e. in most instances, complete strings cannot be read in by a single * Reading data from this stream is non-blocking, i.e. in most instances, complete strings cannot be read in by a single

2
LUFA/Drivers/USB/Core/Events.h
Unescape View File

@ -183,7 +183,7 @@
* This event is time-critical; exceeding OS-specific delays within this event handler (typically of around * This event is time-critical; exceeding OS-specific delays within this event handler (typically of around
* two seconds) will prevent the device from enumerating correctly. * two seconds) will prevent the device from enumerating correctly.
* *
* \note For the smaller series 2 USB AVRs with limited USB controllers, VBUS is not available to the USB controller. * \note For the microcontrollers with limited USB controller functionality, VBUS sensing is not available.
* this means that the current connection state is derived from the bus suspension and wake up events by default, * this means that the current connection state is derived from the bus suspension and wake up events by default,
* which is not always accurate (host may suspend the bus while still connected). If the actual connection state * which is not always accurate (host may suspend the bus while still connected). If the actual connection state
* needs to be determined, VBUS should be routed to an external pin, and the auto-detect behaviour turned off by * needs to be determined, VBUS should be routed to an external pin, and the auto-detect behaviour turned off by

4
LUFA/Drivers/USB/Core/StdDescriptors.h
Unescape View File

@ -303,7 +303,7 @@
uint8_t SerialNumStrIndex; /**< String index for the product's globally unique hexadecimal uint8_t SerialNumStrIndex; /**< String index for the product's globally unique hexadecimal
* serial number, in uppercase Unicode ASCII. * serial number, in uppercase Unicode ASCII.
* *
* \note On some AVR models, there is an embedded serial number * \note On some microcontroller models, there is an embedded serial number
* in the chip which can be used for the device serial number. * in the chip which can be used for the device serial number.
* To use this serial number, set this to USE_INTERNAL_SERIAL. * To use this serial number, set this to USE_INTERNAL_SERIAL.
* On unsupported devices, this will evaluate to 0 and will cause * On unsupported devices, this will evaluate to 0 and will cause
@ -351,7 +351,7 @@
uint8_t iSerialNumber; /**< String index for the product's globally unique hexadecimal uint8_t iSerialNumber; /**< String index for the product's globally unique hexadecimal
* serial number, in uppercase Unicode ASCII. * serial number, in uppercase Unicode ASCII.
* *
* \note On some AVR models, there is an embedded serial number * \note On some microcontroller models, there is an embedded serial number
* in the chip which can be used for the device serial number. * in the chip which can be used for the device serial number.
* To use this serial number, set this to USE_INTERNAL_SERIAL. * To use this serial number, set this to USE_INTERNAL_SERIAL.
* On unsupported devices, this will evaluate to 0 and will cause * On unsupported devices, this will evaluate to 0 and will cause

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

@ -82,17 +82,17 @@
*/ */
#define USB_SERIES_7_AVR #define USB_SERIES_7_AVR
/** Indicates that the target AVR microcontroller and compilation settings allow for the /** Indicates that the target microcontroller and compilation settings allow for the
* target to be configured in USB Device mode when defined. * target to be configured in USB Device mode when defined.
*/ */
#define USB_CAN_BE_DEVICE #define USB_CAN_BE_DEVICE
/** Indicates that the target AVR microcontroller and compilation settings allow for the /** Indicates that the target microcontroller and compilation settings allow for the
* target to be configured in USB Host mode when defined. * target to be configured in USB Host mode when defined.
*/ */
#define USB_CAN_BE_HOST #define USB_CAN_BE_HOST
/** Indicates that the target AVR microcontroller and compilation settings allow for the /** Indicates that the target microcontroller and compilation settings allow for the
* target to be configured in either USB Device or Host mode when defined. * target to be configured in either USB Device or Host mode when defined.
*/ */
#define USB_CAN_BE_BOTH #define USB_CAN_BE_BOTH
@ -101,37 +101,48 @@
#if (defined(__AVR_AT90USB162__) || defined(__AVR_AT90USB82__) || \ #if (defined(__AVR_AT90USB162__) || defined(__AVR_AT90USB82__) || \
defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega8U2__)) defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega8U2__))
#define USB_SERIES_2_AVR #define USB_SERIES_2_AVR
#define USB_CAN_BE_DEVICE
#elif (defined(__AVR_ATmega32U4__) || defined(__AVR_ATmega16U4__)) #elif (defined(__AVR_ATmega32U4__) || defined(__AVR_ATmega16U4__))
#define USB_SERIES_4_AVR #define USB_SERIES_4_AVR
#define USB_CAN_BE_DEVICE
#elif (defined(__AVR_ATmega32U6__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB1286__)) #elif (defined(__AVR_ATmega32U6__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB1286__))
#define USB_SERIES_6_AVR #define USB_SERIES_6_AVR
#define USB_CAN_BE_DEVICE
#elif (defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1287__)) #elif (defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1287__))
#define USB_SERIES_7_AVR #define USB_SERIES_7_AVR
#define USB_CAN_BE_DEVICE
#define USB_CAN_BE_HOST
#endif
#if (defined(USB_CAN_BE_DEVICE) && defined(USB_CAN_BE_HOST))
#define USB_CAN_BE_BOTH
#endif #endif
#if !defined(USB_SERIES_7_AVR) #if defined(USB_HOST_ONLY)
#if defined(USB_HOST_ONLY) #if !defined(USB_CAN_BE_HOST)
#error USB_HOST_ONLY is not available for the currently selected USB AVR model. #error USB_HOST_ONLY is not available for the currently selected microcontroller model.
#endif #else
#undef USB_CAN_BE_DEVICE
#if !defined(USB_DEVICE_ONLY) #undef USB_CAN_BE_BOTH
#define USB_DEVICE_ONLY
#endif #endif
#endif #endif
#if (!defined(USB_DEVICE_ONLY) && !defined(USB_HOST_ONLY)) #if defined(USB_DEVICE_ONLY)
#define USB_CAN_BE_BOTH #if !defined(USB_CAN_BE_DEVICE)
#define USB_CAN_BE_HOST #error USB_DEVICE_ONLY is not available for the currently selected microcontroller model.
#define USB_CAN_BE_DEVICE #else
#elif defined(USB_HOST_ONLY) #undef USB_CAN_BE_HOST
#define USB_CAN_BE_HOST #undef USB_CAN_BE_BOTH
#elif defined(USB_DEVICE_ONLY) #endif
#define USB_CAN_BE_DEVICE
#endif #endif
#if (defined(USB_HOST_ONLY) && defined(USB_DEVICE_ONLY)) #if (defined(USB_HOST_ONLY) && defined(USB_DEVICE_ONLY))
#error USB_HOST_ONLY and USB_DEVICE_ONLY are mutually exclusive. #error USB_HOST_ONLY and USB_DEVICE_ONLY are mutually exclusive.
#endif #endif
#if (!defined(USB_CAN_BE_DEVICE) && !defined(USB_CAN_BE_HOST))
#error The currently selected architecture is not supported under the USB component of the library.
#endif
#endif #endif
#endif #endif

8
LUFA/Drivers/USB/Core/USBTask.h
Unescape View File

@ -98,8 +98,8 @@
* the library internally. * the library internally.
* *
* To reduce program size and speed up checks of this global on the AVR8 architecture, it can be * To reduce program size and speed up checks of this global on the AVR8 architecture, it can be
* placed into one of the AVR's GPIOR hardware registers instead of RAM by defining the * placed into one of the AVR's \c GPIOR hardware registers instead of RAM by defining the
* HOST_STATE_AS_GPIOR token to a value between 0 and 2 in the project makefile and passing it to * \c HOST_STATE_AS_GPIOR token to a value between 0 and 2 in the project makefile and passing it to
* the compiler via the -D switch. When defined, the corresponding GPIOR register should not be used * the compiler via the -D switch. When defined, the corresponding GPIOR register should not be used
* in the user application except implicitly via the library APIs. * in the user application except implicitly via the library APIs.
* *
@ -127,8 +127,8 @@
* (see \ref EVENT_USB_Device_Connect() and \ref EVENT_USB_Device_Disconnect() events). * (see \ref EVENT_USB_Device_Connect() and \ref EVENT_USB_Device_Disconnect() events).
* *
* To reduce program size and speed up checks of this global on the AVR8 architecture, it can be * To reduce program size and speed up checks of this global on the AVR8 architecture, it can be
* placed into one of the AVR's GPIOR hardware registers instead of RAM by defining the * placed into one of the AVR's \c GPIOR hardware registers instead of RAM by defining the
* DEVICE_STATE_AS_GPIOR token to a value between 0 and 2 in the project makefile and passing it to * \c DEVICE_STATE_AS_GPIOR token to a value between 0 and 2 in the project makefile and passing it to
* the compiler via the -D switch. When defined, the corresponding GPIOR register should not be used * the compiler via the -D switch. When defined, the corresponding GPIOR register should not be used
* in the user application except implicitly via the library APIs. * in the user application except implicitly via the library APIs.
* *

5
LUFA/Drivers/USB/USB.h
Unescape View File

@ -364,11 +364,6 @@
#include "../../Common/Common.h" #include "../../Common/Common.h"
#include "Core/USBMode.h" #include "Core/USBMode.h"
/* Preprocessor Checks: */
#if (!defined(USB_CAN_BE_DEVICE) && !defined(USB_CAN_BE_HOST))
#error The currently selected architecture is not supported under the USB component of the library.
#endif
/* Includes: */ /* Includes: */
#include "Core/USBTask.h" #include "Core/USBTask.h"
#include "Core/Events.h" #include "Core/Events.h"

5
LUFA/ManPages/DeviceSupport.txt
Unescape View File

@ -7,7 +7,9 @@
/** /**
* \page Page_DeviceSupport Device and Hardware Support * \page Page_DeviceSupport Device and Hardware Support
* *
* Currently supported AVR models: * \section Sec_AVR8_Support Atmel 8-Bit AVR (AVR8)
*
* Currently supported AVR8 models:
* - AT90USB82 (USB Device Only) * - AT90USB82 (USB Device Only)
* - ATMEGA8U2 (USB Device Only) * - ATMEGA8U2 (USB Device Only)
* - AT90USB162 (USB Device Only) * - AT90USB162 (USB Device Only)
@ -44,6 +46,7 @@
* - Minimus USB * - Minimus USB
* - Olimex AVR-USB-162 * - Olimex AVR-USB-162
* - PJRC Teensy (all revisions and versions) * - PJRC Teensy (all revisions and versions)
* - Sparkfun U2 Breakout Board
* - TCNISO Blackcat USB JTAG * - TCNISO Blackcat USB JTAG
* - Tempusdictum Benito * - Tempusdictum Benito
* - Tom's USBTINY-MKII (all revisions and versions) * - Tom's USBTINY-MKII (all revisions and versions)

1
LUFA/ManPages/FutureChanges.txt
Unescape View File

@ -18,7 +18,6 @@
* -# Change makefiles to allow for absolute LUFA location to be used * -# Change makefiles to allow for absolute LUFA location to be used
* -# Re-add interrupt Pipe/Endpoint support * -# Re-add interrupt Pipe/Endpoint support
* -# Investigate dynamically created device descriptors * -# Investigate dynamically created device descriptors
* -# Re-add in software PDI/TPI support into the AVRISP-MKII project
* -# Add makefile includes to reduce boilerplate in user makefiles * -# Add makefile includes to reduce boilerplate in user makefiles
* - Documentation/Support * - Documentation/Support
* -# Add detailed overviews of how each demo works * -# Add detailed overviews of how each demo works

Write Preview
Loading…
Cancel
Save