[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 06/13] vvfat: fix field names in FAT12/FAT16 boot se
From: |
Hervé Poussineau |
Subject: |
[Qemu-block] [PATCH 06/13] vvfat: fix field names in FAT12/FAT16 boot sector |
Date: |
Mon, 15 May 2017 22:31:06 +0200 |
Specification: "FAT: General overview of on-disk format" v1.03, page 11
Signed-off-by: Hervé Poussineau <address@hidden>
---
block/vvfat.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/block/vvfat.c b/block/vvfat.c
index f60d2a3889..348cffe1c4 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -218,10 +218,12 @@ 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;
@@ -233,8 +235,6 @@ typedef struct bootsector_t {
uint16_t ignored;
} QEMU_PACKED fat32;
} u;
- uint8_t fat_type[8];
- uint8_t ignored[0x1c0];
uint8_t magic[2];
} QEMU_PACKED bootsector_t;
@@ -972,13 +972,13 @@ static int init_directories(BDRVVVFATState* s,
/* LATER TODO: if FAT32, this is wrong */
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-block] [PATCH 00/13] vvfat: misc fixes for read-only mode, Hervé Poussineau, 2017/05/15
- [Qemu-block] [PATCH 06/13] vvfat: fix field names in FAT12/FAT16 boot sector,
Hervé Poussineau <=
- [Qemu-block] [PATCH 03/13] vvfat: fix typos, Hervé Poussineau, 2017/05/15
- [Qemu-block] [PATCH 04/13] vvfat: rename useless enumeration values, Hervé Poussineau, 2017/05/15
- [Qemu-block] [PATCH 07/13] vvfat: always create . and .. entries at first and in that order, Hervé Poussineau, 2017/05/15
- [Qemu-block] [PATCH 09/13] vvfat: correctly create base short names for non-ASCII filenames, Hervé Poussineau, 2017/05/15
- [Qemu-block] [PATCH 12/13] vvfat: handle KANJI lead byte 0xe5, Hervé Poussineau, 2017/05/15
- [Qemu-block] [PATCH 08/13] vvfat: correctly create long names for non-ASCII filenames, Hervé Poussineau, 2017/05/15