[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 06/13] vvfat: fix field names in FAT12/FAT16 and
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH v2 06/13] vvfat: fix field names in FAT12/FAT16 and FAT32 boot sectors |
Date: |
Mon, 22 May 2017 23:11:58 +0200 |
Specification: "FAT: General overview of on-disk format" v1.03, pages 11-13
Signed-off-by: Hervé Poussineau <address@hidden>
---
block/vvfat.c | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/block/vvfat.c b/block/vvfat.c
index e694d82df4..c1034cdd1f 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -218,23 +218,30 @@ typedef struct bootsector_t {
union {
struct {
uint8_t drive_number;
- uint8_t current_head;
+ uint8_t reserved1;
uint8_t signature;
uint32_t id;
uint8_t volume_label[11];
+ uint8_t fat_type[8];
+ uint8_t ignored[0x1c0];
} QEMU_PACKED fat16;
struct {
uint32_t sectors_per_fat;
uint16_t flags;
uint8_t major,minor;
- uint32_t first_cluster_of_root_directory;
+ uint32_t first_cluster_of_root_dir;
uint16_t info_sector;
uint16_t backup_boot_sector;
- uint16_t ignored;
+ uint8_t reserved[12];
+ uint8_t drive_number;
+ uint8_t reserved1;
+ uint8_t signature;
+ uint32_t id;
+ uint8_t volume_label[11];
+ uint8_t fat_type[8];
+ uint8_t ignored[0x1a4];
} QEMU_PACKED fat32;
} u;
- uint8_t fat_type[8];
- uint8_t ignored[0x1c0];
uint8_t magic[2];
} QEMU_PACKED bootsector_t;
@@ -974,13 +981,13 @@ static int init_directories(BDRVVVFATState* s,
/* LATER TODO: if FAT32, this is wrong */
/* drive_number: fda=0, hda=0x80 */
bootsector->u.fat16.drive_number = s->offset_to_bootsector == 0 ? 0 : 0x80;
- bootsector->u.fat16.current_head=0;
bootsector->u.fat16.signature=0x29;
bootsector->u.fat16.id=cpu_to_le32(0xfabe1afd);
memcpy(bootsector->u.fat16.volume_label, s->volume_label,
sizeof(bootsector->u.fat16.volume_label));
- memcpy(bootsector->fat_type,(s->fat_type==12?"FAT12
":s->fat_type==16?"FAT16 ":"FAT32 "),8);
+ memcpy(bootsector->u.fat16.fat_type,
+ s->fat_type == 12 ? "FAT12 " : "FAT16 ", 8);
bootsector->magic[0]=0x55; bootsector->magic[1]=0xaa;
return 0;
--
2.11.0
- [Qemu-devel] [PATCH v2 00/13] vvfat: misc fixes for read-only mode, Hervé Poussineau, 2017/05/22
- [Qemu-devel] [PATCH v2 06/13] vvfat: fix field names in FAT12/FAT16 and FAT32 boot sectors,
Hervé Poussineau <=
- [Qemu-devel] [PATCH v2 08/13] vvfat: correctly create long names for non-ASCII filenames, Hervé Poussineau, 2017/05/22
- [Qemu-devel] [PATCH v2 12/13] vvfat: handle KANJI lead byte 0xe5, Hervé Poussineau, 2017/05/22
- [Qemu-devel] [PATCH v2 07/13] vvfat: always create . and .. entries at first and in that order, Hervé Poussineau, 2017/05/22
- [Qemu-devel] [PATCH v2 10/13] vvfat: correctly generate numeric-tail of short file names, Hervé Poussineau, 2017/05/22
- [Qemu-devel] [PATCH v2 09/13] vvfat: correctly create base short names for non-ASCII filenames, Hervé Poussineau, 2017/05/22
- [Qemu-devel] [PATCH v2 11/13] vvfat: limit number of entries in root directory in FAT12/FAT16, Hervé Poussineau, 2017/05/22
- [Qemu-devel] [PATCH v2 05/13] vvfat: introduce offset_to_bootsector, offset_to_fat and offset_to_root_dir, Hervé Poussineau, 2017/05/22