Merge branch 'master' of https://github.com/RT-Thread/rt-thread

BernardXiong · BernardXiong · commit 369557a981ec · 2015-10-09T08:56:58.000+08:00
diff --git a/bsp/efm32/copy_this_file_dfs_elm.c b/bsp/efm32/copy_this_file_dfs_elm.c
@@ -641,7 +641,6 @@ int dfs_elm_stat(struct dfs_filesystem *fs, const char *path, struct stat *st)
 
 		st->st_size  = file_info.fsize;
 		st->st_mtime = file_info.ftime;
-		st->st_blksize = 512;
 	}
 
 #if _USE_LFN
diff --git a/bsp/simulator/drivers/dfs_win32.c b/bsp/simulator/drivers/dfs_win32.c
@@ -505,8 +505,6 @@ static int dfs_win32_stat(struct dfs_filesystem *fs, const char *path, struct st
         st->st_mtime = time_tmp.QuadPart;
     }
 
-    st->st_blksize = 0;
-
     FindClose(hFind);
 
     return 0;
diff --git a/bsp/simulator/drivers/uart_console.c b/bsp/simulator/drivers/uart_console.c
@@ -97,7 +97,7 @@ static void set_stty(void)
     tcsetattr(STDIN_FILENO, TCSANOW, &newt);
 }
 
-static void restore_stty(void)
+void restore_stty(void)
 {
    /* recover terminal's attribute */
    tcsetattr(STDIN_FILENO, TCSANOW, &oldt);
diff --git a/bsp/simulator/rtconfig.h b/bsp/simulator/rtconfig.h
@@ -99,7 +99,7 @@
 // <bool name="RT_USING_PTHREADS" description="Using POSIX threads library" default="true" />
 // #define RT_USING_PTHREADS
 // <bool name="RT_USING_MODULE" description="Enable Moudle Application" default="true" />
-#define RT_USING_MODULE
+// #define RT_USING_MODULE
 // </section>
 
 // <section name="RT_USING_DFS" description="Device file system" default="true" >
diff --git a/components/dfs/filesystems/devfs/devfs.c b/components/dfs/filesystems/devfs/devfs.c
@@ -213,8 +213,7 @@ int dfs_device_fs_stat(struct dfs_filesystem *fs, const char *path, struct stat
 
         st->st_size  = 0;
         st->st_mtime = 0;
-        st->st_blksize = 512;
-        
+
         return DFS_STATUS_OK;
     }
     else
@@ -238,8 +237,7 @@ int dfs_device_fs_stat(struct dfs_filesystem *fs, const char *path, struct stat
 
             st->st_size  = 0;
             st->st_mtime = 0;
-            st->st_blksize = 512;
-            
+
             return DFS_STATUS_OK;
         }
     }
diff --git a/components/dfs/filesystems/elmfat/dfs_elm.c b/components/dfs/filesystems/elmfat/dfs_elm.c
@@ -738,7 +738,6 @@ int dfs_elm_stat(struct dfs_filesystem *fs, const char *path, struct stat *st)
             st->st_mode &= ~(DFS_S_IWUSR | DFS_S_IWGRP | DFS_S_IWOTH);
 
         st->st_size  = file_info.fsize;
-        st->st_blksize = 512;
 
         /* get st_mtime. */
         {
diff --git a/components/dfs/filesystems/jffs2/dfs_jffs2.c b/components/dfs/filesystems/jffs2/dfs_jffs2.c
@@ -331,7 +331,7 @@ static int dfs_jffs2_open(struct dfs_fd* file)
 		return jffs2_result_to_dfs(result);
     }
 	
-	/* save this pointer, it will be used when calling read()��write(), 
+	/* save this pointer, it will be used when calling read()��write(), 
 	flush(), lessk(), and will be rt_free when calling close()*/
 	file->data = jffs2_file;
 	file->pos = jffs2_file->f_offset; 
@@ -686,7 +686,6 @@ static int dfs_jffs2_stat(struct dfs_filesystem* fs, const char *path, struct st
 	st->st_dev  = 0;
 	st->st_size = s.st_size;
 	st->st_mtime = s.st_mtime;
-	st->st_blksize = 1;//fixme: what's this field?
 
 	return 0;
 }
