gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-06-05 07:52:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up the Mass Storage bootloader virtual FAT directory entry definitions.

Browse Source
This commit is contained in:
Dean Camera 2013-03-25 21:09:55 +00:00
parent 169f21fbb1
commit 3bc066cd69
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Bootloaders/MassStorage/Lib/VirtualFAT.c
View File

@ -79,16 +79,15 @@ static FATDirectoryEntry_t FirmwareFileEntries[] =
* fields are ignored. Should be the same as the label in the boot block. * fields are ignored. Should be the same as the label in the boot block.
*/ */
{ {
.MSDOS = .MSDOS_Directory =
{ {
.Filename = "LUFA BOO", .Name = "LUFA BOOT ",
.Extension = "T ",
.Attributes = FAT_FLAG_VOLUME_NAME, .Attributes = FAT_FLAG_VOLUME_NAME,
.Reserved = {0}, .Reserved = {0},
.CreationTime = 0, .CreationTime = 0,
.CreationDate = 0, .CreationDate = 0,
.StartingCluster = 0, .StartingCluster = 0,
.FileSizeBytes = 0, .Reserved2 = 0,
} }
}, },
@ -96,7 +95,7 @@ static FATDirectoryEntry_t FirmwareFileEntries[] =
* prevent corruption of systems that are unable to detect the device * prevent corruption of systems that are unable to detect the device
* as being a legacy MSDOS style FAT12 volume to prevent corruption. */ * as being a legacy MSDOS style FAT12 volume to prevent corruption. */
{ {
.VFAT = .VFAT_LongFileName =
{ {
.Ordinal = FAT_ORDINAL_LAST_ENTRY | 1, .Ordinal = FAT_ORDINAL_LAST_ENTRY | 1,
.Attribute = FAT_FLAG_LONG_FILE_NAME, .Attribute = FAT_FLAG_LONG_FILE_NAME,
@ -123,7 +122,7 @@ static FATDirectoryEntry_t FirmwareFileEntries[] =
/* MSDOS file entry for the virtual Firmware image. */ /* MSDOS file entry for the virtual Firmware image. */
{ {
.MSDOS = .MSDOS_File =
{ {
.Filename = "FIRMWARE", .Filename = "FIRMWARE",
.Extension = "BIN", .Extension = "BIN",

22
Bootloaders/MassStorage/Lib/VirtualFAT.h
View File

@ -154,11 +154,12 @@
/* uint16_t MagicSignature; */ /* uint16_t MagicSignature; */
} FATBootBlock_t; } FATBootBlock_t;
/** FAT legacy 8.3 style directory entry structure definition, used to /** FAT directory entry structure, for the various kinds of File and
* identify the files and folders of FAT filesystem stored on a disk. * directory descriptors on a FAT disk.
*/ */
typedef union typedef union
{ {
/** FAT Long File Name directory entry. */
struct struct
{ {
uint8_t Ordinal; uint8_t Ordinal;
@ -179,8 +180,9 @@
uint16_t Reserved2; uint16_t Reserved2;
uint16_t Unicode12; uint16_t Unicode12;
uint16_t Unicode13; uint16_t Unicode13;
} VFAT; } VFAT_LongFileName;
/** FAT MSDOS 8.3 legacy file entry. */
struct struct
{ {
uint8_t Filename[8]; uint8_t Filename[8];
@ -191,7 +193,19 @@
uint16_t CreationDate; uint16_t CreationDate;
uint16_t StartingCluster; uint16_t StartingCluster;
uint32_t FileSizeBytes; uint32_t FileSizeBytes;
} MSDOS; } MSDOS_File;
/** FAT MSDOS (sub-)directory entry. */
struct
{
uint8_t Name[11];
uint8_t Attributes;
uint8_t Reserved[10];
uint16_t CreationTime;
uint16_t CreationDate;
uint16_t StartingCluster;
uint32_t Reserved2;
} MSDOS_Directory;
} FATDirectoryEntry_t; } FATDirectoryEntry_t;
/* Function Prototypes: */ /* Function Prototypes: */