Fix incorrect const'ness of the ReportItem parameter in USB_SetHIDReportItemInfo().

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

diff --git a/LUFA/Drivers/Board/Dataflash.h b/LUFA/Drivers/Board/Dataflash.h
index 1b9b71f..28ac996 100644 (file)
--- a/LUFA/Drivers/Board/Dataflash.h
+++ b/LUFA/Drivers/Board/Dataflash.h
@@ -81,9 +81,11 @@
                                #define __GET_DATAFLASH_MASK(x)     __GET_DATAFLASH_MASK2(DATAFLASH_CHIP,x)\r
                        #endif\r
        \r
                                #define __GET_DATAFLASH_MASK(x)     __GET_DATAFLASH_MASK2(DATAFLASH_CHIP,x)\r
                        #endif\r
        \r

-                       /* Retrieves the Dataflash chip select mask for the given Dataflash chip index.\r
+                       /** Retrieves the Dataflash chip select mask for the given Dataflash chip index.\r

                         *\r
                         *\r

-                        * \param index  Index of the dataflash chip mask to retrieve\r
+                        *  \param[in] index  Index of the dataflash chip mask to retrieve\r
+                        *\r
+                        *  \return Mask for the given Dataflash chip's /CS pin\r

                         */\r
                        #define DATAFLASH_CHIP_MASK(index)      __GET_DATAFLASH_MASK(index)\r
                        \r
                         */\r
                        #define DATAFLASH_CHIP_MASK(index)      __GET_DATAFLASH_MASK(index)\r
                        \r


@@ -156,6 +158,10 @@
                                #include "STK525/Dataflash.h"\r
                        #elif (BOARD == BOARD_STK526)\r
                                #include "STK526/Dataflash.h"\r
                                #include "STK525/Dataflash.h"\r
                        #elif (BOARD == BOARD_STK526)\r
                                #include "STK526/Dataflash.h"\r

+                       #elif (BOARD == BOARD_XPLAIN)\r
+                               #include "XPLAIN/Dataflash.h"\r
+                       #elif (BOARD == BOARD_XPLAIN_REV1)\r
+                               #include "XPLAIN/Dataflash.h"\r

                        #elif (BOARD == BOARD_USER)\r
                                #include "Board/Dataflash.h"\r
                        #else\r
                        #elif (BOARD == BOARD_USER)\r
                                #include "Board/Dataflash.h"\r
                        #else\r


@@ -183,7 +189,7 @@
                                Dataflash_SelectChip(SelectedChipMask);\r
                        }\r
 \r
                                Dataflash_SelectChip(SelectedChipMask);\r
                        }\r
 \r

-                       /** Spinloops while the currently selected dataflash is busy executing a command, such as a main\r
+                       /** Spin-loops while the currently selected dataflash is busy executing a command, such as a main\r

                         *  memory page program or main memory to buffer transfer.\r
                         */\r
                        static inline void Dataflash_WaitWhileBusy(void)\r
                         *  memory page program or main memory to buffer transfer.\r
                         */\r
                        static inline void Dataflash_WaitWhileBusy(void)\r