diff --git a/components/dfs/filesystems/nfs/dfs_nfs.c b/components/dfs/filesystems/nfs/dfs_nfs.c
@@ -850,7 +850,6 @@ int nfs_stat(struct dfs_filesystem *fs, const char *path, struct stat *st)
 
     st->st_size  = info->size;
     st->st_mtime = info->mtime.seconds;
-    st->st_blksize = 512;
 
     xdr_free((xdrproc_t)xdr_GETATTR3res, (char *)&res);
     xdr_free((xdrproc_t)xdr_nfs_fh3, (char *)handle);
diff --git a/components/dfs/filesystems/ramfs/dfs_ramfs.c b/components/dfs/filesystems/ramfs/dfs_ramfs.c
@@ -292,7 +292,6 @@ int dfs_ramfs_stat(struct dfs_filesystem *fs,
 
     st->st_size = dirent->size;
     st->st_mtime = 0;
-    st->st_blksize = 512;
 
     return DFS_STATUS_OK;
 }
diff --git a/components/dfs/filesystems/romfs/dfs_romfs.c b/components/dfs/filesystems/romfs/dfs_romfs.c
@@ -245,7 +245,6 @@ int dfs_romfs_stat(struct dfs_filesystem *fs, const char *path, struct stat *st)
 
 	st->st_size = dirent->size;
 	st->st_mtime = 0;
-	st->st_blksize = 512;
 
 	return DFS_STATUS_OK;
 }
diff --git a/components/dfs/filesystems/uffs/dfs_uffs.c b/components/dfs/filesystems/uffs/dfs_uffs.c
@@ -347,7 +347,7 @@ static int dfs_uffs_open(struct dfs_fd* file)
 		return uffs_result_to_dfs(uffs_get_error());
 	}
 
-	/* save this pointer, it will be used when calling read()��write(),
+	/* save this pointer, it will be used when calling read()��write(),
 	 * flush(), seek(), and will be free when calling close()*/
 
 	file->data = (void *)fd;
@@ -619,7 +619,6 @@ static int dfs_uffs_stat(struct dfs_filesystem* fs, const char *path, struct sta
 	st->st_mtime = s.st_mtime;
 
 	mtd = RT_MTD_NAND_DEVICE(fs->dev_id);
-	st->st_blksize = mtd->page_size;
 
 	return 0;
 }
diff --git a/components/dfs/include/dfs_def.h b/components/dfs/include/dfs_def.h
@@ -261,7 +261,6 @@ struct stat
     rt_uint16_t st_mode;
     rt_uint32_t st_size;
     rt_time_t   st_mtime;
-    rt_uint32_t st_blksize;
 };
 
 struct statfs
diff --git a/components/dfs/src/dfs_file.c b/components/dfs/src/dfs_file.c
@@ -392,7 +392,6 @@ int dfs_file_stat(const char *path, struct stat *buf)
 
         buf->st_size    = 0;
         buf->st_mtime   = 0;
-        buf->st_blksize = 512;
 
         /* release full path */
         rt_free(fullpath);
diff --git a/components/dfs/src/dfs_posix.c b/components/dfs/src/dfs_posix.c
@@ -368,7 +368,6 @@ int fstat(int fildes, struct stat *buf)
 
     buf->st_size    = d->size;
     buf->st_mtime   = 0;
-    buf->st_blksize = 512;
 
     fd_put(d);
 
