Alter the ring buffer library headers to have both atomic and non-atomic insertion...

[pub/USBasp.git] / LUFA / Drivers / USB / LowLevel / DevChapter9.h

diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.h b/LUFA/Drivers/USB/LowLevel/DevChapter9.h
index 7bafcbf..ab62c53 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.h
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.h
@@ -31,7 +31,7 @@
 /** \file
  *  \brief USB device standard request management.
  *
 /** \file
  *  \brief USB device standard request management.
  *

- *  This file contains the function prototypes neccesary for the processing of incomming standard control requests
+ *  This file contains the function prototypes necessary for the processing of incoming standard control requests

  *  when the library is in USB device mode.
  *
  *  \note This file should not be included directly. It is automatically included as needed by the USB driver
  *  when the library is in USB device mode.
  *
  *  \note This file should not be included directly. It is automatically included as needed by the USB driver


@@ -80,9 +80,9 @@
                                 */
                                enum USB_DescriptorMemorySpaces_t
                                {
                                 */
                                enum USB_DescriptorMemorySpaces_t
                                {

-                                       MEMSPACE_FLASH    = 0, /**< Indicates the requested descriptor is located in FLASH memory */
-                                       MEMSPACE_EEPROM   = 1, /**< Indicates the requested descriptor is located in EEPROM memory */
-                                       MEMSPACE_RAM      = 2, /**< Indicates the requested descriptor is located in RAM memory */
+                                       MEMSPACE_FLASH    = 0, /**< Indicates the requested descriptor is located in FLASH memory. */
+                                       MEMSPACE_EEPROM   = 1, /**< Indicates the requested descriptor is located in EEPROM memory. */
+                                       MEMSPACE_RAM      = 2, /**< Indicates the requested descriptor is located in RAM memory. */

                                };
                        #endif
        
                                };
                        #endif
        


@@ -149,7 +149,7 @@
                                static void USB_Device_GetStatus(void);
                                static void USB_Device_ClearSetFeature(void);
                                
                                static void USB_Device_GetStatus(void);
                                static void USB_Device_ClearSetFeature(void);
                                

-                               #if !defined(NO_INTERNAL_SERIAL) && (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))
+                               #if !defined(NO_INTERNAL_SERIAL) && (USE_INTERNAL_SERIAL != NO_DESCRIPTOR)

                                        static char USB_Device_NibbleToASCII(uint8_t Nibble) ATTR_ALWAYS_INLINE;
                                        static void USB_Device_GetInternalSerialDescriptor(void);
                                #endif                          
                                        static char USB_Device_NibbleToASCII(uint8_t Nibble) ATTR_ALWAYS_INLINE;
                                        static void USB_Device_GetInternalSerialDescriptor(void);
                                #endif