未验证 提交 0b5ac759 编写于 作者: B Bernard Xiong 提交者: GitHub

Merge pull request #1272 from RT-Thread/fix_simulator

Fix the control interface and GUI initialization
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <board.h> #include <board.h>
extern int platform_init(void); extern int platform_init(void);
extern int platform_post_init(void);
extern int mnt_init(void); extern int mnt_init(void);
void rt_init_thread_entry(void *parameter) void rt_init_thread_entry(void *parameter)
...@@ -36,7 +37,9 @@ void rt_init_thread_entry(void *parameter) ...@@ -36,7 +37,9 @@ void rt_init_thread_entry(void *parameter)
platform_init(); platform_init();
mnt_init(); mnt_init();
#if defined(PKG_USING_GUIENGINE) && defined(RTGUI_USING_DEMO) platform_post_init();
#if defined(PKG_USING_GUIENGINE) && defined(GUIENGINE_USING_DEMO)
{ {
extern int rt_gui_demo_init(void); extern int rt_gui_demo_init(void);
rt_gui_demo_init(); rt_gui_demo_init();
......
...@@ -29,6 +29,11 @@ int platform_init(void) ...@@ -29,6 +29,11 @@ int platform_init(void)
#endif /* RT_USING_DFS */ #endif /* RT_USING_DFS */
return 0;
}
int platform_post_init(void)
{
#ifdef PKG_USING_GUIENGINE #ifdef PKG_USING_GUIENGINE
{ {
extern void rt_hw_sdl_start(void); extern void rt_hw_sdl_start(void);
......
...@@ -73,7 +73,7 @@ int sdlfb_info(int *format, int *bpp) ...@@ -73,7 +73,7 @@ int sdlfb_info(int *format, int *bpp)
} }
static rt_mutex_t sdllock; static rt_mutex_t sdllock;
static rt_err_t sdlfb_control(rt_device_t dev, rt_uint8_t cmd, void *args) static rt_err_t sdlfb_control(rt_device_t dev, int cmd, void *args)
{ {
struct sdlfb_device *device; struct sdlfb_device *device;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册