diff options
author | Antony Pavlov <antonynpavlov@gmail.com> | 2016-10-19 11:44:37 +0300 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-10-19 12:22:13 +0200 |
commit | 0e1b3c4a15f75ec8a10fc205981707ef00cbd132 (patch) | |
tree | e0ab2fc009a8711a3adaf46e83ce883eb481523c /arch/sandbox | |
parent | eca7871bced78837154ad52c42864ba3c87a9904 (diff) | |
download | barebox-0e1b3c4a15f75ec8a10fc205981707ef00cbd132.tar.gz barebox-0e1b3c4a15f75ec8a10fc205981707ef00cbd132.tar.xz |
sandbox: eliminate sdl_init()
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/sandbox')
-rw-r--r-- | arch/sandbox/mach-sandbox/include/mach/linux.h | 1 | ||||
-rw-r--r-- | arch/sandbox/os/sdl.c | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/arch/sandbox/mach-sandbox/include/mach/linux.h b/arch/sandbox/mach-sandbox/include/mach/linux.h index 1e53f69ad7..1f11ed4498 100644 --- a/arch/sandbox/mach-sandbox/include/mach/linux.h +++ b/arch/sandbox/mach-sandbox/include/mach/linux.h @@ -30,7 +30,6 @@ struct linux_console_data { extern int sdl_xres; extern int sdl_yres; -int sdl_init(void); void sdl_close(void); int sdl_open(int xres, int yres, int bpp, void* buf); void sdl_stop_timer(void); diff --git a/arch/sandbox/os/sdl.c b/arch/sandbox/os/sdl.c index ec538e9af9..9a35279eb7 100644 --- a/arch/sandbox/os/sdl.c +++ b/arch/sandbox/os/sdl.c @@ -23,11 +23,6 @@ static SDL_Surface *real_screen; static void *buffer = NULL; pthread_t th; -int sdl_init(void) -{ - return SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE); -} - static void sdl_copy_buffer(SDL_Surface *screen) { if (SDL_MUSTLOCK(screen)) { @@ -84,7 +79,7 @@ int sdl_open(int xres, int yres, int bpp, void* buf) { int flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL; - if (sdl_init() < 0) { + if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE) < 0) { printf("Could not initialize SDL: %s.\n", SDL_GetError()); return -1; } |