Fixed broken USE_RAM_DESCRIPTORS compile time option when the FIXED_NUM_CONFIGURATION...

[pub/USBasp.git] / Projects / Webserver / Lib / DataflashManager.h

diff --git a/Projects/Webserver/Lib/DataflashManager.h b/Projects/Webserver/Lib/DataflashManager.h
index 3351922..ebbfe8e 100644 (file)
--- a/Projects/Webserver/Lib/DataflashManager.h
+++ b/Projects/Webserver/Lib/DataflashManager.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2015.
 
   dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
+           www.lufa-lib.org
 */
 
 /*
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2015  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
@@ -18,7 +18,7 @@
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
-  The author disclaim all warranties with regard to this
+  The author disclaims all warranties with regard to this
   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages
@@ -39,11 +39,10 @@
        /* Includes: */
                #include <avr/io.h>
 
-               #include "Descriptors.h"
+               #include "../Descriptors.h"
 
                #include <LUFA/Common/Common.h>
                #include <LUFA/Drivers/USB/USB.h>
-               #include <LUFA/Drivers/USB/Class/MassStorage.h>
                #include <LUFA/Drivers/Board/Dataflash.h>
 
        /* Preprocessor Checks: */
@@ -52,7 +51,7 @@
                #endif
 
        /* Defines: */
-               /** Total number of bytes of the storage medium, comprised of one or more dataflash ICs. */
+               /** Total number of bytes of the storage medium, comprised of one or more Dataflash ICs. */
                #define VIRTUAL_MEMORY_BYTES                ((uint32_t)DATAFLASH_PAGES * DATAFLASH_PAGE_SIZE * DATAFLASH_TOTALCHIPS)
 
                /** Block size of the device. This is kept at 512 to remain compatible with the OS despite the underlying
@@ -65,6 +64,9 @@
                 */
                #define VIRTUAL_MEMORY_BLOCKS               (VIRTUAL_MEMORY_BYTES / VIRTUAL_MEMORY_BLOCK_SIZE)
 
+               /** Indicates if the disk is write protected or not. */
+               #define DISK_READ_ONLY                      false
+
        /* Function Prototypes: */
                void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo,
                                                  const uint32_t BlockAddress,