From f0dce375439161763d611286bbb546ac69134b84 Mon Sep 17 00:00:00 2001 From: bernard Date: Thu, 14 Dec 2017 10:16:31 +0800 Subject: [PATCH] [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 3a1c2b090..59895c70d 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 b868d421f..b275751ef 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 84610f07a..778e3f7d6 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 bdf1792cd..02e29c1a6 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