update jffs2, now it can be built with gcc(NEWLIB is needed!)

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2453 bbd45198-f89e-11dd-88c7-29a3b14d5316

components/dfs/filesystems/jffs2/cyg/fileio/fileio.h

@@ -67,9 +67,14 @@
 #endif
 
 #include <stddef.h>             // NULL, size_t
-#include <limits.h>
+#include <limits.h>
+#if defined(__GNUC__) && !defined(__CC_ARM)
 #include <sys/types.h>
 #include <fcntl.h>
+#else
+#include <port/sys/types.h>
+#include <port/fcntl.h>
+#endif
 //#include "os_sys_stat.h"//#include <sys/stat.h>
 
 //=============================================================================

components/dfs/filesystems/jffs2/dfs_jffs2.c

@@ -16,7 +16,8 @@
 
 #include "cyg/infra/cyg_type.h"
 #include "cyg/fileio/fileio.h"
-#include "codes.h"
+#include "port/codes.h"
+#include "port/fcntl.h"
 #undef mode_t
 
 #include <dfs_fs.h>

components/dfs/filesystems/jffs2/include/port/fcntl.h

@@ -1,6 +1,35 @@
 #ifndef CYGONCE_ISO_FCNTL_H
 #define CYGONCE_ISO_FCNTL_H
+/*------------------------------------------------------------------------*/
+/* for dfs_jffs2.c                                                        */
+/*------------------------------------------------------------------------*/
+/* File access modes used for open() and fnctl() */
+#define JFFS2_O_RDONLY     (DFS_O_RDONLY)   /* Open for reading only */
+#define JFFS2_O_WRONLY     (DFS_O_WRONLY)   /* Open for writing only */
+#define JFFS2_O_RDWR       (DFS_O_RDONLY|DFS_O_WRONLY) /* Open for reading and writing */
 
+/* File access mode mask */
+#define JFFS2_O_ACCMODE    (DFS_O_RDONLY|DFS_O_RDWR|DFS_O_WRONLY)
+
+/* open() mode flags */
+
+#define JFFS2_O_CREAT      (DFS_O_CREAT)   /* Create file it it does not exist */
+#define JFFS2_O_EXCL       (DFS_O_EXCL)    /* Exclusive use */
+#define JFFS2_O_NOCTTY     (DFS_O_NOCTTY)  /* Do not assign a controlling terminal */
+#define JFFS2_O_TRUNC      (DFS_O_TRUNC)   /* Truncate */
+
+/* File status flags used for open() and fcntl() */
+#define JFFS2_O_APPEND     (DFS_O_APPEND)  /* Set append mode */
+#define JFFS2_O_DSYNC      (DFS_O_DSYNC)   /* Synchronized I/O data integrity writes */
+#define JFFS2_O_NONBLOCK   (DFS_O_NONBLOCK)/* No delay */
+#define JFFS2_O_RSYNC      (DFS_O_RSYNC)   /* Synchronized read I/O */
+#define JFFS2_O_SYNC       (DFS_O_SYNC)    /* Synchronized I/O file integrity writes */
+
+
+/*------------------------------------------------------------------------*/
+/* for dfs_jffs2.c                                                        */
+/*------------------------------------------------------------------------*/
+#if defined(__CC_ARM) || defined(MSVC)
 /* File access modes used for open() and fnctl() */
 #define O_RDONLY     (1<<0)   /* Open for reading only */
 #define O_WRONLY     (1<<1)   /* Open for writing only */
@@ -23,31 +52,7 @@
 #define O_RSYNC      (1<<10)   /* Synchronized read I/O */
 #define O_SYNC       (1<<11)   /* Synchronized I/O file integrity writes */
 
