Add FatFS library to the Webserver project, extend the HTTP server so that it now...

[pub/USBasp.git] / LUFA / Drivers / Board / XPLAIN / Dataflash.h

diff --git a/LUFA/Drivers/Board/XPLAIN/Dataflash.h b/LUFA/Drivers/Board/XPLAIN/Dataflash.h
index ef95552..8832874 100644 (file)
--- a/LUFA/Drivers/Board/XPLAIN/Dataflash.h
+++ b/LUFA/Drivers/Board/XPLAIN/Dataflash.h
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  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
+  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
@@ -70,9 +70,9 @@
                        #define DATAFLASH_NO_CHIP                    DATAFLASH_CHIPCS_MASK\r
 \r
                        /** Mask for the first dataflash chip selected. */\r
-                       #define DATAFLASH_CHIP1                      (1 << 5)\r
+                       #define DATAFLASH_CHIP1                      0\r
 \r
-                       #if BOAD == XPLAIN_REV1\r
+                       #if (BOARD == BOARD_XPLAIN_REV1)\r
                                #define DATAFLASH_PAGE_SIZE              256\r
 \r
                                #define DATAFLASH_PAGES                  2048                                                   \r
@@ -111,9 +111,7 @@
                         *  \param[in] BufferByte   Address within the dataflash's buffer\r
                         */\r
                        static inline void Dataflash_SendAddressBytes(uint16_t PageAddress, const uint16_t BufferByte)\r
-                       {       \r
-                               PageAddress >>= 1;\r
-                               \r
+                       {\r
                                Dataflash_SendByte(PageAddress >> 5);\r
                                Dataflash_SendByte((PageAddress << 3) | (BufferByte >> 8));\r
                                Dataflash_SendByte(BufferByte);\r