From fdc4fee0360986356f2ffcd0234a9322d785b956 Mon Sep 17 00:00:00 2001 From: bernard Date: Thu, 14 Dec 2017 09:58:40 +0800 Subject: [PATCH 1/4] Update .gitignore file. --- .gitignore | 1 + bsp/simulator/.gitignore | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index f09594098c..681849701b 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ documentation/html *.i *.d tools/kconfig-frontends/kconfig-mconf +packages diff --git a/bsp/simulator/.gitignore b/bsp/simulator/.gitignore index fef6f4cbc8..8f4c8bfe54 100644 --- a/bsp/simulator/.gitignore +++ b/bsp/simulator/.gitignore @@ -42,6 +42,10 @@ _UpgradeReport_Files *.ncb *.suo *.exp +*.sdf *.XML *.user *.def +Backup* +UpgradeLog* +*.filters From 7f367867889bc2fadf9ffb85300adf8078680834 Mon Sep 17 00:00:00 2001 From: bernard Date: Thu, 14 Dec 2017 09:58:59 +0800 Subject: [PATCH 2/4] [GUI Engine] Fix the TRANSPARENT definition issue. --- components/gui/include/rtgui/color.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/gui/include/rtgui/color.h b/components/gui/include/rtgui/color.h index f47189bd84..f3c232e241 100644 --- a/components/gui/include/rtgui/color.h +++ b/components/gui/include/rtgui/color.h @@ -72,7 +72,7 @@ extern const rtgui_color_t default_background; #ifdef TRANSPARENT #undef TRANSPARENT -#define TRANSPARENT 0 +#define TRANSPARENT RTGUI_ARGB(0, 0, 0, 0) #endif extern const rtgui_color_t red; From f0dce375439161763d611286bbb546ac69134b84 Mon Sep 17 00:00:00 2001 From: bernard Date: Thu, 14 Dec 2017 10:16:31 +0800 Subject: [PATCH 3/4] [BSP] Update simulator bsp for MSVC. --- bsp/simulator/.config | 12 ++++++++++-- bsp/simulator/drivers/dfs_win32.c | 4 ++-- bsp/simulator/rtconfig.h | 8 ++++++-- bsp/simulator/rtconfig_project.h | 2 +- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/bsp/simulator/.config b/bsp/simulator/.config index 3a1c2b0908..59895c70dd 100644 --- a/bsp/simulator/.config +++ b/bsp/simulator/.config @@ -59,7 +59,7 @@ CONFIG_RT_CONSOLE_DEVICE_NAME="console" # # C++ features # -CONFIG_RT_USING_CPLUSPLUS=y +# CONFIG_RT_USING_CPLUSPLUS is not set # # Command shell @@ -189,6 +189,7 @@ CONFIG_RTGUI_USING_DEMO=y # system packages # # CONFIG_PKG_USING_PARTITION is not set +CONFIG_RT_USING_PERSIMMON_EXAMPLE=y # CONFIG_PKG_USING_SQLITE is not set # CONFIG_PKG_USING_RTI is not set @@ -232,7 +233,9 @@ CONFIG_RTGUI_USING_DEMO=y # # miscellaneous packages # -# CONFIG_PKG_USING_FASTLZ is not set +CONFIG_PKG_USING_FASTLZ=y +CONFIG_PKG_FASTLZ_PATH="/packages/misc/fastlz" +CONFIG_PKG_FASTLZ_VER="v1.0.0" # CONFIG_PKG_USING_MINILZO is not set # @@ -245,6 +248,11 @@ CONFIG_RTGUI_USING_DEMO=y # # CONFIG_PKG_USING_CODEC is not set # CONFIG_PKG_USING_PLAYER is not set +CONFIG_PKG_USING_PERSIMMON_SRC=y +CONFIG_PKG_PERSIMMON_SRC_PATH="/realthread-packages/persimmon-src" +# CONFIG_PKG_USING_PERSIMMON_SRC_v1_0_0 is not set +CONFIG_PKG_USING_PERSIMMON_LATEST_VERSION=y +CONFIG_PKG_PERSIMMON_SRC_VER="latest_version" # # Network Utilities diff --git a/bsp/simulator/drivers/dfs_win32.c b/bsp/simulator/drivers/dfs_win32.c index b868d421f9..b275751efb 100644 --- a/bsp/simulator/drivers/dfs_win32.c +++ b/bsp/simulator/drivers/dfs_win32.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #if defined(__MINGW32__) && defined(_NO_OLDNAMES) #define O_RDONLY _O_RDONLY @@ -49,7 +49,7 @@ */ #define FILE_PATH_MAX 256 /* the longest file path */ -#define WIN32_DIRDISK_ROOT "./disk" /* "F:\\Project\\svn\\rtt\\trunk\\bsp\\simulator_test" */ +#define WIN32_DIRDISK_ROOT "./disk" typedef struct { HANDLE handle; diff --git a/bsp/simulator/rtconfig.h b/bsp/simulator/rtconfig.h index 84610f07a8..778e3f7d61 100755 --- a/bsp/simulator/rtconfig.h +++ b/bsp/simulator/rtconfig.h @@ -54,7 +54,7 @@ /* C++ features */ -#define RT_USING_CPLUSPLUS +/* RT_USING_CPLUSPLUS is not set */ /* Command shell */ @@ -168,6 +168,7 @@ /* system packages */ /* PKG_USING_PARTITION is not set */ +#define RT_USING_PERSIMMON_EXAMPLE /* PKG_USING_SQLITE is not set */ /* PKG_USING_RTI is not set */ @@ -205,7 +206,7 @@ /* miscellaneous packages */ -/* PKG_USING_FASTLZ is not set */ +#define PKG_USING_FASTLZ /* PKG_USING_MINILZO is not set */ /* example package: hello */ @@ -216,6 +217,9 @@ /* PKG_USING_CODEC is not set */ /* PKG_USING_PLAYER is not set */ +#define PKG_USING_PERSIMMON_SRC +/* PKG_USING_PERSIMMON_SRC_v1_0_0 is not set */ +#define PKG_USING_PERSIMMON_LATEST_VERSION /* Network Utilities */ diff --git a/bsp/simulator/rtconfig_project.h b/bsp/simulator/rtconfig_project.h index bdf1792cd1..02e29c1a65 100644 --- a/bsp/simulator/rtconfig_project.h +++ b/bsp/simulator/rtconfig_project.h @@ -1,7 +1,7 @@ #ifndef RTCONFIG_PROJECT_H__ #define RTCONFIG_PROJECT_H__ -#define RT_HEAP_SIZE (1024*1024*2) +#define RT_HEAP_SIZE (1024*1024*8) #if defined(_MSC_VER) #define NORESOURCE //RT_VESRION in winuser.h From c4b6fa797890add7fe41be72f869e9ff2a0e3a76 Mon Sep 17 00:00:00 2001 From: bernard Date: Thu, 14 Dec 2017 10:47:07 +0800 Subject: [PATCH 4/4] [libc] Add stat definitions for WIN32. --- include/libc/libc_stat.h | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/include/libc/libc_stat.h b/include/libc/libc_stat.h index 36ccd322d5..69871dd101 100644 --- a/include/libc/libc_stat.h +++ b/include/libc/libc_stat.h @@ -3,9 +3,38 @@ #include -#ifdef RT_USING_NEWLIB +#if defined(RT_USING_NEWLIB) /* use header file of newlib */ #include + +#elif defined(_WIN32) +#include + +#define S_IRWXU 00700 +#define S_IRUSR 00400 +#define S_IWUSR 00200 +#define S_IXUSR 00100 + +#define S_IRWXG 00070 +#define S_IRGRP 00040 +#define S_IWGRP 00020 +#define S_IXGRP 00010 + +#define S_IRWXO 00007 +#define S_IROTH 00004 +#define S_IWOTH 00002 +#define S_IXOTH 00001 + +#define S_IFSOCK 0140000 +#define S_IFLNK 0120000 +#define S_IFBLK 0060000 +#define S_IFIFO 0010000 +#define S_ISUID 0004000 +#define S_ISGID 0002000 +#define S_ISVTX 0001000 + +#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) + #else #define S_IFMT 00170000 #define S_IFSOCK 0140000