From 66e9befde73b175221ea07e69173f41cabb14285 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Sun, 24 Jun 2012 01:07:01 +0200 Subject: [PATCH] uterm: add internal header for blitting support Whoops, forgot to add it in the fbdev commit. Pushing it now so it works again. Signed-off-by: David Herrmann --- src/uterm_internal.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/uterm_internal.h b/src/uterm_internal.h index d40170b..04939b7 100644 --- a/src/uterm_internal.h +++ b/src/uterm_internal.h @@ -55,6 +55,10 @@ struct display_ops { int (*set_dpms) (struct uterm_display *disp, int state); int (*use) (struct uterm_display *disp); int (*swap) (struct uterm_display *disp); + int (*blit) (struct uterm_display *disp, + const struct uterm_video_buffer *buf, + unsigned int x, unsigned int y, + unsigned int width, unsigned int height); }; struct video_ops { @@ -144,7 +148,8 @@ static const struct video_ops drm_video_ops; #include struct fbdev_mode { - int unused; + unsigned int width; + unsigned int height; }; struct fbdev_display { @@ -159,7 +164,7 @@ struct fbdev_display { size_t xres; size_t yres; size_t len; - void *map; + uint8_t *map; unsigned int stride; unsigned int bpp; }; @@ -222,6 +227,7 @@ int mode_new(struct uterm_mode **out, const struct mode_ops *ops); #define DISPLAY_VSYNC 0x02 #define DISPLAY_AVAILABLE 0x04 #define DISPLAY_OPEN 0x08 +#define DISPLAY_DBUF 0x10 struct uterm_display { unsigned long ref;