Merge nyus.joshuawise.com:/storage/git/netwatch

[netwatch.git] / include / fb.h

diff --git a/include/fb.h b/include/fb.h
index 19dae0bb65ee481814483f7e048d8ab38287c98a..79f05b510ab2f282775f4f695003b8b04873a75d 100644 (file)
--- a/include/fb.h
+++ b/include/fb.h
@@ -12,6 +12,7 @@ typedef enum {
 
 typedef void (*getvmode_t)(void *);
 typedef uint32_t (*checksum_rect_t)(int x, int y, int width, int height);
 
 typedef void (*getvmode_t)(void *);
 typedef uint32_t (*checksum_rect_t)(int x, int y, int width, int height);

+typedef void (*copy_pixels_t)(char *buf, int x, int y, int width, int height);

 
 struct vmode {
        int text:1;
 
 struct vmode {
        int text:1;


@@ -21,9 +22,11 @@ struct vmode {
 
 struct fbdevice {
        unsigned char *fbaddr;
 
 struct fbdevice {
        unsigned char *fbaddr;

+       unsigned char *textbase;        /* A safe place to put a textfb. */

        void *priv;
        getvmode_t getvmode;
        checksum_rect_t checksum_rect;
        void *priv;
        getvmode_t getvmode;
        checksum_rect_t checksum_rect;

+       copy_pixels_t copy_pixels;

        struct vmode curmode;
 };
 
        struct vmode curmode;
 };