1 files changed, 30 insertions, 88 deletions

diff --git a/firmware/drivers/fat.h b/firmware/drivers/fat.h
index 99b40ac284..b60b3d4164 100644
--- a/firmware/drivers/fat.h
+++ b/firmware/drivers/fat.h
@@ -22,38 +22,6 @@
 
 #define BLOCK_SIZE 512
 
-#define FATTYPE_FAT12       0
-#define FATTYPE_FAT16       1
-#define FATTYPE_FAT32       2
-
-#define BS_JMPBOOT          0
-#define BS_OEMNAME          3
-#define BPB_BYTSPERSEC      11
-#define BPB_SECPERCLUS      13
-#define BPB_RSVDSECCNT      14
-#define BPB_NUMFATS         16
-#define BPB_ROOTENTCNT      17
-#define BPB_TOTSEC16        19
-#define BPB_MEDIA           21
-#define BPB_FATSZ16         22
-#define BPB_SECPERTRK       24
-#define BPB_NUMHEADS        26
-#define BPB_HIDDSEC         28
-#define BPB_TOTSEC32        32
-
-#define BS_DRVNUM           36
-#define BS_RESERVED1        37
-#define BS_BOOTSIG          38
-#define BS_VOLID            39
-#define BS_VOLLAB           43
-#define BS_FILSYSTYPE       54
-
-#define BPB_FATSZ32          36
-
-#define BPB_LAST_WORD       510
-
-#define MIN(a,b) (((a) < (b))?(a):(b))
-
 struct bpb
 {
     char bs_oemname[9];  /* OEM string, ending with \0 */
@@ -70,6 +38,8 @@ struct bpb
     int bpb_hiddsec;     /* Hidden sectors before the volume */
     unsigned int bpb_totsec32;    /* Number of sectors on the volume
                                      (new 32-bit) */
+    int last_word;       /* 0xAA55 */
+
     /**** FAT12/16 specific *****/
     int bs_drvnum;       /* Drive number */
     int bs_bootsig;      /* Is 0x29 if the following 3 fields are valid */
@@ -86,8 +56,27 @@ struct bpb
     int bpb_bkbootsec;
 
     /* variables for internal use */
-    int fat_type;       /* FAT12, FAT16 or FAT32 */
-    int last_word;      /* must be 0xAA55 */
+    int fatsize;
+    int totalsectors;
+    int rootdirsector;
+    int firstdatasector;
+};
+
+struct fat_direntry
+{
+    unsigned char name[12];         /* Name plus \0 */
+    unsigned short attr;            /* Attributes */
+    unsigned char crttimetenth;     /* Millisecond creation
+                                       time stamp (0-199) */
+    unsigned short crttime;         /* Creation time */
+    unsigned short crtdate;         /* Creation date */
+    unsigned short lstaccdate;      /* Last access date */
+    unsigned short fstclushi;       /* High word of first cluster
+                                       (0 for FAT12/16) */
+    unsigned short wrttime;         /* Last write time */
+    unsigned short wrtdate;         /* Last write date */
+    unsigned short fstcluslo;       /* Low word of first cluster */
+    unsigned int filesize;          /* File size in bytes */
 };
 
 #define FAT_ATTR_READ_ONLY   0x01
@@ -96,68 +85,21 @@ struct bpb
 #define FAT_ATTR_VOLUME_ID   0x08
 #define FAT_ATTR_DIRECTORY   0x10
 #define FAT_ATTR_ARCHIVE     0x20
-#define FAT_ATTR_LONG_NAME   (FAT_ATTR_READ_ONLY | FAT_ATTR_HIDDEN | \
-                              FAT_ATTR_SYSTEM | FAT_ATTR_VOLUME_ID)
-#define FAT_ATTR_LONG_NAME_MASK (FAT_ATTR_READ_ONLY | FAT_ATTR_HIDDEN | \
-                                 FAT_ATTR_SYSTEM | FAT_ATTR_VOLUME_ID | \
-                                 FAT_ATTR_DIRECTORY | FAT_ATTR_ARCHIVE )
-
-
-#define FATDIR_NAME          0
-#define FATDIR_ATTR          11
-#define FATDIR_NTRES         12
-#define FATDIR_CRTTIMETENTH  13
-#define FATDIR_CRTTIME       14
-#define FATDIR_CRTDATE       16
-#define FATDIR_LSTACCDATE    18
-#define FATDIR_FSTCLUSHI     20
-#define FATDIR_WRTTIME       22
-#define FATDIR_WRTDATE       24
-#define FATDIR_FSTCLUSLO     26
-#define FATDIR_FILESIZE      28
-
-struct fat_direntry
-{
-        unsigned char name[12];         /* Name plus \0 */
-        unsigned short attr;            /* Attributes */
-        unsigned char crttimetenth;     /* Millisecond creation
-                                           time stamp (0-199) */
-        unsigned short crttime;         /* Creation time */
-        unsigned short crtdate;         /* Creation date */
-        unsigned short lstaccdate;      /* Last access date */
-        unsigned short fstclushi;       /* High word of first cluster
-                                           (0 for FAT12/16) */
-        unsigned short wrttime;         /* Last write time */
-        unsigned short wrtdate;         /* Last write date */
-        unsigned short fstcluslo;       /* Low word of first cluster */
-        unsigned int filesize;          /* File size in bytes */
-};
-
-struct fat_context
-{
-        unsigned int curr_dir_sec; /* Current directory sector */
-        
-};
-
-struct disk_info
-{
-        int num_sectors;
-        int sec_per_track;
-        int num_heads;
-        unsigned int hidden_sectors;
-};
 
 struct fat_dirent
 {
-        int entry;
-        unsigned int cached_sec;
-        unsigned int num_sec;
-        char cached_buf[BLOCK_SIZE];
+    int entry;
+    unsigned int cached_sec;
+    unsigned int num_sec;
+    char cached_buf[BLOCK_SIZE];
 };
 
 extern int fat_create_file(struct bpb *bpb, 
                            unsigned int currdir, 
                            char *name);
+extern int fat_create_dir(struct bpb *bpb, 
+                          unsigned int currdir,
+                          char *name);
 extern int fat_opendir(struct bpb *bpb, 
                        struct fat_dirent *ent, 
                        unsigned int currdir);