Merge pull request #8 from ngkaho1234/master

[lwext4.git] / lwext4 / ext4.h

diff --git a/lwext4/ext4.h b/lwext4/ext4.h
index 192ecc95e49ac65bed20d531e8cec0cec03a1345..ae705014af4d01f09a58d91abe32a45899f2bb99 100644 (file)
--- a/lwext4/ext4.h
+++ b/lwext4/ext4.h
@@ -47,46 +47,53 @@
 
 /********************************FILE OPEN FLAGS*****************************/
 
-#ifndef O_RDONLY
-#define O_RDONLY 00
-#endif
+#if CONFIG_HAVE_OWN_OFLAGS
 
-#ifndef O_WRONLY
-#define O_WRONLY 01
-#endif
+ #ifndef O_RDONLY
+ #define O_RDONLY 00
+ #endif
 
-#ifndef O_RDWR
-#define O_RDWR 02
-#endif
+ #ifndef O_WRONLY
+ #define O_WRONLY 01
+ #endif
 
-#ifndef O_CREAT
-#define O_CREAT 0100
-#endif
+ #ifndef O_RDWR
+ #define O_RDWR 02
+ #endif
 
-#ifndef O_EXCL
-#define O_EXCL 0200
-#endif
+ #ifndef O_CREAT
+ #define O_CREAT 0100
+ #endif
 
-#ifndef O_TRUNC
-#define O_TRUNC 01000
-#endif
+ #ifndef O_EXCL
+ #define O_EXCL 0200
+ #endif
 
-#ifndef O_APPEND
-#define O_APPEND 02000
-#endif
+ #ifndef O_TRUNC
+ #define O_TRUNC 01000
+ #endif
+
+ #ifndef O_APPEND
+ #define O_APPEND 02000
+ #endif
 
 /********************************FILE SEEK FLAGS*****************************/
 
-#ifndef SEEK_SET
-#define SEEK_SET 0
-#endif
+ #ifndef SEEK_SET
+ #define SEEK_SET 0
+ #endif
 
-#ifndef SEEK_CUR
-#define SEEK_CUR 1
-#endif
+ #ifndef SEEK_CUR
+ #define SEEK_CUR 1
+ #endif
+
+ #ifndef SEEK_END
+ #define SEEK_END 2
+ #endif
 
-#ifndef SEEK_END
-#define SEEK_END 2
+#else
+ #include <unistd.h>
+ #include <fcntl.h>
 #endif
 
 /********************************OS LOCK INFERFACE***************************/
@@ -123,15 +130,6 @@ typedef struct ext4_file {
 } ext4_file;
 
 /*****************************DIRECTORY DESCRIPTOR***************************/
-/**@brief   Directory entry types. Copy from ext4_types.h*/
-enum { EXT4_DIRENTRY_UNKNOWN = 0,
-       EXT4_DIRENTRY_REG_FILE,
-       EXT4_DIRENTRY_DIR,
-       EXT4_DIRENTRY_CHRDEV,
-       EXT4_DIRENTRY_BLKDEV,
-       EXT4_DIRENTRY_FIFO,
-       EXT4_DIRENTRY_SOCK,
-       EXT4_DIRENTRY_SYMLINK };
 
 /**@brief   Directory entry descriptor. Copy from ext4_types.h*/
 typedef struct {
@@ -394,6 +392,10 @@ int ext4_dir_close(ext4_dir *d);
  * @return  directory entry id (NULL if no entry)*/
 const ext4_direntry *ext4_dir_entry_next(ext4_dir *d);
 
+/**@brief   Rewine directory entry offset.
+ * @param   d directory handle*/
+void ext4_dir_entry_rewind(ext4_dir *d);
+
 #endif /* EXT4_H_ */
 
 /**