Update FatFS library copies to the latest R0.09a version.

[pub/USBasp.git] / LUFA / Drivers / USB / Core / USBMode.h

diff --git a/LUFA/Drivers/USB/Core/USBMode.h b/LUFA/Drivers/USB/Core/USBMode.h
index 7ae30bb..5de57ff 100644 (file)
--- a/LUFA/Drivers/USB/Core/USBMode.h
+++ b/LUFA/Drivers/USB/Core/USBMode.h
@@ -244,34 +244,28 @@
                                #define USB_CAN_BE_DEVICE
                        #endif
 
                                #define USB_CAN_BE_DEVICE
                        #endif
 

-                       #if (defined(USB_CAN_BE_DEVICE) && defined(USB_CAN_BE_HOST))
-                               #define USB_CAN_BE_BOTH
-                       #endif
-
-                       #if defined(USB_HOST_ONLY)
+                       #if (defined(USB_HOST_ONLY) && defined(USB_DEVICE_ONLY))
+                               #error USB_HOST_ONLY and USB_DEVICE_ONLY are mutually exclusive.
+                       #elif defined(USB_HOST_ONLY)

                                #if !defined(USB_CAN_BE_HOST)
                                        #error USB_HOST_ONLY is not available for the currently selected microcontroller model.
                                #else
                                        #undef USB_CAN_BE_DEVICE
                                #if !defined(USB_CAN_BE_HOST)
                                        #error USB_HOST_ONLY is not available for the currently selected microcontroller model.
                                #else
                                        #undef USB_CAN_BE_DEVICE

-                                       #undef USB_CAN_BE_BOTH

                                #endif
                                #endif

-                       #endif
-
-                       #if defined(USB_DEVICE_ONLY)
+                       #elif defined(USB_DEVICE_ONLY)

                                #if !defined(USB_CAN_BE_DEVICE)
                                        #error USB_DEVICE_ONLY is not available for the currently selected microcontroller model.
                                #else
                                        #undef USB_CAN_BE_HOST
                                #if !defined(USB_CAN_BE_DEVICE)
                                        #error USB_DEVICE_ONLY is not available for the currently selected microcontroller model.
                                #else
                                        #undef USB_CAN_BE_HOST

-                                       #undef USB_CAN_BE_BOTH

                                #endif
                        #endif
 
                                #endif
                        #endif
 

-                       #if (defined(USB_HOST_ONLY) && defined(USB_DEVICE_ONLY))
-                               #error USB_HOST_ONLY and USB_DEVICE_ONLY are mutually exclusive.
+                       #if (defined(USB_CAN_BE_DEVICE) && defined(USB_CAN_BE_HOST))
+                               #define USB_CAN_BE_BOTH

                        #endif
 
                        #if (!defined(USB_CAN_BE_DEVICE) && !defined(USB_CAN_BE_HOST))
                        #endif
 
                        #if (!defined(USB_CAN_BE_DEVICE) && !defined(USB_CAN_BE_HOST))

-                               #error The currently selected device or architecture is not supported under the USB component of the library.
+                               #error The currently selected device, USB mode or architecture is not supported.

                        #endif
        #endif
 
                        #endif
        #endif