diff --git a/components/external/SQLite-3.8.1/src/os_rtthread.c b/components/external/SQLite-3.8.1/src/os_rtthread.c
@@ -1728,7 +1728,7 @@ static int fcntlSizeHint(rtthreadFile *pFile, i64 nByte){
       ** is the same technique used by glibc to implement posix_fallocate()
       ** on systems that do not have a real fallocate() system call.
       */
-      int nBlk = buf.st_blksize;  /* File-system block size */
+      int nBlk = 4096; // no blksize in RT-Thread, use 4096. /* File-system block size */
       i64 iWrite;                 /* Next offset to write to */
 
       if( robust_ftruncate(pFile->h, nSize) ){

Original file line number	Diff line number	Diff line change
`@@ -641,7 +641,6 @@ int dfs_elm_stat(struct dfs_filesystem fs, const char path, struct stat *st)`
`641`	`641`
`642`	`642`	`st->st_size = file_info.fsize;`
`643`	`643`	`st->st_mtime = file_info.ftime;`
`644`		`- st->st_blksize = 512;`
`645`	`644`	`}`
`646`	`645`
`647`	`646`	`#if _USE_LFN`
Original file line number	Diff line number	Diff line change
`@@ -505,8 +505,6 @@ static int dfs_win32_stat(struct dfs_filesystem fs, const char path, struct st`
`505`	`505`	`st->st_mtime = time_tmp.QuadPart;`
`506`	`506`	`}`
`507`	`507`
`508`		`- st->st_blksize = 0;`
`509`		`-`
`510`	`508`	`FindClose(hFind);`
`511`	`509`
`512`	`510`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ static void set_stty(void)`
`97`	`97`	`tcsetattr(STDIN_FILENO, TCSANOW, &newt);`
`98`	`98`	`}`
`99`	`99`
`100`		`-static void restore_stty(void)`
	`100`	`+void restore_stty(void)`
`101`	`101`	`{`
`102`	`102`	`/* recover terminal's attribute */`
`103`	`103`	`tcsetattr(STDIN_FILENO, TCSANOW, &oldt);`
Original file line number	Diff line number	Diff line change
`@@ -213,8 +213,7 @@ int dfs_device_fs_stat(struct dfs_filesystem fs, const char path, struct stat`
`213`	`213`
`214`	`214`	`st->st_size = 0;`
`215`	`215`	`st->st_mtime = 0;`
`216`		`- st->st_blksize = 512;`
`217`		`-`
	`216`	`+`
`218`	`217`	`return DFS_STATUS_OK;`
`219`	`218`	`}`
`220`	`219`	`else`
`@@ -238,8 +237,7 @@ int dfs_device_fs_stat(struct dfs_filesystem fs, const char path, struct stat`
`238`	`237`
`239`	`238`	`st->st_size = 0;`
`240`	`239`	`st->st_mtime = 0;`
`241`		`- st->st_blksize = 512;`
`242`		`-`
	`240`	`+`
`243`	`241`	`return DFS_STATUS_OK;`
`244`	`242`	`}`
`245`	`243`	`}`
Original file line number	Diff line number	Diff line change
`@@ -738,7 +738,6 @@ int dfs_elm_stat(struct dfs_filesystem fs, const char path, struct stat *st)`
`738`	`738`	`st->st_mode &= ~(DFS_S_IWUSR \| DFS_S_IWGRP \| DFS_S_IWOTH);`
`739`	`739`
`740`	`740`	`st->st_size = file_info.fsize;`
`741`		`- st->st_blksize = 512;`
`742`	`741`
`743`	`742`	`/* get st_mtime. */`
`744`	`743`	`{`
Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ static int dfs_jffs2_open(struct dfs_fd* file)`
`331`	`331`	`return jffs2_result_to_dfs(result);`
`332`	`332`	`}`
`333`	`333`
`334`		`- /* save this pointer, it will be used when calling read()£¬write(),`
	`334`	`+ /* save this pointer, it will be used when calling read()��write(),`
`335`	`335`	`flush(), lessk(), and will be rt_free when calling close()*/`
`336`	`336`	`file->data = jffs2_file;`
`337`	`337`	`file->pos = jffs2_file->f_offset;`
`@@ -686,7 +686,6 @@ static int dfs_jffs2_stat(struct dfs_filesystem* fs, const char *path, struct st`
`686`	`686`	`st->st_dev = 0;`
`687`	`687`	`st->st_size = s.st_size;`
`688`	`688`	`st->st_mtime = s.st_mtime;`
`689`		`- st->st_blksize = 1;//fixme: what's this field?`
`690`	`689`
`691`	`690`	`return 0;`
`692`	`691`	`}`
Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,6 @@ int dfs_ramfs_stat(struct dfs_filesystem *fs,`
`292`	`292`
`293`	`293`	`st->st_size = dirent->size;`
`294`	`294`	`st->st_mtime = 0;`
`295`		`- st->st_blksize = 512;`
`296`	`295`
`297`	`296`	`return DFS_STATUS_OK;`
`298`	`297`	`}`
Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,6 @@ int dfs_romfs_stat(struct dfs_filesystem fs, const char path, struct stat *st)`
`245`	`245`
`246`	`246`	`st->st_size = dirent->size;`
`247`	`247`	`st->st_mtime = 0;`
`248`		`- st->st_blksize = 512;`
`249`	`248`
`250`	`249`	`return DFS_STATUS_OK;`
`251`	`250`	`}`