Update ModuleTest build test to enable new warnings supported in the latest Atmel...

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

diff --git a/Projects/TempDataLogger/Lib/DataflashManager.h b/Projects/TempDataLogger/Lib/DataflashManager.h
index 52ceea4..784ede4 100644 (file)
--- a/Projects/TempDataLogger/Lib/DataflashManager.h
+++ b/Projects/TempDataLogger/Lib/DataflashManager.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2012.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  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
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -39,8 +39,9 @@
        /* Includes: */
                #include <avr/io.h>
 
        /* Includes: */
                #include <avr/io.h>
 

-               #include "TempDataLogger.h"
-               #include "Descriptors.h"
+               #include "../TempDataLogger.h"
+               #include "../Descriptors.h"
+               #include "Config/AppConfig.h"

 
                #include <LUFA/Common/Common.h>
                #include <LUFA/Drivers/USB/USB.h>
 
                #include <LUFA/Common/Common.h>
                #include <LUFA/Drivers/USB/USB.h>


@@ -52,7 +53,7 @@
                #endif
 
        /* Defines: */
                #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
                #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