X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/64f17a679f0d99741fb8101f02dfb3ef084e525c..3f52d6ee06846758a21b0fc3768deeee7c67425c:/Bootloaders/Incomplete/MassStorage/Lib/VirtualFAT.h?ds=inline

diff --git a/Bootloaders/Incomplete/MassStorage/Lib/VirtualFAT.h b/Bootloaders/Incomplete/MassStorage/Lib/VirtualFAT.h
index 2009b6847..af4548898 100644
--- a/Bootloaders/Incomplete/MassStorage/Lib/VirtualFAT.h
+++ b/Bootloaders/Incomplete/MassStorage/Lib/VirtualFAT.h
@@ -38,49 +38,117 @@
 		#include <LUFA/Drivers/USB/USB.h>
 
 	/* Macros: */
-		#define VIRTUAL_MEMORY_BLOCK_SIZE 512
-		#define ALLOCATION_UNIT_BLOCKS    4
-		#define LUN_MEDIA_BLOCKS          ((FLASHEND + 1) / VIRTUAL_MEMORY_BLOCK_SIZE) + 16
+		/** Size of the virtual FIRMWARE.BIN file in bytes. */
+		#define FIRMWARE_FILE_SIZE_BYTES  (FLASHEND - (FLASHEND - BOOT_START_ADDR) + 1UL)
+
+		/** Number of sectors that comprise a single logical disk cluster. */
+		#define SECTOR_PER_CLUSTER        4
+
+		/** Size of a single logical sector on the disk. */
+		#define SECTOR_SIZE_BYTES         512
+
+		/** Size of a logical cluster on the disk, in bytes */
+		#define CLUSTER_SIZE_BYTES        (SECTOR_PER_CLUSTER * SECTOR_SIZE_BYTES)
+
+		/** Number of sectors required to store a given size in bytes.
+		 *
+		 *  \param[in] size  Size of the data that needs to be stored
+		 *
+		 *  \return Number of sectors required to store the given data on the disk.
+		 */
+		#define FILE_SECTORS(size)        ((size / SECTOR_SIZE_BYTES)  + ((size % SECTOR_SIZE_BYTES)  ? 1 : 0))
+
+		/** Number of clusters required to store a given size in bytes.
+		 *
+		 *  \param[in] size  Size of the data that needs to be stored
+		 *
+		 *  \return Number of clusters required to store the given data on the disk.
+		 */
+		#define FILE_CLUSTERS(size)       ((size / CLUSTER_SIZE_BYTES) + ((size % CLUSTER_SIZE_BYTES) ? 1 : 0))
+
+		/** Total number of logical sectors/blocks on the disk. */
+		#define LUN_MEDIA_BLOCKS          (FILE_SECTORS(FIRMWARE_FILE_SIZE_BYTES) + 32)
+
+		/** Converts a given time in HH:MM:SS format to a FAT filesystem time.
+		 *
+		 *  \note The minimum seconds resolution of FAT is 2, thus odd seconds
+		 *        will be truncated to the previous integer multiple of 2 seconds.
+		 *
+		 *  \param[in] hh  Hours (0-23)
+		 *  \param[in] mm  Minutes (0-59)
+		 *  \param[in] ss  Seconds (0-59)
+		 *
+		 *  \return Given time encoded as a FAT filesystem timestamp
+		 */
+		#define FAT_TIME(hh, mm, ss)      ((hh << 11) | (mm << 5) | (ss >> 1))
+
+		/** Converts a given date in DD/MM/YYYY format to a FAT filesystem date.
+		 *
+		 *  \param[in] dd    Days in the month (1-31)
+		 *  \param[in] mm    Months in the year (1-12)
+		 *  \param[in] yyyy  Year (1980 - 2107)
+		 *
+		 *  \return Given date encoded as a FAT filesystem datestamp
+		 */
+		#define FAT_DATE(dd, mm, yyyy)    (((yyyy - 1980) << 9) | (mm << 5) | (dd << 0))
 
 	/* Type Definitions: */
+		/** FAT boot block structure definition, used to identify the core
+		 *  parameters of a FAT filesystem stored on a disk.
+		 *
+		 *  \note This definition is truncated to save space; the magic signature
+		 *        0xAA55 must be appended to the very end of the block for it to
+		 *        be detected by the host as a valid boot block.
+		 */
 		typedef struct
 		{
 			uint8_t  Bootstrap[3];
 			uint8_t  Description[8];
-			uint16_t BlockSize;
-			uint8_t  BlocksPerAllocationUnit;
-			uint16_t ReservedBlocks;
+			uint16_t SectorSize;
+			uint8_t  SectorsPerCluster;
+			uint16_t ReservedSectors;
 			uint8_t  FATCopies;
 			uint16_t RootDirectoryEntries;
-			uint16_t TotalBlocks16;
+			uint16_t TotalSectors16;
 			uint8_t  MediaDescriptor;
-			uint16_t BlocksPerFAT;
-			uint16_t BlocksPerTrack;
+			uint16_t SectorsPerFAT;
+			uint16_t SectorsPerTrack;
 			uint16_t Heads;
-			uint32_t HiddenBlocks;
-			uint32_t TotalBlocks32;
+			uint32_t HiddenSectors;
+			uint32_t TotalSectors32;
 			uint16_t PhysicalDriveNum;
 			uint8_t  ExtendedBootRecordSig;
 			uint32_t VolumeSerialNumber;
 			uint8_t  VolumeLabel[11];
 			uint8_t  FilesystemIdentifier[8];
-			uint8_t  BootstrapProgram[448];
-			uint16_t MagicSignature;
+			/* uint8_t  BootstrapProgram[448]; */
+			/* uint16_t MagicSignature; */
 		} FATBootBlock_t;
 
+		/** FAT legacy 8.3 style directory entry structure definition, used to
+		 *  identify the files and folders of FAT filesystem stored on a disk.
+		 */
 		typedef struct
 		{
-			uint8_t Filename[8];
-			uint8_t Extension[3];
-			uint8_t Attributes;
-			uint8_t Reserved[10];
+			uint8_t  Filename[8];
+			uint8_t  Extension[3];
+			uint8_t  Attributes;
+			uint8_t  Reserved[10];
 			uint16_t CreationTime;
 			uint16_t CreationDate;
 			uint16_t StartingCluster;
-			uint32_t FileSize;
+			uint32_t FileSizeBytes;
 		} FATDirectoryEntry_t;
 
 	/* Function Prototypes: */
+		#if defined(INCLUDE_FROM_VIRTUAL_FAT_C)
+			static void UpdateFAT12ClusterEntry(uint8_t* const FATTable,
+			                                    const uint16_t Index,
+			                                    const uint16_t ChainEntry);
+			static void WriteVirtualBlock(const uint16_t BlockNumber);
+			static void ReadVirtualBlock(const uint16_t BlockNumber);
+		#endif
+
 		void VirtualFAT_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo,
 		                            const uint32_t BlockAddress,
 		                            uint16_t TotalBlocks);