diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:13:00 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:13:00 +0200 |
| commit | d7609640e7cb9d213b9d3cbcf9394c677719d369 (patch) | |
| tree | 1487faa310e5f6dd91a5d033644abb470b8f3719 /arch/sandbox/mach-sandbox/include/mach/linux.h | |
| parent | d1e65d2a7bd9162e7009da870adb15c70b620320 (diff) | |
| parent | 9d73b518fc3c61640123f8499aab7f8373e41dbd (diff) | |
| download | barebox-d7609640e7cb9d213b9d3cbcf9394c677719d369.tar.gz barebox-d7609640e7cb9d213b9d3cbcf9394c677719d369.tar.xz | |
Merge branch 'for-next/sandbox'
Conflicts:
arch/sandbox/mach-sandbox/include/mach/linux.h
Diffstat (limited to 'arch/sandbox/mach-sandbox/include/mach/linux.h')
| -rw-r--r-- | arch/sandbox/mach-sandbox/include/mach/linux.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/sandbox/mach-sandbox/include/mach/linux.h b/arch/sandbox/mach-sandbox/include/mach/linux.h index 259f2d8ee3..50d2721f77 100644 --- a/arch/sandbox/mach-sandbox/include/mach/linux.h +++ b/arch/sandbox/mach-sandbox/include/mach/linux.h @@ -4,6 +4,9 @@ struct device_d; int sandbox_add_device(struct device_d *dev); + +struct fb_bitfield; + int linux_register_device(const char *name, void *start, void *end); int tap_alloc(char *dev); uint64_t linux_get_time(void); @@ -23,4 +26,15 @@ struct linux_console_data { unsigned int flags; }; +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); +void sdl_start_timer(void); +void sdl_get_bitfield_rgba(struct fb_bitfield *r, struct fb_bitfield *g, + struct fb_bitfield *b, struct fb_bitfield *a); +void sdl_setpixel(int x, int y, uint8_t r, uint8_t g, uint8_t b, uint8_t a); + #endif /* __ASM_ARCH_LINUX_H */ |