libs/rt-thread
libs/rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1272 from RT-Thread/fix_simulator

Browse Source 
Fix the control interface and GUI initialization
This commit is contained in:
Bernard Xiong 2018-03-11 15:11:07 +08:00 committed by GitHub
commit 0b5ac759e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bsp/simulator/applications/application.c
View File

@ -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)
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();

5
bsp/simulator/applications/platform.c
View File

@ -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);

2
bsp/simulator/drivers/sdl_fb.c
View File

@ -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;