Add missing preprocessor logic to the USBKEY board Dataflash driver so that DATAFLASH...
authorDean Camera <dean@fourwalledcubicle.com>
Fri, 21 Sep 2012 21:16:50 +0000 (21:16 +0000)
committerDean Camera <dean@fourwalledcubicle.com>
Fri, 21 Sep 2012 21:16:50 +0000 (21:16 +0000)
LUFA/Drivers/Board/AVR8/USBKEY/Dataflash.h

index f3cb45d..2610736 100644 (file)
                                if (PageAddress >= (DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS))
                                  return;
 
-                               if (PageAddress & 0x01)
-                                 Dataflash_SelectChip(DATAFLASH_CHIP2);
-                               else
-                                 Dataflash_SelectChip(DATAFLASH_CHIP1);
+                               #if (DATAFLASH_TOTALCHIPS == 2)
+                                       if (PageAddress & 0x01)
+                                         Dataflash_SelectChip(DATAFLASH_CHIP2);
+                                       else
+                                         Dataflash_SelectChip(DATAFLASH_CHIP1);
+                               #else
+                                       Dataflash_SelectChip(DATAFLASH_CHIP1);
+                               #endif
                        }
 
                        /** Toggles the select line of the currently selected dataflash IC, so that it is ready to receive
                        static inline void Dataflash_SendAddressBytes(uint16_t PageAddress,
                                                                      const uint16_t BufferByte)
                        {
-                               PageAddress >>= 1;
-
+                               #if (DATAFLASH_TOTALCHIPS == 2)
+                                       PageAddress >>= 1;
+                               #endif
+                               
                                Dataflash_SendByte(PageAddress >> 5);
                                Dataflash_SendByte((PageAddress << 3) | (BufferByte >> 8));
                                Dataflash_SendByte(BufferByte);