-/*------------------------------------------------------------------------*/
-/* for dfs_jffs2.c                                                             */
-/*------------------------------------------------------------------------*/
-/* File access modes used for open() and fnctl() */
-#define JFFS2_O_RDONLY     (1<<0)   /* Open for reading only */
-#define JFFS2_O_WRONLY     (1<<1)   /* Open for writing only */
-#define JFFS2_O_RDWR       (O_RDONLY|O_WRONLY) /* Open for reading and writing */
-
-/* File access mode mask */
-#define JFFS2_O_ACCMODE    (O_RDONLY|O_RDWR|O_WRONLY)
-
-/* open() mode flags */
-
-#define JFFS2_O_CREAT      (1<<3)    /* Create file it it does not exist */
-#define JFFS2_O_EXCL       (1<<4)    /* Exclusive use */
-#define JFFS2_O_NOCTTY     (1<<5)    /* Do not assign a controlling terminal */
-#define JFFS2_O_TRUNC      (1<<6)    /* Truncate */
-
-/* File status flags used for open() and fcntl() */
-#define JFFS2_O_APPEND     (1<<7)    /* Set append mode */
-#define JFFS2_O_DSYNC      (1<<8)    /* Synchronized I/O data integrity writes */
-#define JFFS2_O_NONBLOCK   (1<<9)    /* No delay */
-#define JFFS2_O_RSYNC      (1<<10)   /* Synchronized read I/O */
-#define JFFS2_O_SYNC       (1<<11)   /* Synchronized I/O file integrity writes */
-
 #endif /* CYGONCE_ISO_FCNTL_H multiple inclusion protection */
+#endif
 
 /* EOF fcntl.h */

components/dfs/filesystems/jffs2/kernel/linux/errno.h

@@ -1,2 +1,2 @@
 //#include <errno.h>
-#include "codes.h" //fixme
+#include "port/codes.h" //fixme

components/dfs/filesystems/jffs2/kernel/linux/stat.h

@@ -2,7 +2,7 @@
 #define __LINUX_STAT_H__
 
 
-#include "os_sys_stat.h" //mod by prife
+#include "port/sys/stat.h" //mod by prife
 
 #define S_IRUGO (S_IRUSR|S_IRGRP|S_IROTH)
 #define S_IWUGO (S_IWUSR|S_IWGRP|S_IWOTH)

components/dfs/filesystems/jffs2/porting.c

@@ -1,29 +1,29 @@
-#include <linux/kernel.h>
-#include "nodelist.h"
-
-#include "porting.h"
-
+#include <linux/kernel.h>
+#include "nodelist.h"
+
+#include "porting.h"
+
 time_t jffs2_get_timestamp(void)
 {
     return 0;
-}
-
-void jffs2_get_info_from_sb(void * data, struct jffs2_fs_info * info)
-{
-	struct jffs2_fs_info;
+}
+
+void jffs2_get_info_from_sb(void * data, struct jffs2_fs_info * info)
+{
+	struct jffs2_fs_info;
 	struct super_block *jffs2_sb;
-	struct jffs2_sb_info *c;
-
+	struct jffs2_sb_info *c;
+
 	jffs2_sb = (struct super_block *)(data);
 	c = JFFS2_SB_INFO(jffs2_sb);
 	
 	info->sector_size = c->sector_size; 
 	info->nr_blocks = c->nr_blocks;
-	info->free_size = c->free_size; //fixme need test!	
-}
-
+	info->free_size = c->free_size; //fixme need test!	
+}
+
 int jffs2_porting_stat(cyg_mtab_entry * mte, cyg_dir dir, const char *name,
-		      void * stat_buf)
-{
-	return jffs2_fste.stat(mte, mte->root, name, (struct stat *)stat_buf);	
-}
+		      void * stat_buf)
+{
+	return jffs2_fste.stat(mte, mte->root, name, (struct stat *)stat_buf);	
+}

components/dfs/filesystems/jffs2/src/os-ecos.h

@@ -37,7 +37,7 @@
 //#else
 //#endif
 
-#include "os_sys_stat.h"//#include <sys/types.h>
+#include "port/sys/stat.h"//#include <sys/types.h>
 //#include <fcntl.h>
 //#include <sys/stat.h>
 //#include <errno.h> //fixme