Switch over Demos, Bootloaders and Projects to the new and improved build system.

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

diff --git a/Projects/TempDataLogger/Lib/DataflashManager.h b/Projects/TempDataLogger/Lib/DataflashManager.h
index 3c75c4c..9023626 100644 (file)
--- a/Projects/TempDataLogger/Lib/DataflashManager.h
+++ b/Projects/TempDataLogger/Lib/DataflashManager.h
@@ -1,21 +1,21 @@
 /*
              LUFA Library
 /*
              LUFA Library

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

   dean [at] fourwalledcubicle [dot] com
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
 */
 
 /*

-  Copyright 2010  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 
+  Permission to use, copy, modify, distribute, and sell this

   software and its documentation for any purpose is hereby granted
   software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in

   all copies and that both that the copyright notice and this
   all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the

   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this


@@ -32,19 +32,19 @@
  *
  *  Header file for DataflashManager.c.
  */
  *
  *  Header file for DataflashManager.c.
  */

- 
+

 #ifndef _DATAFLASH_MANAGER_H_
 #define _DATAFLASH_MANAGER_H_
 
        /* Includes: */
                #include <avr/io.h>
 #ifndef _DATAFLASH_MANAGER_H_
 #define _DATAFLASH_MANAGER_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>

-               #include <LUFA/Drivers/USB/Class/MassStorage.h>

                #include <LUFA/Drivers/Board/Dataflash.h>
 
        /* Preprocessor Checks: */
                #include <LUFA/Drivers/Board/Dataflash.h>
 
        /* Preprocessor Checks: */


@@ -60,22 +60,27 @@
                 *  storage media (Dataflash) using a different native block size. Do not change this value.
                 */
                #define VIRTUAL_MEMORY_BLOCK_SIZE           512
                 *  storage media (Dataflash) using a different native block size. Do not change this value.
                 */
                #define VIRTUAL_MEMORY_BLOCK_SIZE           512

-               
+

                /** Total number of blocks of the virtual memory for reporting to the host as the device's total capacity. Do not
                 *  change this value; change VIRTUAL_MEMORY_BYTES instead to alter the media size.
                 */
                #define VIRTUAL_MEMORY_BLOCKS               (VIRTUAL_MEMORY_BYTES / VIRTUAL_MEMORY_BLOCK_SIZE)
                /** Total number of blocks of the virtual memory for reporting to the host as the device's total capacity. Do not
                 *  change this value; change VIRTUAL_MEMORY_BYTES instead to alter the media size.
                 */
                #define VIRTUAL_MEMORY_BLOCKS               (VIRTUAL_MEMORY_BYTES / VIRTUAL_MEMORY_BLOCK_SIZE)

-               
+

        /* Function Prototypes: */
        /* Function Prototypes: */

-               void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const uint32_t BlockAddress,
+               void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo,
+                                                 const uint32_t BlockAddress,

                                                  uint16_t TotalBlocks);
                                                  uint16_t TotalBlocks);

-               void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const uint32_t BlockAddress,
+               void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo,
+                                                const uint32_t BlockAddress,

                                                 uint16_t TotalBlocks);
                                                 uint16_t TotalBlocks);

-               void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks,
+               void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress,
+                                                     uint16_t TotalBlocks,

                                                      const uint8_t* BufferPtr) ATTR_NON_NULL_PTR_ARG(3);
                                                      const uint8_t* BufferPtr) ATTR_NON_NULL_PTR_ARG(3);

-               void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks,
+               void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress,
+                                                    uint16_t TotalBlocks,

                                                     uint8_t* BufferPtr) ATTR_NON_NULL_PTR_ARG(3);
                void DataflashManager_ResetDataflashProtections(void);
                bool DataflashManager_CheckDataflashOperation(void);
                                                     uint8_t* BufferPtr) ATTR_NON_NULL_PTR_ARG(3);
                void DataflashManager_ResetDataflashProtections(void);
                bool DataflashManager_CheckDataflashOperation(void);

-               
+

 #endif
 #endif

+