#include "../SDL_sysvideo.h"
#include "../SDL_pixels_c.h"
#include "../../events/SDL_events_c.h"
-#include "linux/fbdev.h"
-#include "linux/oshide.h"
#include "omapsdl.h"
-struct SDL_PrivateVideoData {
- struct vout_fbdev *fbdev;
-// void *fbmem;
-};
-
static int omap_available(void)
{
trace();
{
trace();
- if (this->hidden->fbdev != NULL) {
- vout_fbdev_finish(this->hidden->fbdev);
- this->hidden->fbdev = NULL;
-
- oshide_finish();
- }
+ osdl_video_finish(this->hidden);
this->screen->pixels = NULL;
omapsdl_input_finish();
}
static SDL_Rect omap_mode_list[] = {
// XXX: we are not really restricted to fixed modes
// FIXME: should really check the display for max supported
- { 0, 0, 800, 480 },
- { 0, 0, 720, 480 },
- { 0, 0, 640, 480 },
- { 0, 0, 640, 400 },
- { 0, 0, 512, 384 },
- { 0, 0, 320, 240 },
- { 0, 0, 320, 200 },
+ { 0, 0, 1600, 1200 },
+ { 0, 0, 1408, 1056 },
+ { 0, 0, 1280, 1024 },
+ { 0, 0, 1152, 864 },
+ { 0, 0, 1024, 768 },
+ { 0, 0, 960, 720 },
+ { 0, 0, 800, 600 },
+ { 0, 0, 768, 576 },
+ { 0, 0, 720, 576 },
+ { 0, 0, 800, 480 },
+ { 0, 0, 720, 480 },
+ { 0, 0, 640, 480 },
+ { 0, 0, 640, 400 },
+ { 0, 0, 512, 384 },
+ { 0, 0, 320, 240 },
+ { 0, 0, 320, 200 },
};
// broken API needs this
static SDL_Rect *omap_modes[] = {
{
trace("%d, %d, %d, %08x", width, height, bpp, flags);
- if (this->hidden->fbdev == NULL) {
- this->hidden->fbdev = vout_fbdev_init("/dev/fb0", &width, &height, 0);
- if (this->hidden->fbdev == NULL)
- return NULL;
-
- oshide_init();
- }
- else {
- if (vout_fbdev_resize(this->hidden->fbdev, width, height, 0, 0, 0, 0, 0) < 0)
- return NULL;
- }
+ if (osdl_video_set_mode(this->hidden, width, height, bpp) < 0)
+ return NULL;
if (!SDL_ReallocFormat(current, 16, 0xf800, 0x07e0, 0x001f, 0))
return NULL;
current->h = height;
current->pitch = SDL_CalculatePitch(current);
- current->pixels = vout_fbdev_flip(this->hidden->fbdev);
+ current->pixels = osdl_video_flip(this->hidden);
return current;
}
-static void *flip_it(struct vout_fbdev *fbdev)
-{
- if (gcfg_force_vsync)
- vout_fbdev_wait_vsync(fbdev);
-
- return vout_fbdev_flip(fbdev);
-}
-
static int omap_LockHWSurface(SDL_VideoDevice *this, SDL_Surface *surface)
{
trace("%p", surface);
{
trace("%p", surface);
- surface->pixels = flip_it(this->hidden->fbdev);
+ surface->pixels = osdl_video_flip(this->hidden);
return 0;
}
+/* we can't do hw surfaces (besides screen one) yet */
+static int omap_AllocHWSurface(SDL_VideoDevice *this, SDL_Surface *surface)
+{
+ trace("%p", surface);
+ return -1;
+}
+
+static void omap_FreeHWSurface(SDL_VideoDevice *this, SDL_Surface *surface)
+{
+ trace("%p", surface);
+}
+
static int omap_SetColors(SDL_VideoDevice *this, int firstcolor, int ncolors, SDL_Color *colors)
{
trace("%d, %d, %p", firstcolor, ncolors, colors);
}
}
- if (this->hidden->fbdev)
- this->screen->pixels = flip_it(this->hidden->fbdev);
+ this->screen->pixels = osdl_video_flip(this->hidden);
}
static void omap_InitOSKeymap(SDL_VideoDevice *this)
this->LockHWSurface = omap_LockHWSurface;
this->UnlockHWSurface = omap_UnlockHWSurface;
this->FlipHWSurface = omap_FlipHWSurface;
+ this->AllocHWSurface = omap_AllocHWSurface;
+ this->FreeHWSurface = omap_FreeHWSurface;
this->SetColors = omap_SetColors;
this->UpdateRects = omap_UpdateRects;
this->VideoQuit = omap_VideoQuit;