libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

simulator: fix SDL initialization under Linux 

rt_hw_sdl_start should wait untill the rtgui_graphic_set_device is
called int the sdl_loop. Use pthread_cond_wait to achieve this in Linux.
This commit is contained in:
Grissiom 2013-08-31 16:30:32 +08:00
parent f7f14cf566
commit 3d0c0af371
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -152,8 +152,12 @@ static void sdlfb_hw_init(void)
#ifdef _WIN32 #ifdef _WIN32
static HANDLE sdl_ok_event = NULL; static HANDLE sdl_ok_event = NULL;
static DWORD WINAPI sdl_loop(LPVOID lpParam) static DWORD WINAPI sdl_loop(LPVOID lpParam)
#else #else
static pthread_mutex_t sdl_ok_mutex;
static pthread_cond_t sdl_ok_event;
static void *sdl_loop(void *lpParam) static void *sdl_loop(void *lpParam)
#endif #endif
{ {
@ -167,14 +171,19 @@ static void *sdl_loop(void *lpParam)
/* set the getchar without buffer */ /* set the getchar without buffer */
sigfillset(&sigmask); sigfillset(&sigmask);
pthread_sigmask(SIG_BLOCK, &sigmask, &oldmask); pthread_sigmask(SIG_BLOCK, &sigmask, &oldmask);
pthread_mutex_lock(&sdl_ok_mutex);
#endif #endif
sdlfb_hw_init(); sdlfb_hw_init();
device = rt_device_find("sdl"); device = rt_device_find("sdl");
RT_ASSERT(device);
rtgui_graphic_set_device(device); rtgui_graphic_set_device(device);
#ifdef _WIN32 #ifdef _WIN32
SetEvent(sdl_ok_event); SetEvent(sdl_ok_event);
#else
pthread_cond_signal(&sdl_ok_event);
pthread_mutex_unlock(&sdl_ok_mutex);
#endif #endif
/* handle SDL event */ /* handle SDL event */
while (!quit) while (!quit)
@ -338,11 +347,20 @@ void rt_hw_sdl_start(void)
/* Linux */ /* Linux */
pthread_t pid; pthread_t pid;
int res; int res;
pthread_mutex_init(&sdl_ok_mutex, NULL);
pthread_cond_init(&sdl_ok_event, NULL);
res = pthread_create(&pid, NULL, &sdl_loop, NULL); res = pthread_create(&pid, NULL, &sdl_loop, NULL);
if (res) if (res)
{ {
printf("pthread create sdl thread faild, <%d>\n", res); printf("pthread create sdl thread faild, <%d>\n", res);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
pthread_mutex_lock(&sdl_ok_mutex);
pthread_cond_wait(&sdl_ok_event, &sdl_ok_mutex);
pthread_mutex_destroy(&sdl_ok_mutex);
pthread_cond_destroy(&sdl_ok_event);
#endif #endif
} }