aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/include/fs
diff options
context:
space:
mode:
authorAlex Auvolat <alex.auvolat@ens.fr>2015-02-24 17:31:10 +0100
committerAlex Auvolat <alex.auvolat@ens.fr>2015-02-24 17:31:10 +0100
commitd89c862fb2f569275300d6a64caaa0b287367558 (patch)
treee3572ee543f9f5189289e466fdf67a911504be20 /src/kernel/include/fs
parent150dd5f860a5f22a8c3bcc1bf3a1f2e36dcf6fd8 (diff)
downloadkogata-d89c862fb2f569275300d6a64caaa0b287367558.tar.gz
kogata-d89c862fb2f569275300d6a64caaa0b287367558.zip
Fix a bug (dispose in pciide should not exist)
Diffstat (limited to 'src/kernel/include/fs')
-rw-r--r--src/kernel/include/fs/iso9660.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/kernel/include/fs/iso9660.h b/src/kernel/include/fs/iso9660.h
index fcaec1a..292b4dd 100644
--- a/src/kernel/include/fs/iso9660.h
+++ b/src/kernel/include/fs/iso9660.h
@@ -37,8 +37,8 @@ typedef struct { // Directory record
uint8_t interleave_gap_size;
uint16_lsb_msb_t vol_seq_num;
uint8_t name_len;
- char name[2]; // we want sizeof(iso9660_dr_t) == 34
-} iso9660_dr_t;
+ char name[1]; // we want sizeof(iso9660_dr_t) == 34
+} __attribute__((packed)) iso9660_dr_t;
typedef struct { // Boot record
uint8_t type;
@@ -47,7 +47,7 @@ typedef struct { // Boot record
char sys_ident[32];
char boot_ident[32];
char reserved[1977];
-} iso9660_bootrecord_t;
+} __attribute__((packed)) iso9660_bootrecord_t;
typedef struct { // Primary volume descriptor
uint8_t type;
@@ -72,13 +72,13 @@ typedef struct { // Primary volume descriptor
iso9660_dr_t root_directory;
// more fields (not interesting...)
-} iso9660_pvd_t;
+} __attribute__((packed)) iso9660_pvd_t;
typedef struct {
uint8_t type;
char ident[5];
uint8_t version; // always 1
-} iso9660_vdt_terminator_t; // volume descriptor table terminator
+} __attribute__((packed)) iso9660_vdt_terminator_t; // volume descriptor table terminator
typedef union {
iso9660_bootrecord_t boot;