update common code to latest from PCSX rearmed

[sdl_omap.git] / src / video / omapdss / omapsdl.h

diff --git a/src/video/omapdss/omapsdl.h b/src/video/omapdss/omapsdl.h
index b59533e..5e73782 100644 (file)
--- a/src/video/omapdss/omapsdl.h
+++ b/src/video/omapdss/omapsdl.h
@@ -7,8 +7,16 @@
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
 
-#define err(fmt, ...) fprintf(stderr, "omapsdl: " fmt "\n", ##__VA_ARGS__)
-#define not_supported() fprintf(stderr, "omapsdl: %s not supported\n", __FUNCTION__)
+#define err(fmt, ...) \
+       fprintf(stderr, "omapsdl: " fmt "\n", ##__VA_ARGS__)
+#define err_perror(fmt, ...) do { \
+       fprintf(stderr, "omapsdl: " fmt ": ", ##__VA_ARGS__); \
+       perror(NULL); \
+} while (0)
+#define log(fmt, ...) \
+       fprintf(stdout, "omapsdl: " fmt "\n", ##__VA_ARGS__)
+#define not_supported() \
+       fprintf(stderr, "omapsdl: %s not supported\n", __FUNCTION__)
 #if 0
 #define trace(fmt, ...) printf(" %s(" fmt ")\n", __FUNCTION__, ##__VA_ARGS__)
 #define dbg err
@@ -20,11 +28,13 @@
 struct SDL_PrivateVideoData {
        struct vout_fbdev *fbdev;
        void *saved_layer;
-       unsigned int oshide_done:1;
+       int screen_w, screen_h;
+       unsigned int xenv_up:1;
 };
 
 int   osdl_video_set_mode(struct SDL_PrivateVideoData *pdata, int width, int height, int bpp);
 void *osdl_video_flip(struct SDL_PrivateVideoData *pdata);
+int   osdl_video_detect_screen(struct SDL_PrivateVideoData *pdata);
 void  osdl_video_finish(struct SDL_PrivateVideoData *pdata);
 
 void omapsdl_input_init(void);