Changeset 663

Timestamp:

Jul 27, 2015, 5:56:15 PM (9 years ago)

Author:

guerin

Message:

fat32: introduce fat32_shared.h

No need to synchronize fat32.h and stdio.h anymore.

Location:

soft/giet_vm

Files:

• giet_fat32/fat32.h (modified) (2 diffs)
• giet_fat32/fat32_shared.h (added)
• giet_libs/stdio.h (modified) (2 diffs)

soft/giet_vm/giet_fat32/fat32.h

@@ -9 +9 @@
 #define _FAT32_H
 
+#include "fat32_shared.h"
 #include "giet_config.h"
 #include "kernel_locks.h"
@@ -125 +126 @@
 
 #define FAT_INITIALISED         0xBABEF00D
-
-#ifndef _FAT32_SHARED
-#define _FAT32_SHARED
-typedef struct fat_file_info_s
-{
-    unsigned int size;
-    unsigned int offset;
-    unsigned int is_dir;
-}   fat_file_info_t;
-
-typedef struct fat_dirent_s
-{
-    unsigned int cluster;
-    unsigned int size;
-    unsigned int is_dir;
-    char name[36];
-}   fat_dirent_t;
-
-#define SEEK_SET                0
-#define SEEK_CUR                1
-
-#define O_RDONLY                0x01
-#define O_TRUNC                 0x10
-#define O_CREATE                0x20
-#endif // _FAT32_SHARED
 
 /********************************************************************************

soft/giet_vm/giet_libs/stdio.h

@@ -12 +12 @@
 #ifndef _STDIO_H
 #define _STDIO_H
+
+#include "giet_fat32/fat32_shared.h"
 
 // These define must be synchronised with 
@@ -83 +85 @@
 #define SYSCALL_COPROC_RUN           0x3E
 #define SYSCALL_COPROC_RELEASE       0x3F
-
-////////////////////////////////////////////////////////////////////////////
-// These define must be synchronised vith values defined in fat32.h
-////////////////////////////////////////////////////////////////////////////
-
-#ifndef _FAT32_SHARED
-#define _FAT32_SHARED
-typedef struct fat_file_info_s
-{
-    unsigned int size;
-    unsigned int offset;
-    unsigned int is_dir;
-}   fat_file_info_t;
-
-typedef struct fat_dirent_s
-{
-    unsigned int cluster;
-    unsigned int size;
-    unsigned int is_dir;
-    char name[36];
-}   fat_dirent_t;
-
-#define SEEK_SET            0          // argument for giet_fat_lseek()
-#define SEEK_CUR            1          // argument for giet_fat_lseek
-
-#define O_RDONLY            0x01       // argument for giet_fat_open()
-#define O_TRUNC             0x10       // argument for giet_fat_open()
-#define O_CREATE            0x20       // argument for giet_fat_open()
-#endif // _FAT32_SHARED
 
 ////////////////////////////////////////////////////////////////////////////