This commit was manufactured by cvs2svn to create tag
[linux-2.6.git] / drivers / video / cirrusfb.c
index 82c26b1..237ec2e 100644 (file)
@@ -1,13 +1,10 @@
 /*
- * drivers/video/cirrusfb.c - driver for Cirrus Logic chipsets
+ * drivers/video/clgenfb.c - driver for Cirrus Logic chipsets
  *
  * Copyright 1999-2001 Jeff Garzik <jgarzik@pobox.com>
  *
  * Contributors (thanks, all!)
  *
- *     David Eger:
- *     Overhaul for Linux 2.6
- *
  *      Jeff Rugen:
  *      Major contributions;  Motorola PowerStack (PPC and PCI) support,
  *      GD54xx, 1280x1024 mode support, change MCLK based on VCLK.
@@ -18,9 +15,9 @@
  *     Lars Hecking:
  *     Amiga updates and testing.
  *
- * Original cirrusfb author:  Frank Neumann
+ * Original clgenfb author:  Frank Neumann
  *
- * Based on retz3fb.c and cirrusfb.c:
+ * Based on retz3fb.c and clgen.c:
  *      Copyright (C) 1997 Jes Sorensen
  *      Copyright (C) 1996 Frank Neumann
  *
@@ -34,7 +31,7 @@
  *
  */
 
-#define CIRRUSFB_VERSION "2.0-pre2"
+#define CLGEN_VERSION "1.9.9.1"
 
 #include <linux/config.h>
 #include <linux/module.h>
 #define isPReP 0
 #endif
 
-#include "video/vga.h"
-#include "video/cirrus.h"
+#include <video/fbcon.h>
+#include <video/fbcon-mfb.h>
+#include <video/fbcon-cfb8.h>
+#include <video/fbcon-cfb16.h>
+#include <video/fbcon-cfb24.h>
+#include <video/fbcon-cfb32.h>
+
+#include "clgenfb.h"
+#include "vga.h"
 
 
 /*****************************************************************
  */
 
 /* enable debug output? */
-/* #define CIRRUSFB_DEBUG 1 */
+/* #define CLGEN_DEBUG 1 */
 
 /* disable runtime assertions? */
-/* #define CIRRUSFB_NDEBUG */
+/* #define CLGEN_NDEBUG */
 
 /* debug output */
-#ifdef CIRRUSFB_DEBUG
+#ifdef CLGEN_DEBUG
 #define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args)
 #else
 #define DPRINTK(fmt, args...)
 #endif
 
 /* debugging assertions */
-#ifndef CIRRUSFB_NDEBUG
+#ifndef CLGEN_NDEBUG
 #define assert(expr) \
         if(!(expr)) { \
         printk( "Assertion failed! %s,%s,%s,line=%d\n",\
@@ -132,22 +136,24 @@ typedef enum {
        BT_ALPINE,      /* GD543x/4x */
        BT_GD5480,
        BT_LAGUNA,      /* GD546x */
-} cirrusfb_board_t;
+} clgen_board_t;
 
 
 /*
  * per-board-type information, used for enumerating and abstracting
  * chip-specific information
- * NOTE: MUST be in the same order as cirrusfb_board_t in order to
+ * NOTE: MUST be in the same order as clgen_board_t in order to
  * use direct indexing on this array
  * NOTE: '__initdata' cannot be used as some of this info
  * is required at runtime.  Maybe separate into an init-only and
  * a run-time table?
  */
-static const struct cirrusfb_board_info_rec {
+static const struct clgen_board_info_rec {
+       clgen_board_t btype;    /* chipset enum, not strictly necessary, as
+                                * clgen_board_info[] is directly indexed
+                                * by this value */
        char *name;             /* ASCII name of chipset */
-       long maxclock[5];               /* maximum video clock */
-       /* for  1/4bpp, 8bpp 15/16bpp, 24bpp, 32bpp - numbers from xorg code */
+       long maxclock;          /* maximum video clock */
        unsigned init_sr07 : 1; /* init SR07 during init_vgachip() */
        unsigned init_sr1f : 1; /* write SR1F during init_vgachip() */
        unsigned scrn_start_bit19 : 1; /* construct bit 19 of screen start address */
@@ -160,192 +166,164 @@ static const struct cirrusfb_board_info_rec {
        unsigned char sr07_8bpp_mux;
 
        unsigned char sr1f;     /* SR1F VGA initial register value */
-} cirrusfb_board_info[] = {
-       [BT_SD64] = {
-               .name                   = "CL SD64",
-               .maxclock               = {
-                       /* guess */
-                       /* the SD64/P4 have a higher max. videoclock */
-                       140000, 140000, 140000, 140000, 140000,
-               },
-               .init_sr07              = TRUE,
-               .init_sr1f              = TRUE,
-               .scrn_start_bit19       = TRUE,
-               .sr07                   = 0xF0,
-               .sr07_1bpp              = 0xF0,
-               .sr07_8bpp              = 0xF1,
-               .sr1f                   = 0x20
-       },
-       [BT_PICCOLO] = {
-               .name                   = "CL Piccolo",
-               .maxclock               = {
-                       /* guess */
-                       90000, 90000, 90000, 90000, 90000
-               },
-               .init_sr07              = TRUE,
-               .init_sr1f              = TRUE,
-               .scrn_start_bit19       = FALSE,
-               .sr07                   = 0x80,
-               .sr07_1bpp              = 0x80,
-               .sr07_8bpp              = 0x81,
-               .sr1f                   = 0x22
-       },
-       [BT_PICASSO] = {
-               .name                   = "CL Picasso",
-               .maxclock               = {
-                       /* guess */
-                       90000, 90000, 90000, 90000, 90000
-               },
-               .init_sr07              = TRUE,
-               .init_sr1f              = TRUE,
-               .scrn_start_bit19       = FALSE,
-               .sr07                   = 0x20,
-               .sr07_1bpp              = 0x20,
-               .sr07_8bpp              = 0x21,
-               .sr1f                   = 0x22
-       },
-       [BT_SPECTRUM] = {
-               .name                   = "CL Spectrum",
-               .maxclock               = {
-                       /* guess */
-                       90000, 90000, 90000, 90000, 90000
-               },
-               .init_sr07              = TRUE,
-               .init_sr1f              = TRUE,
-               .scrn_start_bit19       = FALSE,
-               .sr07                   = 0x80,
-               .sr07_1bpp              = 0x80,
-               .sr07_8bpp              = 0x81,
-               .sr1f                   = 0x22
-       },
-       [BT_PICASSO4] = {
-               .name                   = "CL Picasso4",
-               .maxclock               = {
-                       135100, 135100, 85500, 85500, 0
-               },
-               .init_sr07              = TRUE,
-               .init_sr1f              = FALSE,
-               .scrn_start_bit19       = TRUE,
-               .sr07                   = 0x20,
-               .sr07_1bpp              = 0x20,
-               .sr07_8bpp              = 0x21,
-               .sr1f                   = 0
-       },
-       [BT_ALPINE] = {
-               .name                   = "CL Alpine",
-               .maxclock               = {
-                       /* for the GD5430.  GD5446 can do more... */
-                       85500, 85500, 50000, 28500, 0
-               },
-               .init_sr07              = TRUE,
-               .init_sr1f              = TRUE,
-               .scrn_start_bit19       = TRUE,
-               .sr07                   = 0xA0,
-               .sr07_1bpp              = 0xA1,
-               .sr07_1bpp_mux          = 0xA7,
-               .sr07_8bpp              = 0xA1,
-               .sr07_8bpp_mux          = 0xA7,
-               .sr1f                   = 0x1C
-       },
-       [BT_GD5480] = {
-               .name                   = "CL GD5480",
-               .maxclock               = {
-                       135100, 200000, 200000, 135100, 135100
-               },
-               .init_sr07              = TRUE,
-               .init_sr1f              = TRUE,
-               .scrn_start_bit19       = TRUE,
-               .sr07                   = 0x10,
-               .sr07_1bpp              = 0x11,
-               .sr07_8bpp              = 0x11,
-               .sr1f                   = 0x1C
-       },
-       [BT_LAGUNA] = {
-               .name                   = "CL Laguna",
-               .maxclock               = {
-                       /* guess */
-                       135100, 135100, 135100, 135100, 135100,
-               },
-               .init_sr07              = FALSE,
-               .init_sr1f              = FALSE,
-               .scrn_start_bit19       = TRUE,
-       }
+} clgen_board_info[] = {
+       { BT_NONE, }, /* dummy record */
+       { BT_SD64,
+               "CL SD64",
+               140000,         /* the SD64/P4 have a higher max. videoclock */
+               TRUE,
+               TRUE,
+               TRUE,
+               0xF0,
+               0xF0,
+               0,              /* unused, does not multiplex */
+               0xF1,
+               0,              /* unused, does not multiplex */
+               0x20 },
+       { BT_PICCOLO,
+               "CL Piccolo",
+               90000,
+               TRUE,
+               TRUE,
+               FALSE,
+               0x80,
+               0x80,
+               0,              /* unused, does not multiplex */
+               0x81,
+               0,              /* unused, does not multiplex */
+               0x22 },
+       { BT_PICASSO,
+               "CL Picasso",
+               90000,
+               TRUE,
+               TRUE,
+               FALSE,
+               0x20,
+               0x20,
+               0,              /* unused, does not multiplex */
+               0x21,
+               0,              /* unused, does not multiplex */
+               0x22 },
+       { BT_SPECTRUM,
+               "CL Spectrum",
+               90000,
+               TRUE,
+               TRUE,
+               FALSE,
+               0x80,
+               0x80,
+               0,              /* unused, does not multiplex */
+               0x81,
+               0,              /* unused, does not multiplex */
+               0x22 },
+       { BT_PICASSO4,
+               "CL Picasso4",
+               140000,         /* the SD64/P4 have a higher max. videoclock */
+               TRUE,
+               FALSE,
+               TRUE,
+               0x20,
+               0x20,
+               0,              /* unused, does not multiplex */
+               0x21,
+               0,              /* unused, does not multiplex */
+               0 },
+       { BT_ALPINE,
+               "CL Alpine",
+               110000,         /* 135100 for some, 85500 for others */
+               TRUE,
+               TRUE,
+               TRUE,
+               0xA0,
+               0xA1,
+               0xA7,
+               0xA1,
+               0xA7,
+               0x1C },
+       { BT_GD5480,
+               "CL GD5480",
+               90000,
+               TRUE,
+               TRUE,
+               TRUE,
+               0x10,
+               0x11,
+               0,              /* unused, does not multiplex */
+               0x11,
+               0,              /* unused, does not multiplex */
+               0x1C },
+       { BT_LAGUNA,
+               "CL Laguna",
+               135100,
+               FALSE,
+               FALSE,
+               TRUE,
+               0,              /* unused */
+               0,              /* unused */
+               0,              /* unused */
+               0,              /* unused */
+               0,              /* unused */
+               0 },            /* unused */
 };
 
 
 #ifdef CONFIG_PCI
-#define CHIP(id, btype) \
-       { PCI_VENDOR_ID_CIRRUS, PCI_DEVICE_ID_##id, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (btype) }
-
-static struct pci_device_id cirrusfb_pci_table[] = {
-       CHIP( CIRRUS_5436,      BT_ALPINE ),
-       CHIP( CIRRUS_5434_8,    BT_ALPINE ),
-       CHIP( CIRRUS_5434_4,    BT_ALPINE ),
-       CHIP( CIRRUS_5430,      BT_ALPINE ), /* GD-5440 has identical id */
-       CHIP( CIRRUS_7543,      BT_ALPINE ),
-       CHIP( CIRRUS_7548,      BT_ALPINE ),
-       CHIP( CIRRUS_5480,      BT_GD5480 ), /* MacPicasso probably */
-       CHIP( CIRRUS_5446,      BT_PICASSO4 ), /* Picasso 4 is a GD5446 */
-       CHIP( CIRRUS_5462,      BT_LAGUNA ), /* CL Laguna */
-       CHIP( CIRRUS_5464,      BT_LAGUNA ), /* CL Laguna 3D */
-       CHIP( CIRRUS_5465,      BT_LAGUNA ), /* CL Laguna 3DA*/
-       { 0, }
+/* the list of PCI devices for which we probe, and the
+ * order in which we do it */
+static const struct {
+       clgen_board_t btype;
+       const char *nameOverride; /* XXX unused... for now */
+       unsigned short device;
+} clgen_pci_probe_list[] __initdata = {
+       { BT_ALPINE, NULL, PCI_DEVICE_ID_CIRRUS_5436 },
+       { BT_ALPINE, NULL, PCI_DEVICE_ID_CIRRUS_5434_8 },
+       { BT_ALPINE, NULL, PCI_DEVICE_ID_CIRRUS_5434_4 },
+       { BT_ALPINE, NULL, PCI_DEVICE_ID_CIRRUS_5430 }, /* GD-5440 has identical id */
+       { BT_ALPINE, NULL, PCI_DEVICE_ID_CIRRUS_7543 },
+       { BT_ALPINE, NULL, PCI_DEVICE_ID_CIRRUS_7548 },
+       { BT_GD5480, NULL, PCI_DEVICE_ID_CIRRUS_5480 }, /* MacPicasso probably */
+       { BT_PICASSO4, NULL, PCI_DEVICE_ID_CIRRUS_5446 }, /* Picasso 4 is a GD5446 */
+       { BT_LAGUNA, "CL Laguna", PCI_DEVICE_ID_CIRRUS_5462 },
+       { BT_LAGUNA, "CL Laguna 3D", PCI_DEVICE_ID_CIRRUS_5464 },
+       { BT_LAGUNA, "CL Laguna 3DA", PCI_DEVICE_ID_CIRRUS_5465 },
 };
-MODULE_DEVICE_TABLE(pci, cirrusfb_pci_table);
-#undef CHIP
 #endif /* CONFIG_PCI */
 
 
 #ifdef CONFIG_ZORRO
-static const struct zorro_device_id cirrusfb_zorro_table[] = {
-       {
-               .id             = ZORRO_PROD_HELFRICH_SD64_RAM,
-               .driver_data    = BT_SD64,
-       }, {
-               .id             = ZORRO_PROD_HELFRICH_PICCOLO_RAM,
-               .driver_data    = BT_PICCOLO,
-       }, {
-               .id             = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_RAM,
-               .driver_data    = BT_PICASSO,
-       }, {
-               .id             = ZORRO_PROD_GVP_EGS_28_24_SPECTRUM_RAM,
-               .driver_data    = BT_SPECTRUM,
-       }, {
-               .id             = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z3,
-               .driver_data    = BT_PICASSO4,
-       },
-       { 0 }
-};
-
 static const struct {
-       zorro_id id2;
+       clgen_board_t btype;
+       zorro_id id, id2;
        unsigned long size;
-} cirrusfb_zorro_table2[] = {
-       [BT_SD64] = {
-               .id2    = ZORRO_PROD_HELFRICH_SD64_REG,
-               .size   = 0x400000
-       },
-       [BT_PICCOLO] = {
-               .id2    = ZORRO_PROD_HELFRICH_PICCOLO_REG,
-               .size   = 0x200000
-       },
-       [BT_PICASSO] = {
-               .id2    = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_REG,
-               .size   = 0x200000
-       },
-       [BT_SPECTRUM] = {
-               .id2    = ZORRO_PROD_GVP_EGS_28_24_SPECTRUM_REG,
-               .size   = 0x200000
-       },
-       [BT_PICASSO4] = {
-               .id2    = 0,
-               .size   = 0x400000
-       }
+} clgen_zorro_probe_list[] __initdata = {
+       { BT_SD64,
+               ZORRO_PROD_HELFRICH_SD64_RAM,
+               ZORRO_PROD_HELFRICH_SD64_REG,
+               0x400000 },
+       { BT_PICCOLO,
+               ZORRO_PROD_HELFRICH_PICCOLO_RAM,
+               ZORRO_PROD_HELFRICH_PICCOLO_REG,
+               0x200000 },
+       { BT_PICASSO,
+               ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_RAM,
+               ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_REG,
+               0x200000 },
+       { BT_SPECTRUM,
+               ZORRO_PROD_GVP_EGS_28_24_SPECTRUM_RAM,
+               ZORRO_PROD_GVP_EGS_28_24_SPECTRUM_REG,
+               0x200000 },
+       { BT_PICASSO4,
+               ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z3,
+               0,
+               0x400000 },
 };
 #endif /* CONFIG_ZORRO */
 
 
-struct cirrusfb_regs {
+
+struct clgenfb_par {
+       struct fb_var_screeninfo var;
+
        __u32 line_length;      /* in BYTES! */
        __u32 visual;
        __u32 type;
@@ -377,49 +355,69 @@ struct cirrusfb_regs {
 
 
 
-#ifdef CIRRUSFB_DEBUG
+#ifdef CLGEN_DEBUG
 typedef enum {
         CRT,
         SEQ
-} cirrusfb_dbg_reg_class_t;
-#endif                          /* CIRRUSFB_DEBUG */
+} clgen_dbg_reg_class_t;
+#endif                          /* CLGEN_DEBUG */
 
 
 
 
 /* info about board */
-struct cirrusfb_info {
-       struct fb_info *info;
+struct clgenfb_info {
+       struct fb_info_gen gen;
 
        caddr_t fbmem;
-       caddr_t regbase;
+       caddr_t regs;
        caddr_t mem;
        unsigned long size;
-       cirrusfb_board_t btype;
+       clgen_board_t btype;
+       int smallboard;
        unsigned char SFR;      /* Shadow of special function register */
 
        unsigned long fbmem_phys;
        unsigned long fbregs_phys;
 
-       struct cirrusfb_regs currentmode;
-       int blank_mode;
+       struct clgenfb_par currentmode;
 
-       u32     pseudo_palette[17];
        struct { u8 red, green, blue, pad; } palette[256];
 
+       union {
+#ifdef FBCON_HAS_CFB16
+               u16 cfb16[16];
+#endif
+#ifdef FBCON_HAS_CFB24
+               u32 cfb24[16];
+#endif
+#ifdef FBCON_HAS_CFB32
+               u32 cfb32[16];
+#endif
+       } fbcon_cmap;
+
 #ifdef CONFIG_ZORRO
-       struct zorro_dev *zdev;
+       unsigned long board_addr,
+                     board_size;
 #endif
+
 #ifdef CONFIG_PCI
        struct pci_dev *pdev;
 #endif
-       void (*unmap)(struct cirrusfb_info *cinfo);
 };
 
 
-static unsigned cirrusfb_def_mode = 1;
+
+
+static struct display disp;
+
+static struct clgenfb_info boards[MAX_NUM_BOARDS];     /* the boards */
+
+static unsigned clgen_def_mode = 1;
 static int noaccel = 0;
 
+
+
 /*
  *    Predefined Video Modes
  */
@@ -427,171 +425,219 @@ static int noaccel = 0;
 static const struct {
        const char *name;
        struct fb_var_screeninfo var;
-} cirrusfb_predefined[] = {
-       {
-               /* autodetect mode */
-               .name   = "Autodetect",
-       }, {
-               /* 640x480, 31.25 kHz, 60 Hz, 25 MHz PixClock */
-               .name   = "640x480",
-               .var    = {
-                       .xres           = 640,
-                       .yres           = 480,
-                       .xres_virtual   = 640,
-                       .yres_virtual   = 480,
-                       .bits_per_pixel = 8,
-                       .red            = { .length = 8 },
-                       .green          = { .length = 8 },
-                       .blue           = { .length = 8 },
-                       .width          = -1,
-                       .height         = -1,
-                       .pixclock       = 40000,
-                       .left_margin    = 48,
-                       .right_margin   = 16,
-                       .upper_margin   = 32,
-                       .lower_margin   = 8,
-                       .hsync_len      = 96,
-                       .vsync_len      = 4,
-                       .sync           = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-                       .vmode          = FB_VMODE_NONINTERLACED
-                }
-       }, {
-               /* 800x600, 48 kHz, 76 Hz, 50 MHz PixClock */
-               .name   = "800x600",
-               .var    = {
-                       .xres           = 800,
-                       .yres           = 600,
-                       .xres_virtual   = 800,
-                       .yres_virtual   = 600,
-                       .bits_per_pixel = 8,
-                       .red            = { .length = 8 },
-                       .green          = { .length = 8 },
-                       .blue           = { .length = 8 },
-                       .width          = -1,
-                       .height         = -1,
-                       .pixclock       = 20000,
-                       .left_margin    = 128,
-                       .right_margin   = 16,
-                       .upper_margin   = 24,
-                       .lower_margin   = 2,
-                       .hsync_len      = 96,
-                       .vsync_len      = 6,
-                       .vmode          = FB_VMODE_NONINTERLACED
-                }
-       }, {
-               /*
-                * Modeline from XF86Config:
-                * Mode "1024x768" 80  1024 1136 1340 1432  768 770 774 805
-                */
-               /* 1024x768, 55.8 kHz, 70 Hz, 80 MHz PixClock */
-               .name   = "1024x768",
-               .var    = {
-                       .xres           = 1024,
-                       .yres           = 768,
-                       .xres_virtual   = 1024,
-                       .yres_virtual   = 768,
-                       .bits_per_pixel = 8,
-                       .red            = { .length = 8 },
-                       .green          = { .length = 8 },
-                       .blue           = { .length = 8 },
-                       .width          = -1,
-                       .height         = -1,
-                       .pixclock       = 12500,
-                       .left_margin    = 144,
-                       .right_margin   = 32,
-                       .upper_margin   = 30,
-                       .lower_margin   = 2,
-                       .hsync_len      = 192,
-                       .vsync_len      = 6,
-                       .vmode          = FB_VMODE_NONINTERLACED
+} clgenfb_predefined[] __initdata =
+
+{
+       {"Autodetect",          /* autodetect mode */
+        {0}
+       },
+
+       {"640x480",             /* 640x480, 31.25 kHz, 60 Hz, 25 MHz PixClock */
+        {
+                640, 480, 640, 480, 0, 0, 8, 0,
+                {0, 8, 0},
+                {0, 8, 0},
+                {0, 8, 0},
+                {0, 0, 0},
+              0, 0, -1, -1, FB_ACCEL_NONE, 40000, 48, 16, 32, 8, 96, 4,
+     FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
+        }
+       },
+
+       {"800x600",             /* 800x600, 48 kHz, 76 Hz, 50 MHz PixClock */
+        {
+                800, 600, 800, 600, 0, 0, 8, 0,
+                {0, 8, 0},
+                {0, 8, 0},
+                {0, 8, 0},
+                {0, 0, 0},
+              0, 0, -1, -1, FB_ACCEL_NONE, 20000, 128, 16, 24, 2, 96, 6,
+     0, FB_VMODE_NONINTERLACED
+        }
+       },
+
+       /*
+          Modeline from XF86Config:
+          Mode "1024x768" 80  1024 1136 1340 1432  768 770 774 805
+        */
+       {"1024x768",            /* 1024x768, 55.8 kHz, 70 Hz, 80 MHz PixClock */
+               {
+                       1024, 768, 1024, 768, 0, 0, 8, 0,
+                       {0, 8, 0},
+                       {0, 8, 0},
+                       {0, 8, 0},
+                       {0, 0, 0},
+             0, 0, -1, -1, FB_ACCEL_NONE, 12500, 144, 32, 30, 2, 192, 6,
+     0, FB_VMODE_NONINTERLACED
                }
        }
 };
 
-#define NUM_TOTAL_MODES    ARRAY_SIZE(cirrusfb_predefined)
+#define NUM_TOTAL_MODES    ARRAY_SIZE(clgenfb_predefined)
+static struct fb_var_screeninfo clgenfb_default;
+
+/*
+ *    Frame Buffer Name
+ */
+
+static const char *clgenfb_name = "CLgen";
 
 /****************************************************************************/
 /**** BEGIN PROTOTYPES ******************************************************/
 
 
 /*--- Interface used by the world ------------------------------------------*/
-int cirrusfb_init (void);
-int cirrusfb_setup (char *options);
-
-int cirrusfb_open (struct fb_info *info, int user);
-int cirrusfb_release (struct fb_info *info, int user);
-int cirrusfb_setcolreg (unsigned regno, unsigned red, unsigned green,
-                       unsigned blue, unsigned transp,
-                       struct fb_info *info);
-int cirrusfb_check_var (struct fb_var_screeninfo *var,
-                       struct fb_info *info);
-int cirrusfb_set_par (struct fb_info *info);
-int cirrusfb_pan_display (struct fb_var_screeninfo *var,
-                         struct fb_info *info);
-int cirrusfb_blank (int blank_mode, struct fb_info *info);
-void cirrusfb_fillrect (struct fb_info *info, const struct fb_fillrect *region);
-void cirrusfb_copyarea(struct fb_info *info, const struct fb_copyarea *area);
-void cirrusfb_imageblit(struct fb_info *info, const struct fb_image *image);
+int clgenfb_init (void);
+int clgenfb_setup (char *options);
+
+static int clgenfb_open (struct fb_info *info, int user);
+static int clgenfb_release (struct fb_info *info, int user);
+
+static int clgenfb_setcolreg (unsigned regno, unsigned red, unsigned green,
+                             unsigned blue, unsigned transp,
+                             struct fb_info *info);
 
 /* function table of the above functions */
-static struct fb_ops cirrusfb_ops = {
-       .owner          = THIS_MODULE,
-       .fb_open        = cirrusfb_open,
-       .fb_release     = cirrusfb_release,
-       .fb_setcolreg   = cirrusfb_setcolreg,
-       .fb_check_var   = cirrusfb_check_var,
-       .fb_set_par     = cirrusfb_set_par,
-       .fb_pan_display = cirrusfb_pan_display,
-       .fb_blank       = cirrusfb_blank,
-       .fb_fillrect    = cirrusfb_fillrect,
-       .fb_copyarea    = cirrusfb_copyarea,
-       .fb_imageblit   = cirrusfb_imageblit,
-       .fb_cursor      = soft_cursor,
+static struct fb_ops clgenfb_ops = {
+       .owner =        THIS_MODULE,
+       .fb_open =      clgenfb_open,
+       .fb_release =   clgenfb_release,
+       .fb_get_fix =   fbgen_get_fix,
+       .fb_get_var =   fbgen_get_var,
+       .fb_set_var =   fbgen_set_var,
+       .fb_get_cmap =  fbgen_get_cmap,
+       .fb_set_cmap =  gen_set_cmap,
+       .fb_setcolreg = clgenfb_setcolreg,
+       .fb_pan_display =fbgen_pan_display,
+       .fb_blank =     fbgen_blank,
 };
 
 /*--- Hardware Specific Routines -------------------------------------------*/
-static int cirrusfb_decode_var (const struct fb_var_screeninfo *var,
-                               struct cirrusfb_regs *regs,
-                               const struct fb_info *info);
+static void clgen_detect (void);
+static int clgen_encode_fix (struct fb_fix_screeninfo *fix, const void *par,
+                            struct fb_info_gen *info);
+static int clgen_decode_var (const struct fb_var_screeninfo *var, void *par,
+                            struct fb_info_gen *info);
+static int clgen_encode_var (struct fb_var_screeninfo *var, const void *par,
+                            struct fb_info_gen *info);
+static void clgen_get_par (void *par, struct fb_info_gen *info);
+static void clgen_set_par (const void *par, struct fb_info_gen *info);
+static int clgen_getcolreg (unsigned regno, unsigned *red, unsigned *green,
+                           unsigned *blue, unsigned *transp,
+                           struct fb_info *info);
+static int clgen_pan_display (const struct fb_var_screeninfo *var,
+                             struct fb_info_gen *info);
+static int clgen_blank (int blank_mode, struct fb_info_gen *info);
+
+static void clgen_set_disp (const void *par, struct display *disp,
+                           struct fb_info_gen *info);
+
+/* function table of the above functions */
+static struct fbgen_hwswitch clgen_hwswitch =
+{
+       clgen_detect,
+       clgen_encode_fix,
+       clgen_decode_var,
+       clgen_encode_var,
+       clgen_get_par,
+       clgen_set_par,
+       clgen_getcolreg,
+       clgen_pan_display,
+       clgen_blank,
+       clgen_set_disp
+};
+
+/* Text console acceleration */
+
+#ifdef FBCON_HAS_CFB8
+static void fbcon_clgen8_bmove (struct display *p, int sy, int sx,
+                               int dy, int dx, int height, int width);
+static void fbcon_clgen8_clear (struct vc_data *conp, struct display *p,
+                               int sy, int sx, int height, int width);
+
+static struct display_switch fbcon_clgen_8 = {
+       .setup =        fbcon_cfb8_setup,
+       .bmove =        fbcon_clgen8_bmove,
+       .clear =        fbcon_clgen8_clear,
+       .putc =         fbcon_cfb8_putc,
+       .putcs =        fbcon_cfb8_putcs,
+       .revc =         fbcon_cfb8_revc,
+       .clear_margins =fbcon_cfb8_clear_margins,
+       .fontwidthmask =FONTWIDTH (4) | FONTWIDTH (8) | FONTWIDTH (12) | FONTWIDTH (16)
+};
+#endif
+#ifdef FBCON_HAS_CFB16
+static void fbcon_clgen16_bmove (struct display *p, int sy, int sx,
+                                int dy, int dx, int height, int width);
+static void fbcon_clgen16_clear (struct vc_data *conp, struct display *p,
+                                int sy, int sx, int height, int width);
+static struct display_switch fbcon_clgen_16 = {
+       .setup =        fbcon_cfb16_setup,
+       .bmove =        fbcon_clgen16_bmove,
+       .clear =        fbcon_clgen16_clear,
+       .putc =         fbcon_cfb16_putc,
+       .putcs =        fbcon_cfb16_putcs,
+       .revc =         fbcon_cfb16_revc,
+       .clear_margins =fbcon_cfb16_clear_margins,
+       .fontwidthmask =FONTWIDTH (4) | FONTWIDTH (8) | FONTWIDTH (12) | FONTWIDTH (16)
+};
+#endif
+#ifdef FBCON_HAS_CFB32
+static void fbcon_clgen32_bmove (struct display *p, int sy, int sx,
+                                int dy, int dx, int height, int width);
+static void fbcon_clgen32_clear (struct vc_data *conp, struct display *p,
+                                int sy, int sx, int height, int width);
+static struct display_switch fbcon_clgen_32 = {
+       .setup =        fbcon_cfb32_setup,
+       .bmove =        fbcon_clgen32_bmove,
+       .clear =        fbcon_clgen32_clear,
+       .putc =         fbcon_cfb32_putc,
+       .putcs =        fbcon_cfb32_putcs,
+       .revc =         fbcon_cfb32_revc,
+       .clear_margins =fbcon_cfb32_clear_margins,
+       .fontwidthmask =FONTWIDTH (4) | FONTWIDTH (8) | FONTWIDTH (12) | FONTWIDTH (16)
+};
+#endif
+
+
+
 /*--- Internal routines ----------------------------------------------------*/
-static void init_vgachip (struct cirrusfb_info *cinfo);
-static void switch_monitor (struct cirrusfb_info *cinfo, int on);
-static void WGen (const struct cirrusfb_info *cinfo,
+static void init_vgachip (struct clgenfb_info *fb_info);
+static void switch_monitor (struct clgenfb_info *fb_info, int on);
+static void WGen (const struct clgenfb_info *fb_info,
                  int regnum, unsigned char val);
-static unsigned char RGen (const struct cirrusfb_info *cinfo, int regnum);
-static void AttrOn (const struct cirrusfb_info *cinfo);
-static void WHDR (const struct cirrusfb_info *cinfo, unsigned char val);
-static void WSFR (struct cirrusfb_info *cinfo, unsigned char val);
-static void WSFR2 (struct cirrusfb_info *cinfo, unsigned char val);
-static void WClut (struct cirrusfb_info *cinfo, unsigned char regnum, unsigned char red,
+static unsigned char RGen (const struct clgenfb_info *fb_info, int regnum);
+static void AttrOn (const struct clgenfb_info *fb_info);
+static void WHDR (const struct clgenfb_info *fb_info, unsigned char val);
+static void WSFR (struct clgenfb_info *fb_info, unsigned char val);
+static void WSFR2 (struct clgenfb_info *fb_info, unsigned char val);
+static void WClut (struct clgenfb_info *fb_info, unsigned char regnum, unsigned char red,
                   unsigned char green,
                   unsigned char blue);
 #if 0
-static void RClut (struct cirrusfb_info *cinfo, unsigned char regnum, unsigned char *red,
+static void RClut (struct clgenfb_info *fb_info, unsigned char regnum, unsigned char *red,
                   unsigned char *green,
                   unsigned char *blue);
 #endif
-static void cirrusfb_WaitBLT (caddr_t regbase);
-static void cirrusfb_BitBLT (caddr_t regbase, int bits_per_pixel,
-                            u_short curx, u_short cury,
-                            u_short destx, u_short desty,
-                            u_short width, u_short height,
-                            u_short line_length);
-static void cirrusfb_RectFill (caddr_t regbase, int bits_per_pixel,
-                              u_short x, u_short y,
-                              u_short width, u_short height,
-                              u_char color, u_short line_length);
+static void clgen_WaitBLT (caddr_t regbase);
+static void clgen_BitBLT (caddr_t regbase, u_short curx, u_short cury,
+                         u_short destx, u_short desty,
+                         u_short width, u_short height,
+                         u_short line_length);
+static void clgen_RectFill (struct clgenfb_info *fb_info, u_short x, u_short y,
+                           u_short width, u_short height,
+                           u_char color, u_short line_length);
 
 static void bestclock (long freq, long *best,
                       long *nom, long *den,
                       long *div, long maxfreq);
 
-#ifdef CIRRUSFB_DEBUG
-static void cirrusfb_dump (void);
-static void cirrusfb_dbg_reg_dump (caddr_t regbase);
-static void cirrusfb_dbg_print_regs (caddr_t regbase, cirrusfb_dbg_reg_class_t reg_class,...);
-static void cirrusfb_dbg_print_byte (const char *name, unsigned char val);
-#endif /* CIRRUSFB_DEBUG */
+#ifdef CLGEN_DEBUG
+static void clgen_dump (void);
+static void clgen_dbg_reg_dump (caddr_t regbase);
+static void clgen_dbg_print_regs (caddr_t regbase, clgen_dbg_reg_class_t reg_class,...);
+static void clgen_dbg_print_byte (const char *name, unsigned char val);
+#endif /* CLGEN_DEBUG */
 
 /*** END   PROTOTYPES ********************************************************/
 /*****************************************************************************/
@@ -600,18 +646,18 @@ static void cirrusfb_dbg_print_byte (const char *name, unsigned char val);
 static int opencount = 0;
 
 /*--- Open /dev/fbx ---------------------------------------------------------*/
-int cirrusfb_open (struct fb_info *info, int user)
+static int clgenfb_open (struct fb_info *info, int user)
 {
        if (opencount++ == 0)
-               switch_monitor (info->par, 1);
+               switch_monitor ((struct clgenfb_info *) info, 1);
        return 0;
 }
 
 /*--- Close /dev/fbx --------------------------------------------------------*/
-int cirrusfb_release (struct fb_info *info, int user)
+static int clgenfb_release (struct fb_info *info, int user)
 {
        if (--opencount == 0)
-               switch_monitor (info->par, 0);
+               switch_monitor ((struct clgenfb_info *) info, 0);
        return 0;
 }
 
@@ -619,8 +665,67 @@ int cirrusfb_release (struct fb_info *info, int user)
 /****************************************************************************/
 /**** BEGIN Hardware specific Routines **************************************/
 
+static void clgen_detect (void)
+{
+       DPRINTK ("ENTER\n");
+       DPRINTK ("EXIT\n");
+}
+
+static int clgen_encode_fix (struct fb_fix_screeninfo *fix, const void *par,
+                            struct fb_info_gen *info)
+{
+       struct clgenfb_par *_par = (struct clgenfb_par *) par;
+       struct clgenfb_info *_info = (struct clgenfb_info *) info;
+
+       DPRINTK ("ENTER\n");
+
+       memset (fix, 0, sizeof (struct fb_fix_screeninfo));
+       strcpy (fix->id, clgenfb_name);
+
+       if (_info->btype == BT_GD5480) {
+               /* Select proper byte-swapping aperture */
+               switch (_par->var.bits_per_pixel) {
+               case 1:
+               case 8:
+                       fix->smem_start = _info->fbmem_phys;
+                       break;
+               case 16:
+                       fix->smem_start = _info->fbmem_phys + 1 * MB_;
+                       break;
+               case 24:
+               case 32:
+                       fix->smem_start = _info->fbmem_phys + 2 * MB_;
+                       break;
+               }
+       } else {
+               fix->smem_start = _info->fbmem_phys;
+       }
+
+       /* monochrome: only 1 memory plane */
+       /* 8 bit and above: Use whole memory area */
+       fix->smem_len = _par->var.bits_per_pixel == 1 ? _info->size / 4
+           : _info->size;
+       fix->type = _par->type;
+       fix->type_aux = 0;
+       fix->visual = _par->visual;
+       fix->xpanstep = 1;
+       fix->ypanstep = 1;
+       fix->ywrapstep = 0;
+       fix->line_length = _par->line_length;
+
+       /* FIXME: map region at 0xB8000 if available, fill in here */
+       fix->mmio_start = 0;
+       fix->mmio_len = 0;
+       fix->accel = FB_ACCEL_NONE;
+
+       DPRINTK ("EXIT\n");
+       return 0;
+}
+
+
+
 /* Get a good MCLK value */
-static long cirrusfb_get_mclk (long freq, int bpp, long *div)
+static long clgen_get_mclk (long freq, int bpp, long *div)
 {
        long mclk;
 
@@ -660,253 +765,227 @@ static long cirrusfb_get_mclk (long freq, int bpp, long *div)
        return mclk;
 }
 
-int cirrusfb_check_var(struct fb_var_screeninfo *var,
-                      struct fb_info *info)
+static int clgen_decode_var (const struct fb_var_screeninfo *var, void *par,
+                            struct fb_info_gen *info)
 {
-       struct cirrusfb_info *cinfo = info->par;
+       long freq;
+       long maxclock;
+       int xres, hfront, hsync, hback;
+       int yres, vfront, vsync, vback;
        int nom, den;           /* translyting from pixels->bytes */
-       int yres, i;
-       static struct { int xres, yres; } modes[] =
-       { { 1600, 1280 },
-         { 1280, 1024 },
-         { 1024, 768 },
-         { 800, 600 },
-         { 640, 480 },
-         { -1, -1 } };
+       int i;
+       static struct {
+               int xres, yres;
+       } modes[] = { {
+                       1600, 1280
+       }, {
+               1280, 1024
+       }, {
+               1024, 768
+       },
+       {
+               800, 600
+       }, {
+               640, 480
+       }, {
+               -1, -1
+       }
+       };
+
+       struct clgenfb_par *_par = (struct clgenfb_par *) par;
+       struct clgenfb_info *fb_info = (struct clgenfb_info *) info;
+
+       assert (var != NULL);
+       assert (par != NULL);
+       assert (info != NULL);
+
+       DPRINTK ("ENTER\n");
+
+       DPRINTK ("Requested: %dx%dx%d\n", var->xres, var->yres, var->bits_per_pixel);
+       DPRINTK ("  virtual: %dx%d\n", var->xres_virtual, var->yres_virtual);
+       DPRINTK ("   offset: (%d,%d)\n", var->xoffset, var->yoffset);
+       DPRINTK ("grayscale: %d\n", var->grayscale);
+
+       memset (par, 0, sizeof (struct clgenfb_par));
+
+       _par->var = *var;
 
        switch (var->bits_per_pixel) {
-       case 0 ... 1:
-               var->bits_per_pixel = 1;
+       case 1:
                nom = 4;
                den = 8;
                break;          /* 8 pixel per byte, only 1/4th of mem usable */
        case 2 ... 8:
-               var->bits_per_pixel = 8;
+               _par->var.bits_per_pixel = 8;
                nom = 1;
                den = 1;
                break;          /* 1 pixel == 1 byte */
        case 9 ... 16:
-               var->bits_per_pixel = 16;
+               _par->var.bits_per_pixel = 16;
                nom = 2;
                den = 1;
                break;          /* 2 bytes per pixel */
        case 17 ... 24:
-               var->bits_per_pixel = 24;
+               _par->var.bits_per_pixel = 24;
                nom = 3;
                den = 1;
                break;          /* 3 bytes per pixel */
        case 25 ... 32:
-               var->bits_per_pixel = 32;
+               _par->var.bits_per_pixel = 32;
                nom = 4;
                den = 1;
                break;          /* 4 bytes per pixel */
        default:
-               printk ("cirrusfb: mode %dx%dx%d rejected...color depth not supported.\n",
+               printk ("clgen: mode %dx%dx%d rejected...color depth not supported.\n",
                        var->xres, var->yres, var->bits_per_pixel);
                DPRINTK ("EXIT - EINVAL error\n");
                return -EINVAL;
        }
 
-       if (var->xres * nom / den * var->yres > cinfo->size) {
-               printk ("cirrusfb: mode %dx%dx%d rejected...resolution too high to fit into video memory!\n",
+       if (_par->var.xres * nom / den * _par->var.yres > fb_info->size) {
+               printk ("clgen: mode %dx%dx%d rejected...resolution too high to fit into video memory!\n",
                        var->xres, var->yres, var->bits_per_pixel);
                DPRINTK ("EXIT - EINVAL error\n");
                return -EINVAL;
        }
-
        /* use highest possible virtual resolution */
-       if (var->xres_virtual == -1 &&
-           var->yres_virtual == -1) {
-               printk ("cirrusfb: using maximum available virtual resolution\n");
+       if (_par->var.xres_virtual == -1 &&
+           _par->var.yres_virtual == -1) {
+               printk ("clgen: using maximum available virtual resolution\n");
                for (i = 0; modes[i].xres != -1; i++) {
-                       if (modes[i].xres * nom / den * modes[i].yres < cinfo->size / 2)
+                       if (modes[i].xres * nom / den * modes[i].yres < fb_info->size / 2)
                                break;
                }
                if (modes[i].xres == -1) {
-                       printk ("cirrusfb: could not find a virtual resolution that fits into video memory!!\n");
+                       printk ("clgen: could not find a virtual resolution that fits into video memory!!\n");
                        DPRINTK ("EXIT - EINVAL error\n");
                        return -EINVAL;
                }
-               var->xres_virtual = modes[i].xres;
-               var->yres_virtual = modes[i].yres;
+               _par->var.xres_virtual = modes[i].xres;
+               _par->var.yres_virtual = modes[i].yres;
 
-               printk ("cirrusfb: virtual resolution set to maximum of %dx%d\n",
-                       var->xres_virtual, var->yres_virtual);
+               printk ("clgen: virtual resolution set to maximum of %dx%d\n",
+                       _par->var.xres_virtual, _par->var.yres_virtual);
+       } else if (_par->var.xres_virtual == -1) {
+               /* FIXME: maximize X virtual resolution only */
+       } else if (_par->var.yres_virtual == -1) {
+               /* FIXME: maximize Y virtual resolution only */
        }
-
-       if (var->xres_virtual < var->xres)
-               var->xres_virtual = var->xres;
-       if (var->yres_virtual < var->yres)
-               var->yres_virtual = var->yres;
-
-       if (var->xoffset < 0)
-               var->xoffset = 0;
-       if (var->yoffset < 0)
-               var->yoffset = 0;
+       if (_par->var.xoffset < 0)
+               _par->var.xoffset = 0;
+       if (_par->var.yoffset < 0)
+               _par->var.yoffset = 0;
 
        /* truncate xoffset and yoffset to maximum if too high */
-       if (var->xoffset > var->xres_virtual - var->xres)
-               var->xoffset = var->xres_virtual - var->xres - 1;
-       if (var->yoffset > var->yres_virtual - var->yres)
-               var->yoffset = var->yres_virtual - var->yres - 1;
+       if (_par->var.xoffset > _par->var.xres_virtual - _par->var.xres)
+               _par->var.xoffset = _par->var.xres_virtual - _par->var.xres - 1;
 
-       switch (var->bits_per_pixel) {
+       if (_par->var.yoffset > _par->var.yres_virtual - _par->var.yres)
+               _par->var.yoffset = _par->var.yres_virtual - _par->var.yres - 1;
+
+       switch (_par->var.bits_per_pixel) {
        case 1:
+               _par->line_length = _par->var.xres_virtual / 8;
+               _par->visual = FB_VISUAL_MONO10;
                break;
 
        case 8:
-               var->red.offset = 0;
-               var->red.length = 6;
-               var->green.offset = 0;
-               var->green.length = 6;
-               var->blue.offset = 0;
-               var->blue.length = 6;
+               _par->line_length = _par->var.xres_virtual;
+               _par->visual = FB_VISUAL_PSEUDOCOLOR;
+               _par->var.red.offset = 0;
+               _par->var.red.length = 6;
+               _par->var.green.offset = 0;
+               _par->var.green.length = 6;
+               _par->var.blue.offset = 0;
+               _par->var.blue.length = 6;
                break;
 
        case 16:
+               _par->line_length = _par->var.xres_virtual * 2;
+               _par->visual = FB_VISUAL_DIRECTCOLOR;
                if(isPReP) {
-                       var->red.offset = 2;
-                       var->green.offset = -3;
-                       var->blue.offset = 8;
+                       _par->var.red.offset = 2;
+                       _par->var.green.offset = -3;
+                       _par->var.blue.offset = 8;
                } else {
-                       var->red.offset = 10;
-                       var->green.offset = 5;
-                       var->blue.offset = 0;
+                       _par->var.red.offset = 10;
+                       _par->var.green.offset = 5;
+                       _par->var.blue.offset = 0;
                }
-               var->red.length = 5;
-               var->green.length = 5;
-               var->blue.length = 5;
+               _par->var.red.length = 5;
+               _par->var.green.length = 5;
+               _par->var.blue.length = 5;
                break;
 
        case 24:
+               _par->line_length = _par->var.xres_virtual * 3;
+               _par->visual = FB_VISUAL_DIRECTCOLOR;
                if(isPReP) {
-                       var->red.offset = 8;
-                       var->green.offset = 16;
-                       var->blue.offset = 24;
+                       _par->var.red.offset = 8;
+                       _par->var.green.offset = 16;
+                       _par->var.blue.offset = 24;
                } else {
-                       var->red.offset = 16;
-                       var->green.offset = 8;
-                       var->blue.offset = 0;
+                       _par->var.red.offset = 16;
+                       _par->var.green.offset = 8;
+                       _par->var.blue.offset = 0;
                }
-               var->red.length = 8;
-               var->green.length = 8;
-               var->blue.length = 8;
+               _par->var.red.length = 8;
+               _par->var.green.length = 8;
+               _par->var.blue.length = 8;
                break;
 
        case 32:
+               _par->line_length = _par->var.xres_virtual * 4;
+               _par->visual = FB_VISUAL_DIRECTCOLOR;
                if(isPReP) {
-                       var->red.offset = 8;
-                       var->green.offset = 16;
-                       var->blue.offset = 24;
+                       _par->var.red.offset = 8;
+                       _par->var.green.offset = 16;
+                       _par->var.blue.offset = 24;
                } else {
-                       var->red.offset = 16;
-                       var->green.offset = 8;
-                       var->blue.offset = 0;
+                       _par->var.red.offset = 16;
+                       _par->var.green.offset = 8;
+                       _par->var.blue.offset = 0;
                }
-               var->red.length = 8;
-               var->green.length = 8;
-               var->blue.length = 8;
+               _par->var.red.length = 8;
+               _par->var.green.length = 8;
+               _par->var.blue.length = 8;
                break;
 
        default:
-               DPRINTK("Unsupported bpp size: %d\n", var->bits_per_pixel);
+               DPRINTK("Unsupported bpp size: %d\n", _par->var.bits_per_pixel);
                assert (FALSE);
                /* should never occur */
                break;
        }
 
-       var->red.msb_right =
-           var->green.msb_right =
-           var->blue.msb_right =
-           var->transp.offset =
-           var->transp.length =
-           var->transp.msb_right = 0;
-
-       yres = var->yres;
-       if (var->vmode & FB_VMODE_DOUBLE)
-               yres *= 2;
-       else if (var->vmode & FB_VMODE_INTERLACED)
-               yres = (yres + 1) / 2;
-
-       if (yres >= 1280) {
-               printk (KERN_WARNING "cirrusfb: ERROR: VerticalTotal >= 1280; special treatment required! (TODO)\n");
-               DPRINTK ("EXIT - EINVAL error\n");
-               return -EINVAL;
-       }
-
-       return 0;
-}
-
-static int cirrusfb_decode_var (const struct fb_var_screeninfo *var,
-                               struct cirrusfb_regs *regs,
-                               const struct fb_info *info)
-{
-       long freq;
-       long maxclock;
-       int maxclockidx = 0;
-       struct cirrusfb_info *cinfo = info->par;
-       int xres, hfront, hsync, hback;
-       int yres, vfront, vsync, vback;
-
-       switch(var->bits_per_pixel) {
-       case 1:
-               regs->line_length = var->xres_virtual / 8;
-               regs->visual = FB_VISUAL_MONO10;
-               maxclockidx = 0;
-               break;
-
-       case 8:
-               regs->line_length = var->xres_virtual;
-               regs->visual = FB_VISUAL_PSEUDOCOLOR;
-               maxclockidx = 1;
-               break;
-
-       case 16:
-               regs->line_length = var->xres_virtual * 2;
-               regs->visual = FB_VISUAL_DIRECTCOLOR;
-               maxclockidx = 2;
-               break;
-
-       case 24:
-               regs->line_length = var->xres_virtual * 3;
-               regs->visual = FB_VISUAL_DIRECTCOLOR;
-               maxclockidx = 3;
-               break;
-
-       case 32:
-               regs->line_length = var->xres_virtual * 4;
-               regs->visual = FB_VISUAL_DIRECTCOLOR;
-               maxclockidx = 4;
-               break;
-
-       default:
-               DPRINTK("Unsupported bpp size: %d\n", var->bits_per_pixel);
-               assert (FALSE);
-               /* should never occur */
-               break;
-       }
+       _par->var.red.msb_right =
+           _par->var.green.msb_right =
+           _par->var.blue.msb_right =
+           _par->var.transp.offset =
+           _par->var.transp.length =
+           _par->var.transp.msb_right = 0;
 
-       regs->type = FB_TYPE_PACKED_PIXELS;
+       _par->type = FB_TYPE_PACKED_PIXELS;
 
        /* convert from ps to kHz */
        freq = 1000000000 / var->pixclock;
 
        DPRINTK ("desired pixclock: %ld kHz\n", freq);
 
-       maxclock = cirrusfb_board_info[cinfo->btype].maxclock[maxclockidx];
-       regs->multiplexing = 0;
+       maxclock = clgen_board_info[fb_info->btype].maxclock;
+       _par->multiplexing = 0;
 
        /* If the frequency is greater than we can support, we might be able
         * to use multiplexing for the video mode */
        if (freq > maxclock) {
-               switch (cinfo->btype) {
+               switch (fb_info->btype) {
                case BT_ALPINE:
                case BT_GD5480:
-                       regs->multiplexing = 1;
+                       _par->multiplexing = 1;
                        break;
 
                default:
-                       printk (KERN_WARNING "cirrusfb: ERROR: Frequency greater than maxclock (%ld kHz)\n", maxclock);
+                       printk (KERN_WARNING "clgen: ERROR: Frequency greater than maxclock (%ld kHz)\n", maxclock);
                        DPRINTK ("EXIT - return -EINVAL\n");
                        return -EINVAL;
                }
@@ -917,256 +996,274 @@ static int cirrusfb_decode_var (const struct fb_var_screeninfo *var,
        switch (var->bits_per_pixel) {
        case 16:
        case 32:
-               if (regs->HorizRes <= 800)
+               if (_par->HorizRes <= 800)
                        freq /= 2;      /* Xbh has this type of clock for 32-bit */
                break;
        }
 #endif
 
-       bestclock (freq, &regs->freq, &regs->nom, &regs->den, &regs->div,
+       bestclock (freq, &_par->freq, &_par->nom, &_par->den, &_par->div,
                   maxclock);
-       regs->mclk = cirrusfb_get_mclk (freq, var->bits_per_pixel, &regs->divMCLK);
+       _par->mclk = clgen_get_mclk (freq, _par->var.bits_per_pixel, &_par->divMCLK);
 
-       xres = var->xres;
-       hfront = var->right_margin;
-       hsync = var->hsync_len;
-       hback = var->left_margin;
+       xres = _par->var.xres;
+       hfront = _par->var.right_margin;
+       hsync = _par->var.hsync_len;
+       hback = _par->var.left_margin;
 
-       yres = var->yres;
-       vfront = var->lower_margin;
-       vsync = var->vsync_len;
-       vback = var->upper_margin;
+       yres = _par->var.yres;
+       vfront = _par->var.lower_margin;
+       vsync = _par->var.vsync_len;
+       vback = _par->var.upper_margin;
 
-       if (var->vmode & FB_VMODE_DOUBLE) {
+       if (_par->var.vmode & FB_VMODE_DOUBLE) {
                yres *= 2;
                vfront *= 2;
                vsync *= 2;
                vback *= 2;
-       } else if (var->vmode & FB_VMODE_INTERLACED) {
+       } else if (_par->var.vmode & FB_VMODE_INTERLACED) {
                yres = (yres + 1) / 2;
                vfront = (vfront + 1) / 2;
                vsync = (vsync + 1) / 2;
                vback = (vback + 1) / 2;
        }
-       regs->HorizRes = xres;
-       regs->HorizTotal = (xres + hfront + hsync + hback) / 8 - 5;
-       regs->HorizDispEnd = xres / 8 - 1;
-       regs->HorizBlankStart = xres / 8;
-       regs->HorizBlankEnd = regs->HorizTotal + 5;     /* does not count with "-5" */
-       regs->HorizSyncStart = (xres + hfront) / 8 + 1;
-       regs->HorizSyncEnd = (xres + hfront + hsync) / 8 + 1;
-
-       regs->VertRes = yres;
-       regs->VertTotal = yres + vfront + vsync + vback - 2;
-       regs->VertDispEnd = yres - 1;
-       regs->VertBlankStart = yres;
-       regs->VertBlankEnd = regs->VertTotal;
-       regs->VertSyncStart = yres + vfront - 1;
-       regs->VertSyncEnd = yres + vfront + vsync - 1;
-
-       if (regs->VertRes >= 1024) {
-               regs->VertTotal /= 2;
-               regs->VertSyncStart /= 2;
-               regs->VertSyncEnd /= 2;
-               regs->VertDispEnd /= 2;
-       }
-       if (regs->multiplexing) {
-               regs->HorizTotal /= 2;
-               regs->HorizSyncStart /= 2;
-               regs->HorizSyncEnd /= 2;
-               regs->HorizDispEnd /= 2;
+       _par->HorizRes = xres;
+       _par->HorizTotal = (xres + hfront + hsync + hback) / 8 - 5;
+       _par->HorizDispEnd = xres / 8 - 1;
+       _par->HorizBlankStart = xres / 8;
+       _par->HorizBlankEnd = _par->HorizTotal + 5;     /* does not count with "-5" */
+       _par->HorizSyncStart = (xres + hfront) / 8 + 1;
+       _par->HorizSyncEnd = (xres + hfront + hsync) / 8 + 1;
+
+       _par->VertRes = yres;
+       _par->VertTotal = yres + vfront + vsync + vback - 2;
+       _par->VertDispEnd = yres - 1;
+       _par->VertBlankStart = yres;
+       _par->VertBlankEnd = _par->VertTotal;
+       _par->VertSyncStart = yres + vfront - 1;
+       _par->VertSyncEnd = yres + vfront + vsync - 1;
+
+       if (_par->VertRes >= 1024) {
+               _par->VertTotal /= 2;
+               _par->VertSyncStart /= 2;
+               _par->VertSyncEnd /= 2;
+               _par->VertDispEnd /= 2;
+       }
+       if (_par->multiplexing) {
+               _par->HorizTotal /= 2;
+               _par->HorizSyncStart /= 2;
+               _par->HorizSyncEnd /= 2;
+               _par->HorizDispEnd /= 2;
+       }
+       if (_par->VertRes >= 1280) {
+               printk (KERN_WARNING "clgen: ERROR: VerticalTotal >= 1280; special treatment required! (TODO)\n");
+               DPRINTK ("EXIT - EINVAL error\n");
+               return -EINVAL;
        }
+       DPRINTK ("EXIT\n");
+       return 0;
+}
+
 
+static int clgen_encode_var (struct fb_var_screeninfo *var, const void *par,
+                            struct fb_info_gen *info)
+{
+       DPRINTK ("ENTER\n");
+
+       *var = ((struct clgenfb_par *) par)->var;
+
+       DPRINTK ("EXIT\n");
        return 0;
 }
 
+/* get current video mode */
+static void clgen_get_par (void *par, struct fb_info_gen *info)
+{
+       struct clgenfb_par *_par = (struct clgenfb_par *) par;
+       struct clgenfb_info *_info = (struct clgenfb_info *) info;
+
+       DPRINTK ("ENTER\n");
+
+       *_par = _info->currentmode;
+
+       DPRINTK ("EXIT\n");
+}
 
-static void cirrusfb_set_mclk (const struct cirrusfb_info *cinfo, int val, int div)
+static void clgen_set_mclk (const struct clgenfb_info *fb_info, int val, int div)
 {
-       assert (cinfo != NULL);
+       assert (fb_info != NULL);
 
        if (div == 2) {
                /* VCLK = MCLK/2 */
-               unsigned char old = vga_rseq (cinfo->regbase, CL_SEQR1E);
-               vga_wseq (cinfo->regbase, CL_SEQR1E, old | 0x1);
-               vga_wseq (cinfo->regbase, CL_SEQR1F, 0x40 | (val & 0x3f));
+               unsigned char old = vga_rseq (fb_info->regs, CL_SEQR1E);
+               vga_wseq (fb_info->regs, CL_SEQR1E, old | 0x1);
+               vga_wseq (fb_info->regs, CL_SEQR1F, 0x40 | (val & 0x3f));
        } else if (div == 1) {
                /* VCLK = MCLK */
-               unsigned char old = vga_rseq (cinfo->regbase, CL_SEQR1E);
-               vga_wseq (cinfo->regbase, CL_SEQR1E, old & ~0x1);
-               vga_wseq (cinfo->regbase, CL_SEQR1F, 0x40 | (val & 0x3f));
+               unsigned char old = vga_rseq (fb_info->regs, CL_SEQR1E);
+               vga_wseq (fb_info->regs, CL_SEQR1E, old & ~0x1);
+               vga_wseq (fb_info->regs, CL_SEQR1F, 0x40 | (val & 0x3f));
        } else {
-               vga_wseq (cinfo->regbase, CL_SEQR1F, val & 0x3f);
+               vga_wseq (fb_info->regs, CL_SEQR1F, val & 0x3f);
        }
 }
 
 /*************************************************************************
-       cirrusfb_set_par_foo()
+       clgen_set_par()
 
        actually writes the values for a new video mode into the hardware,
 **************************************************************************/
-static int cirrusfb_set_par_foo (struct fb_info *info)
+static void clgen_set_par (const void *par, struct fb_info_gen *info)
 {
-       struct cirrusfb_info *cinfo = info->par;
-       struct fb_var_screeninfo *var = &info->var;
-       struct cirrusfb_regs regs;
-       caddr_t regbase = cinfo->regbase;
        unsigned char tmp;
-       int offset = 0, err;
-       const struct cirrusfb_board_info_rec *bi;
+       int offset = 0;
+       struct clgenfb_par *_par = (struct clgenfb_par *) par;
+       struct clgenfb_info *fb_info = (struct clgenfb_info *) info;
+       const struct clgen_board_info_rec *bi;
 
        DPRINTK ("ENTER\n");
        DPRINTK ("Requested mode: %dx%dx%d\n",
-              var->xres, var->yres, var->bits_per_pixel);
-       DPRINTK ("pixclock: %d\n", var->pixclock);
-
-       init_vgachip (cinfo);
-
-       err = cirrusfb_decode_var(var, &regs, info);
-       if(err) {
-               /* should never happen */
-               DPRINTK("mode change aborted.  invalid var.\n");
-               return -EINVAL;
-       }
+              _par->var.xres, _par->var.yres, _par->var.bits_per_pixel);
+       DPRINTK ("pixclock: %d\n", _par->var.pixclock);
 
-       bi = &cirrusfb_board_info[cinfo->btype];
+       bi = &clgen_board_info[fb_info->btype];
 
 
        /* unlock register VGA_CRTC_H_TOTAL..CRT7 */
-       vga_wcrt (regbase, VGA_CRTC_V_SYNC_END, 0x20);  /* previously: 0x00) */
+       vga_wcrt (fb_info->regs, VGA_CRTC_V_SYNC_END, 0x20);    /* previously: 0x00) */
 
        /* if debugging is enabled, all parameters get output before writing */
-       DPRINTK ("CRT0: %ld\n", regs.HorizTotal);
-       vga_wcrt (regbase, VGA_CRTC_H_TOTAL, regs.HorizTotal);
+       DPRINTK ("CRT0: %ld\n", _par->HorizTotal);
+       vga_wcrt (fb_info->regs, VGA_CRTC_H_TOTAL, _par->HorizTotal);
 
-       DPRINTK ("CRT1: %ld\n", regs.HorizDispEnd);
-       vga_wcrt (regbase, VGA_CRTC_H_DISP, regs.HorizDispEnd);
+       DPRINTK ("CRT1: %ld\n", _par->HorizDispEnd);
+       vga_wcrt (fb_info->regs, VGA_CRTC_H_DISP, _par->HorizDispEnd);
 
-       DPRINTK ("CRT2: %ld\n", regs.HorizBlankStart);
-       vga_wcrt (regbase, VGA_CRTC_H_BLANK_START, regs.HorizBlankStart);
+       DPRINTK ("CRT2: %ld\n", _par->HorizBlankStart);
+       vga_wcrt (fb_info->regs, VGA_CRTC_H_BLANK_START, _par->HorizBlankStart);
 
-       DPRINTK ("CRT3: 128+%ld\n", regs.HorizBlankEnd % 32);   /*  + 128: Compatible read */
-       vga_wcrt (regbase, VGA_CRTC_H_BLANK_END, 128 + (regs.HorizBlankEnd % 32));
+       DPRINTK ("CRT3: 128+%ld\n", _par->HorizBlankEnd % 32);  /*  + 128: Compatible read */
+       vga_wcrt (fb_info->regs, VGA_CRTC_H_BLANK_END, 128 + (_par->HorizBlankEnd % 32));
 
-       DPRINTK ("CRT4: %ld\n", regs.HorizSyncStart);
-       vga_wcrt (regbase, VGA_CRTC_H_SYNC_START, regs.HorizSyncStart);
+       DPRINTK ("CRT4: %ld\n", _par->HorizSyncStart);
+       vga_wcrt (fb_info->regs, VGA_CRTC_H_SYNC_START, _par->HorizSyncStart);
 
-       tmp = regs.HorizSyncEnd % 32;
-       if (regs.HorizBlankEnd & 32)
+       tmp = _par->HorizSyncEnd % 32;
+       if (_par->HorizBlankEnd & 32)
                tmp += 128;
        DPRINTK ("CRT5: %d\n", tmp);
-       vga_wcrt (regbase, VGA_CRTC_H_SYNC_END, tmp);
+       vga_wcrt (fb_info->regs, VGA_CRTC_H_SYNC_END, tmp);
 
-       DPRINTK ("CRT6: %ld\n", regs.VertTotal & 0xff);
-       vga_wcrt (regbase, VGA_CRTC_V_TOTAL, (regs.VertTotal & 0xff));
+       DPRINTK ("CRT6: %ld\n", _par->VertTotal & 0xff);
+       vga_wcrt (fb_info->regs, VGA_CRTC_V_TOTAL, (_par->VertTotal & 0xff));
 
        tmp = 16;               /* LineCompare bit #9 */
-       if (regs.VertTotal & 256)
+       if (_par->VertTotal & 256)
                tmp |= 1;
-       if (regs.VertDispEnd & 256)
+       if (_par->VertDispEnd & 256)
                tmp |= 2;
-       if (regs.VertSyncStart & 256)
+       if (_par->VertSyncStart & 256)
                tmp |= 4;
-       if (regs.VertBlankStart & 256)
+       if (_par->VertBlankStart & 256)
                tmp |= 8;
-       if (regs.VertTotal & 512)
+       if (_par->VertTotal & 512)
                tmp |= 32;
-       if (regs.VertDispEnd & 512)
+       if (_par->VertDispEnd & 512)
                tmp |= 64;
-       if (regs.VertSyncStart & 512)
+       if (_par->VertSyncStart & 512)
                tmp |= 128;
        DPRINTK ("CRT7: %d\n", tmp);
-       vga_wcrt (regbase, VGA_CRTC_OVERFLOW, tmp);
+       vga_wcrt (fb_info->regs, VGA_CRTC_OVERFLOW, tmp);
 
        tmp = 0x40;             /* LineCompare bit #8 */
-       if (regs.VertBlankStart & 512)
+       if (_par->VertBlankStart & 512)
                tmp |= 0x20;
-       if (var->vmode & FB_VMODE_DOUBLE)
+       if (_par->var.vmode & FB_VMODE_DOUBLE)
                tmp |= 0x80;
        DPRINTK ("CRT9: %d\n", tmp);
-       vga_wcrt (regbase, VGA_CRTC_MAX_SCAN, tmp);
+       vga_wcrt (fb_info->regs, VGA_CRTC_MAX_SCAN, tmp);
 
-       DPRINTK ("CRT10: %ld\n", regs.VertSyncStart & 0xff);
-       vga_wcrt (regbase, VGA_CRTC_V_SYNC_START, (regs.VertSyncStart & 0xff));
+       DPRINTK ("CRT10: %ld\n", _par->VertSyncStart & 0xff);
+       vga_wcrt (fb_info->regs, VGA_CRTC_V_SYNC_START, (_par->VertSyncStart & 0xff));
 
-       DPRINTK ("CRT11: 64+32+%ld\n", regs.VertSyncEnd % 16);
-       vga_wcrt (regbase, VGA_CRTC_V_SYNC_END, (regs.VertSyncEnd % 16 + 64 + 32));
+       DPRINTK ("CRT11: 64+32+%ld\n", _par->VertSyncEnd % 16);
+       vga_wcrt (fb_info->regs, VGA_CRTC_V_SYNC_END, (_par->VertSyncEnd % 16 + 64 + 32));
 
-       DPRINTK ("CRT12: %ld\n", regs.VertDispEnd & 0xff);
-       vga_wcrt (regbase, VGA_CRTC_V_DISP_END, (regs.VertDispEnd & 0xff));
+       DPRINTK ("CRT12: %ld\n", _par->VertDispEnd & 0xff);
+       vga_wcrt (fb_info->regs, VGA_CRTC_V_DISP_END, (_par->VertDispEnd & 0xff));
 
-       DPRINTK ("CRT15: %ld\n", regs.VertBlankStart & 0xff);
-       vga_wcrt (regbase, VGA_CRTC_V_BLANK_START, (regs.VertBlankStart & 0xff));
+       DPRINTK ("CRT15: %ld\n", _par->VertBlankStart & 0xff);
+       vga_wcrt (fb_info->regs, VGA_CRTC_V_BLANK_START, (_par->VertBlankStart & 0xff));
 
-       DPRINTK ("CRT16: %ld\n", regs.VertBlankEnd & 0xff);
-       vga_wcrt (regbase, VGA_CRTC_V_BLANK_END, (regs.VertBlankEnd & 0xff));
+       DPRINTK ("CRT16: %ld\n", _par->VertBlankEnd & 0xff);
+       vga_wcrt (fb_info->regs, VGA_CRTC_V_BLANK_END, (_par->VertBlankEnd & 0xff));
 
        DPRINTK ("CRT18: 0xff\n");
-       vga_wcrt (regbase, VGA_CRTC_LINE_COMPARE, 0xff);
+       vga_wcrt (fb_info->regs, VGA_CRTC_LINE_COMPARE, 0xff);
 
        tmp = 0;
-       if (var->vmode & FB_VMODE_INTERLACED)
+       if (_par->var.vmode & FB_VMODE_INTERLACED)
                tmp |= 1;
-       if (regs.HorizBlankEnd & 64)
+       if (_par->HorizBlankEnd & 64)
                tmp |= 16;
-       if (regs.HorizBlankEnd & 128)
+       if (_par->HorizBlankEnd & 128)
                tmp |= 32;
-       if (regs.VertBlankEnd & 256)
+       if (_par->VertBlankEnd & 256)
                tmp |= 64;
-       if (regs.VertBlankEnd & 512)
+       if (_par->VertBlankEnd & 512)
                tmp |= 128;
 
        DPRINTK ("CRT1a: %d\n", tmp);
-       vga_wcrt (regbase, CL_CRT1A, tmp);
+       vga_wcrt (fb_info->regs, CL_CRT1A, tmp);
 
        /* set VCLK0 */
        /* hardware RefClock: 14.31818 MHz */
        /* formula: VClk = (OSC * N) / (D * (1+P)) */
        /* Example: VClk = (14.31818 * 91) / (23 * (1+1)) = 28.325 MHz */
 
-       vga_wseq (regbase, CL_SEQRB, regs.nom);
-       tmp = regs.den << 1;
-       if (regs.div != 0)
+       vga_wseq (fb_info->regs, CL_SEQRB, _par->nom);
+       tmp = _par->den << 1;
+       if (_par->div != 0)
                tmp |= 1;
 
-       if ((cinfo->btype == BT_SD64) ||
-           (cinfo->btype == BT_ALPINE) ||
-           (cinfo->btype == BT_GD5480))
+       if ((fb_info->btype == BT_SD64) ||
+           (fb_info->btype == BT_ALPINE) ||
+           (fb_info->btype == BT_GD5480))
                tmp |= 0x80;    /* 6 bit denom; ONLY 5434!!! (bugged me 10 days) */
 
        DPRINTK ("CL_SEQR1B: %ld\n", (long) tmp);
-       vga_wseq (regbase, CL_SEQR1B, tmp);
+       vga_wseq (fb_info->regs, CL_SEQR1B, tmp);
 
-       if (regs.VertRes >= 1024)
+       if (_par->VertRes >= 1024)
                /* 1280x1024 */
-               vga_wcrt (regbase, VGA_CRTC_MODE, 0xc7);
+               vga_wcrt (fb_info->regs, VGA_CRTC_MODE, 0xc7);
        else
                /* mode control: VGA_CRTC_START_HI enable, ROTATE(?), 16bit
                 * address wrap, no compat. */
-               vga_wcrt (regbase, VGA_CRTC_MODE, 0xc3);
+               vga_wcrt (fb_info->regs, VGA_CRTC_MODE, 0xc3);
 
-/* HAEH?        vga_wcrt (regbase, VGA_CRTC_V_SYNC_END, 0x20);  * previously: 0x00  unlock VGA_CRTC_H_TOTAL..CRT7 */
+/* HAEH?        vga_wcrt (fb_info->regs, VGA_CRTC_V_SYNC_END, 0x20);  * previously: 0x00  unlock VGA_CRTC_H_TOTAL..CRT7 */
 
        /* don't know if it would hurt to also program this if no interlaced */
        /* mode is used, but I feel better this way.. :-) */
-       if (var->vmode & FB_VMODE_INTERLACED)
-               vga_wcrt (regbase, VGA_CRTC_REGS, regs.HorizTotal / 2);
+       if (_par->var.vmode & FB_VMODE_INTERLACED)
+               vga_wcrt (fb_info->regs, VGA_CRTC_REGS, _par->HorizTotal / 2);
        else
-               vga_wcrt (regbase, VGA_CRTC_REGS, 0x00);        /* interlace control */
+               vga_wcrt (fb_info->regs, VGA_CRTC_REGS, 0x00);  /* interlace control */
 
-       vga_wseq (regbase, VGA_SEQ_CHARACTER_MAP, 0);
+       vga_wseq (fb_info->regs, VGA_SEQ_CHARACTER_MAP, 0);
 
        /* adjust horizontal/vertical sync type (low/high) */
        tmp = 0x03;             /* enable display memory & CRTC I/O address for color mode */
-       if (var->sync & FB_SYNC_HOR_HIGH_ACT)
+       if (_par->var.sync & FB_SYNC_HOR_HIGH_ACT)
                tmp |= 0x40;
-       if (var->sync & FB_SYNC_VERT_HIGH_ACT)
+       if (_par->var.sync & FB_SYNC_VERT_HIGH_ACT)
                tmp |= 0x80;
-       WGen (cinfo, VGA_MIS_W, tmp);
+       WGen (fb_info, VGA_MIS_W, tmp);
 
-       vga_wcrt (regbase, VGA_CRTC_PRESET_ROW, 0);     /* Screen A Preset Row-Scan register */
-       vga_wcrt (regbase, VGA_CRTC_CURSOR_START, 0);   /* text cursor on and start line */
-       vga_wcrt (regbase, VGA_CRTC_CURSOR_END, 31);    /* text cursor end line */
+       vga_wcrt (fb_info->regs, VGA_CRTC_PRESET_ROW, 0);       /* Screen A Preset Row-Scan register */
+       vga_wcrt (fb_info->regs, VGA_CRTC_CURSOR_START, 0);     /* text cursor on and start line */
+       vga_wcrt (fb_info->regs, VGA_CRTC_CURSOR_END, 31);      /* text cursor end line */
 
        /******************************************************
         *
@@ -1175,12 +1272,12 @@ static int cirrusfb_set_par_foo (struct fb_info *info)
         */
 
        /* programming for different color depths */
-       if (var->bits_per_pixel == 1) {
-               DPRINTK ("cirrusfb: preparing for 1 bit deep display\n");
-               vga_wgfx (regbase, VGA_GFX_MODE, 0);    /* mode register */
+       if (_par->var.bits_per_pixel == 1) {
+               DPRINTK ("clgen: preparing for 1 bit deep display\n");
+               vga_wgfx (fb_info->regs, VGA_GFX_MODE, 0);      /* mode register */
 
                /* SR07 */
-               switch (cinfo->btype) {
+               switch (fb_info->btype) {
                case BT_SD64:
                case BT_PICCOLO:
                case BT_PICASSO:
@@ -1189,48 +1286,48 @@ static int cirrusfb_set_par_foo (struct fb_info *info)
                case BT_ALPINE:
                case BT_GD5480:
                        DPRINTK (" (for GD54xx)\n");
-                       vga_wseq (regbase, CL_SEQR7,
-                                 regs.multiplexing ?
-                                       bi->sr07_1bpp_mux : bi->sr07_1bpp);
+                       vga_wseq (fb_info->regs, CL_SEQR7,
+                                 _par->multiplexing ?
+                                       bi->sr07_1bpp_mux : bi->sr07_1bpp);
                        break;
 
                case BT_LAGUNA:
                        DPRINTK (" (for GD546x)\n");
-                       vga_wseq (regbase, CL_SEQR7,
-                               vga_rseq (regbase, CL_SEQR7) & ~0x01);
+                       vga_wseq (fb_info->regs, CL_SEQR7,
+                               vga_rseq (fb_info->regs, CL_SEQR7) & ~0x01);
                        break;
 
                default:
-                       printk (KERN_WARNING "cirrusfb: unknown Board\n");
+                       printk (KERN_WARNING "clgen: unknown Board\n");
                        break;
                }
 
                /* Extended Sequencer Mode */
-               switch (cinfo->btype) {
+               switch (fb_info->btype) {
                case BT_SD64:
                        /* setting the SEQRF on SD64 is not necessary (only during init) */
                        DPRINTK ("(for SD64)\n");
-                       vga_wseq (regbase, CL_SEQR1F, 0x1a);            /*  MCLK select */
+                       vga_wseq (fb_info->regs, CL_SEQR1F, 0x1a);              /*  MCLK select */
                        break;
 
                case BT_PICCOLO:
                        DPRINTK ("(for Piccolo)\n");
 /* ### ueberall 0x22? */
-                       vga_wseq (regbase, CL_SEQR1F, 0x22);            /* ##vorher 1c MCLK select */
-                       vga_wseq (regbase, CL_SEQRF, 0xb0);     /* evtl d0 bei 1 bit? avoid FIFO underruns..? */
+                       vga_wseq (fb_info->regs, CL_SEQR1F, 0x22);              /* ##vorher 1c MCLK select */
+                       vga_wseq (fb_info->regs, CL_SEQRF, 0xb0);       /* evtl d0 bei 1 bit? avoid FIFO underruns..? */
                        break;
 
                case BT_PICASSO:
                        DPRINTK ("(for Picasso)\n");
-                       vga_wseq (regbase, CL_SEQR1F, 0x22);            /* ##vorher 22 MCLK select */
-                       vga_wseq (regbase, CL_SEQRF, 0xd0);     /* ## vorher d0 avoid FIFO underruns..? */
+                       vga_wseq (fb_info->regs, CL_SEQR1F, 0x22);              /* ##vorher 22 MCLK select */
+                       vga_wseq (fb_info->regs, CL_SEQRF, 0xd0);       /* ## vorher d0 avoid FIFO underruns..? */
                        break;
 
                case BT_SPECTRUM:
                        DPRINTK ("(for Spectrum)\n");
 /* ### ueberall 0x22? */
-                       vga_wseq (regbase, CL_SEQR1F, 0x22);            /* ##vorher 1c MCLK select */
-                       vga_wseq (regbase, CL_SEQRF, 0xb0);     /* evtl d0? avoid FIFO underruns..? */
+                       vga_wseq (fb_info->regs, CL_SEQR1F, 0x22);              /* ##vorher 1c MCLK select */
+                       vga_wseq (fb_info->regs, CL_SEQRF, 0xb0);       /* evtl d0? avoid FIFO underruns..? */
                        break;
 
                case BT_PICASSO4:
@@ -1242,18 +1339,18 @@ static int cirrusfb_set_par_foo (struct fb_info *info)
                        break;
 
                default:
-                       printk (KERN_WARNING "cirrusfb: unknown Board\n");
+                       printk (KERN_WARNING "clgen: unknown Board\n");
                        break;
                }
 
-               WGen (cinfo, VGA_PEL_MSK, 0x01);        /* pixel mask: pass-through for first plane */
-               if (regs.multiplexing)
-                       WHDR (cinfo, 0x4a);     /* hidden dac reg: 1280x1024 */
+               WGen (fb_info, VGA_PEL_MSK, 0x01);      /* pixel mask: pass-through for first plane */
+               if (_par->multiplexing)
+                       WHDR (fb_info, 0x4a);   /* hidden dac reg: 1280x1024 */
                else
-                       WHDR (cinfo, 0);        /* hidden dac: nothing */
-               vga_wseq (regbase, VGA_SEQ_MEMORY_MODE, 0x06);  /* memory mode: odd/even, ext. memory */
-               vga_wseq (regbase, VGA_SEQ_PLANE_WRITE, 0x01);  /* plane mask: only write to first plane */
-               offset = var->xres_virtual / 16;
+                       WHDR (fb_info, 0);      /* hidden dac: nothing */
+               vga_wseq (fb_info->regs, VGA_SEQ_MEMORY_MODE, 0x06);    /* memory mode: odd/even, ext. memory */
+               vga_wseq (fb_info->regs, VGA_SEQ_PLANE_WRITE, 0x01);    /* plane mask: only write to first plane */
+               offset = _par->var.xres_virtual / 16;
        }
 
        /******************************************************
@@ -1262,9 +1359,9 @@ static int cirrusfb_set_par_foo (struct fb_info *info)
         *
         */
 
-       else if (var->bits_per_pixel == 8) {
-               DPRINTK ("cirrusfb: preparing for 8 bit deep display\n");
-               switch (cinfo->btype) {
+       else if (_par->var.bits_per_pixel == 8) {
+               DPRINTK ("clgen: preparing for 8 bit deep display\n");
+               switch (fb_info->btype) {
                case BT_SD64:
                case BT_PICCOLO:
                case BT_PICASSO:
@@ -1273,52 +1370,52 @@ static int cirrusfb_set_par_foo (struct fb_info *info)
                case BT_ALPINE:
                case BT_GD5480:
                        DPRINTK (" (for GD54xx)\n");
-                       vga_wseq (regbase, CL_SEQR7,
-                                 regs.multiplexing ?
-                                       bi->sr07_8bpp_mux : bi->sr07_8bpp);
+                       vga_wseq (fb_info->regs, CL_SEQR7,
+                                 _par->multiplexing ?
+                                       bi->sr07_8bpp_mux : bi->sr07_8bpp);
                        break;
 
                case BT_LAGUNA:
                        DPRINTK (" (for GD546x)\n");
-                       vga_wseq (regbase, CL_SEQR7,
-                               vga_rseq (regbase, CL_SEQR7) | 0x01);
+                       vga_wseq (fb_info->regs, CL_SEQR7,
+                               vga_rseq (fb_info->regs, CL_SEQR7) | 0x01);
                        break;
 
                default:
-                       printk (KERN_WARNING "cirrusfb: unknown Board\n");
+                       printk (KERN_WARNING "clgen: unknown Board\n");
                        break;
                }
 
-               switch (cinfo->btype) {
+               switch (fb_info->btype) {
                case BT_SD64:
-                       vga_wseq (regbase, CL_SEQR1F, 0x1d);            /* MCLK select */
+                       vga_wseq (fb_info->regs, CL_SEQR1F, 0x1d);              /* MCLK select */
                        break;
 
                case BT_PICCOLO:
-                       vga_wseq (regbase, CL_SEQR1F, 0x22);            /* ### vorher 1c MCLK select */
-                       vga_wseq (regbase, CL_SEQRF, 0xb0);     /* Fast Page-Mode writes */
+                       vga_wseq (fb_info->regs, CL_SEQR1F, 0x22);              /* ### vorher 1c MCLK select */
+                       vga_wseq (fb_info->regs, CL_SEQRF, 0xb0);       /* Fast Page-Mode writes */
                        break;
 
                case BT_PICASSO:
-                       vga_wseq (regbase, CL_SEQR1F, 0x22);            /* ### vorher 1c MCLK select */
-                       vga_wseq (regbase, CL_SEQRF, 0xb0);     /* Fast Page-Mode writes */
+                       vga_wseq (fb_info->regs, CL_SEQR1F, 0x22);              /* ### vorher 1c MCLK select */
+                       vga_wseq (fb_info->regs, CL_SEQRF, 0xb0);       /* Fast Page-Mode writes */
                        break;
 
                case BT_SPECTRUM:
-                       vga_wseq (regbase, CL_SEQR1F, 0x22);            /* ### vorher 1c MCLK select */
-                       vga_wseq (regbase, CL_SEQRF, 0xb0);     /* Fast Page-Mode writes */
+                       vga_wseq (fb_info->regs, CL_SEQR1F, 0x22);              /* ### vorher 1c MCLK select */
+                       vga_wseq (fb_info->regs, CL_SEQRF, 0xb0);       /* Fast Page-Mode writes */
                        break;
 
                case BT_PICASSO4:
 #ifdef CONFIG_ZORRO
-                       vga_wseq (regbase, CL_SEQRF, 0xb8);     /* ### INCOMPLETE!! */
+                       vga_wseq (fb_info->regs, CL_SEQRF, 0xb8);       /* ### INCOMPLETE!! */
 #endif
-/*          vga_wseq (regbase, CL_SEQR1F, 0x1c); */
+/*          vga_wseq (fb_info->regs, CL_SEQR1F, 0x1c); */
                        break;
 
                case BT_ALPINE:
                        DPRINTK (" (for GD543x)\n");
-                       cirrusfb_set_mclk (cinfo, regs.mclk, regs.divMCLK);
+                       clgen_set_mclk (fb_info, _par->mclk, _par->divMCLK);
                        /* We already set SRF and SR1F */
                        break;
 
@@ -1329,19 +1426,19 @@ static int cirrusfb_set_par_foo (struct fb_info *info)
                        break;
 
                default:
-                       printk (KERN_WARNING "cirrusfb: unknown Board\n");
+                       printk (KERN_WARNING "clgen: unknown Board\n");
                        break;
                }
 
-               vga_wgfx (regbase, VGA_GFX_MODE, 64);   /* mode register: 256 color mode */
-               WGen (cinfo, VGA_PEL_MSK, 0xff);        /* pixel mask: pass-through all planes */
-               if (regs.multiplexing)
-                       WHDR (cinfo, 0x4a);     /* hidden dac reg: 1280x1024 */
+               vga_wgfx (fb_info->regs, VGA_GFX_MODE, 64);     /* mode register: 256 color mode */
+               WGen (fb_info, VGA_PEL_MSK, 0xff);      /* pixel mask: pass-through all planes */
+               if (_par->multiplexing)
+                       WHDR (fb_info, 0x4a);   /* hidden dac reg: 1280x1024 */
                else
-                       WHDR (cinfo, 0);        /* hidden dac: nothing */
-               vga_wseq (regbase, VGA_SEQ_MEMORY_MODE, 0x0a);  /* memory mode: chain4, ext. memory */
-               vga_wseq (regbase, VGA_SEQ_PLANE_WRITE, 0xff);  /* plane mask: enable writing to all 4 planes */
-               offset = var->xres_virtual / 8;
+                       WHDR (fb_info, 0);      /* hidden dac: nothing */
+               vga_wseq (fb_info->regs, VGA_SEQ_MEMORY_MODE, 0x0a);    /* memory mode: chain4, ext. memory */
+               vga_wseq (fb_info->regs, VGA_SEQ_PLANE_WRITE, 0xff);    /* plane mask: enable writing to all 4 planes */
+               offset = _par->var.xres_virtual / 8;
        }
 
        /******************************************************
@@ -1350,74 +1447,74 @@ static int cirrusfb_set_par_foo (struct fb_info *info)
         *
         */
 
-       else if (var->bits_per_pixel == 16) {
-               DPRINTK ("cirrusfb: preparing for 16 bit deep display\n");
-               switch (cinfo->btype) {
+       else if (_par->var.bits_per_pixel == 16) {
+               DPRINTK ("clgen: preparing for 16 bit deep display\n");
+               switch (fb_info->btype) {
                case BT_SD64:
-                       vga_wseq (regbase, CL_SEQR7, 0xf7);     /* Extended Sequencer Mode: 256c col. mode */
-                       vga_wseq (regbase, CL_SEQR1F, 0x1e);            /* MCLK select */
+                       vga_wseq (fb_info->regs, CL_SEQR7, 0xf7);       /* Extended Sequencer Mode: 256c col. mode */
+                       vga_wseq (fb_info->regs, CL_SEQR1F, 0x1e);              /* MCLK select */
                        break;
 
                case BT_PICCOLO:
-                       vga_wseq (regbase, CL_SEQR7, 0x87);
-                       vga_wseq (regbase, CL_SEQRF, 0xb0);     /* Fast Page-Mode writes */
-                       vga_wseq (regbase, CL_SEQR1F, 0x22);            /* MCLK select */
+                       vga_wseq (fb_info->regs, CL_SEQR7, 0x87);
+                       vga_wseq (fb_info->regs, CL_SEQRF, 0xb0);       /* Fast Page-Mode writes */
+                       vga_wseq (fb_info->regs, CL_SEQR1F, 0x22);              /* MCLK select */
                        break;
 
                case BT_PICASSO:
-                       vga_wseq (regbase, CL_SEQR7, 0x27);
-                       vga_wseq (regbase, CL_SEQRF, 0xb0);     /* Fast Page-Mode writes */
-                       vga_wseq (regbase, CL_SEQR1F, 0x22);            /* MCLK select */
+                       vga_wseq (fb_info->regs, CL_SEQR7, 0x27);
+                       vga_wseq (fb_info->regs, CL_SEQRF, 0xb0);       /* Fast Page-Mode writes */
+                       vga_wseq (fb_info->regs, CL_SEQR1F, 0x22);              /* MCLK select */
                        break;
 
                case BT_SPECTRUM:
-                       vga_wseq (regbase, CL_SEQR7, 0x87);
-                       vga_wseq (regbase, CL_SEQRF, 0xb0);     /* Fast Page-Mode writes */
-                       vga_wseq (regbase, CL_SEQR1F, 0x22);            /* MCLK select */
+                       vga_wseq (fb_info->regs, CL_SEQR7, 0x87);
+                       vga_wseq (fb_info->regs, CL_SEQRF, 0xb0);       /* Fast Page-Mode writes */
+                       vga_wseq (fb_info->regs, CL_SEQR1F, 0x22);              /* MCLK select */
                        break;
 
                case BT_PICASSO4:
-                       vga_wseq (regbase, CL_SEQR7, 0x27);
-/*          vga_wseq (regbase, CL_SEQR1F, 0x1c);  */
+                       vga_wseq (fb_info->regs, CL_SEQR7, 0x27);
+/*          vga_wseq (fb_info->regs, CL_SEQR1F, 0x1c);  */
                        break;
 
                case BT_ALPINE:
                        DPRINTK (" (for GD543x)\n");
-                       if (regs.HorizRes >= 1024)
-                               vga_wseq (regbase, CL_SEQR7, 0xa7);
+                       if (_par->HorizRes >= 1024)
+                               vga_wseq (fb_info->regs, CL_SEQR7, 0xa7);
                        else
-                               vga_wseq (regbase, CL_SEQR7, 0xa3);
-                       cirrusfb_set_mclk (cinfo, regs.mclk, regs.divMCLK);
+                               vga_wseq (fb_info->regs, CL_SEQR7, 0xa3);
+                       clgen_set_mclk (fb_info, _par->mclk, _par->divMCLK);
                        break;
 
                case BT_GD5480:
                        DPRINTK (" (for GD5480)\n");
-                       vga_wseq (regbase, CL_SEQR7, 0x17);
+                       vga_wseq (fb_info->regs, CL_SEQR7, 0x17);
                        /* We already set SRF and SR1F */
                        break;
 
                case BT_LAGUNA:
                        DPRINTK (" (for GD546x)\n");
-                       vga_wseq (regbase, CL_SEQR7,
-                               vga_rseq (regbase, CL_SEQR7) & ~0x01);
+                       vga_wseq (fb_info->regs, CL_SEQR7,
+                               vga_rseq (fb_info->regs, CL_SEQR7) & ~0x01);
                        break;
 
                default:
-                       printk (KERN_WARNING "CIRRUSFB: unknown Board\n");
+                       printk (KERN_WARNING "CLGEN: unknown Board\n");
                        break;
                }
 
-               vga_wgfx (regbase, VGA_GFX_MODE, 64);   /* mode register: 256 color mode */
-               WGen (cinfo, VGA_PEL_MSK, 0xff);        /* pixel mask: pass-through all planes */
+               vga_wgfx (fb_info->regs, VGA_GFX_MODE, 64);     /* mode register: 256 color mode */
+               WGen (fb_info, VGA_PEL_MSK, 0xff);      /* pixel mask: pass-through all planes */
 #ifdef CONFIG_PCI
-               WHDR (cinfo, 0xc0);     /* Copy Xbh */
+               WHDR (fb_info, 0xc0);   /* Copy Xbh */
 #elif defined(CONFIG_ZORRO)
                /* FIXME: CONFIG_PCI and CONFIG_ZORRO may be defined both */
-               WHDR (cinfo, 0xa0);     /* hidden dac reg: nothing special */
+               WHDR (fb_info, 0xa0);   /* hidden dac reg: nothing special */
 #endif
-               vga_wseq (regbase, VGA_SEQ_MEMORY_MODE, 0x0a);  /* memory mode: chain4, ext. memory */
-               vga_wseq (regbase, VGA_SEQ_PLANE_WRITE, 0xff);  /* plane mask: enable writing to all 4 planes */
-               offset = var->xres_virtual / 4;
+               vga_wseq (fb_info->regs, VGA_SEQ_MEMORY_MODE, 0x0a);    /* memory mode: chain4, ext. memory */
+               vga_wseq (fb_info->regs, VGA_SEQ_PLANE_WRITE, 0xff);    /* plane mask: enable writing to all 4 planes */
+               offset = _par->var.xres_virtual / 4;
        }
 
        /******************************************************
@@ -1426,66 +1523,66 @@ static int cirrusfb_set_par_foo (struct fb_info *info)
         *
         */
 
-       else if (var->bits_per_pixel == 32) {
-               DPRINTK ("cirrusfb: preparing for 24/32 bit deep display\n");
-               switch (cinfo->btype) {
+       else if (_par->var.bits_per_pixel == 32) {
+               DPRINTK ("clgen: preparing for 24/32 bit deep display\n");
+               switch (fb_info->btype) {
                case BT_SD64:
-                       vga_wseq (regbase, CL_SEQR7, 0xf9);     /* Extended Sequencer Mode: 256c col. mode */
-                       vga_wseq (regbase, CL_SEQR1F, 0x1e);            /* MCLK select */
+                       vga_wseq (fb_info->regs, CL_SEQR7, 0xf9);       /* Extended Sequencer Mode: 256c col. mode */
+                       vga_wseq (fb_info->regs, CL_SEQR1F, 0x1e);              /* MCLK select */
                        break;
 
                case BT_PICCOLO:
-                       vga_wseq (regbase, CL_SEQR7, 0x85);
-                       vga_wseq (regbase, CL_SEQRF, 0xb0);     /* Fast Page-Mode writes */
-                       vga_wseq (regbase, CL_SEQR1F, 0x22);            /* MCLK select */
+                       vga_wseq (fb_info->regs, CL_SEQR7, 0x85);
+                       vga_wseq (fb_info->regs, CL_SEQRF, 0xb0);       /* Fast Page-Mode writes */
+                       vga_wseq (fb_info->regs, CL_SEQR1F, 0x22);              /* MCLK select */
                        break;
 
                case BT_PICASSO:
-                       vga_wseq (regbase, CL_SEQR7, 0x25);
-                       vga_wseq (regbase, CL_SEQRF, 0xb0);     /* Fast Page-Mode writes */
-                       vga_wseq (regbase, CL_SEQR1F, 0x22);            /* MCLK select */
+                       vga_wseq (fb_info->regs, CL_SEQR7, 0x25);
+                       vga_wseq (fb_info->regs, CL_SEQRF, 0xb0);       /* Fast Page-Mode writes */
+                       vga_wseq (fb_info->regs, CL_SEQR1F, 0x22);              /* MCLK select */
                        break;
 
                case BT_SPECTRUM:
-                       vga_wseq (regbase, CL_SEQR7, 0x85);
-                       vga_wseq (regbase, CL_SEQRF, 0xb0);     /* Fast Page-Mode writes */
-                       vga_wseq (regbase, CL_SEQR1F, 0x22);            /* MCLK select */
+                       vga_wseq (fb_info->regs, CL_SEQR7, 0x85);
+                       vga_wseq (fb_info->regs, CL_SEQRF, 0xb0);       /* Fast Page-Mode writes */
+                       vga_wseq (fb_info->regs, CL_SEQR1F, 0x22);              /* MCLK select */
                        break;
 
                case BT_PICASSO4:
-                       vga_wseq (regbase, CL_SEQR7, 0x25);
-/*          vga_wseq (regbase, CL_SEQR1F, 0x1c);  */
+                       vga_wseq (fb_info->regs, CL_SEQR7, 0x25);
+/*          vga_wseq (fb_info->regs, CL_SEQR1F, 0x1c);  */
                        break;
 
                case BT_ALPINE:
                        DPRINTK (" (for GD543x)\n");
-                       vga_wseq (regbase, CL_SEQR7, 0xa9);
-                       cirrusfb_set_mclk (cinfo, regs.mclk, regs.divMCLK);
+                       vga_wseq (fb_info->regs, CL_SEQR7, 0xa9);
+                       clgen_set_mclk (fb_info, _par->mclk, _par->divMCLK);
                        break;
 
                case BT_GD5480:
                        DPRINTK (" (for GD5480)\n");
-                       vga_wseq (regbase, CL_SEQR7, 0x19);
+                       vga_wseq (fb_info->regs, CL_SEQR7, 0x19);
                        /* We already set SRF and SR1F */
                        break;
 
                case BT_LAGUNA:
                        DPRINTK (" (for GD546x)\n");
-                       vga_wseq (regbase, CL_SEQR7,
-                               vga_rseq (regbase, CL_SEQR7) & ~0x01);
+                       vga_wseq (fb_info->regs, CL_SEQR7,
+                               vga_rseq (fb_info->regs, CL_SEQR7) & ~0x01);
                        break;
 
                default:
-                       printk (KERN_WARNING "cirrusfb: unknown Board\n");
+                       printk (KERN_WARNING "clgen: unknown Board\n");
                        break;
                }
 
-               vga_wgfx (regbase, VGA_GFX_MODE, 64);   /* mode register: 256 color mode */
-               WGen (cinfo, VGA_PEL_MSK, 0xff);        /* pixel mask: pass-through all planes */
-               WHDR (cinfo, 0xc5);     /* hidden dac reg: 8-8-8 mode (24 or 32) */
-               vga_wseq (regbase, VGA_SEQ_MEMORY_MODE, 0x0a);  /* memory mode: chain4, ext. memory */
-               vga_wseq (regbase, VGA_SEQ_PLANE_WRITE, 0xff);  /* plane mask: enable writing to all 4 planes */
-               offset = var->xres_virtual / 4;
+               vga_wgfx (fb_info->regs, VGA_GFX_MODE, 64);     /* mode register: 256 color mode */
+               WGen (fb_info, VGA_PEL_MSK, 0xff);      /* pixel mask: pass-through all planes */
+               WHDR (fb_info, 0xc5);   /* hidden dac reg: 8-8-8 mode (24 or 32) */
+               vga_wseq (fb_info->regs, VGA_SEQ_MEMORY_MODE, 0x0a);    /* memory mode: chain4, ext. memory */
+               vga_wseq (fb_info->regs, VGA_SEQ_PLANE_WRITE, 0xff);    /* plane mask: enable writing to all 4 planes */
+               offset = _par->var.xres_virtual / 4;
        }
 
        /******************************************************
@@ -1495,47 +1592,47 @@ static int cirrusfb_set_par_foo (struct fb_info *info)
         */
 
        else {
-               printk (KERN_ERR "cirrusfb: What's this?? requested color depth == %d.\n",
-                       var->bits_per_pixel);
+               printk (KERN_ERR "clgen: What's this?? requested color depth == %d.\n",
+                       _par->var.bits_per_pixel);
        }
 
-       vga_wcrt (regbase, VGA_CRTC_OFFSET, offset & 0xff);
+       vga_wcrt (fb_info->regs, VGA_CRTC_OFFSET, offset & 0xff);
        tmp = 0x22;
        if (offset & 0x100)
                tmp |= 0x10;    /* offset overflow bit */
 
-       vga_wcrt (regbase, CL_CRT1B, tmp);      /* screen start addr #16-18, fastpagemode cycles */
+       vga_wcrt (fb_info->regs, CL_CRT1B, tmp);        /* screen start addr #16-18, fastpagemode cycles */
 
-       if (cinfo->btype == BT_SD64 ||
-           cinfo->btype == BT_PICASSO4 ||
-           cinfo->btype == BT_ALPINE ||
-           cinfo->btype == BT_GD5480)
-               vga_wcrt (regbase, CL_CRT1D, 0x00);     /* screen start address bit 19 */
+       if (fb_info->btype == BT_SD64 ||
+           fb_info->btype == BT_PICASSO4 ||
+           fb_info->btype == BT_ALPINE ||
+           fb_info->btype == BT_GD5480)
+               vga_wcrt (fb_info->regs, CL_CRT1D, 0x00);       /* screen start address bit 19 */
 
-       vga_wcrt (regbase, VGA_CRTC_CURSOR_HI, 0);      /* text cursor location high */
-       vga_wcrt (regbase, VGA_CRTC_CURSOR_LO, 0);      /* text cursor location low */
-       vga_wcrt (regbase, VGA_CRTC_UNDERLINE, 0);      /* underline row scanline = at very bottom */
+       vga_wcrt (fb_info->regs, VGA_CRTC_CURSOR_HI, 0);        /* text cursor location high */
+       vga_wcrt (fb_info->regs, VGA_CRTC_CURSOR_LO, 0);        /* text cursor location low */
+       vga_wcrt (fb_info->regs, VGA_CRTC_UNDERLINE, 0);        /* underline row scanline = at very bottom */
 
-       vga_wattr (regbase, VGA_ATC_MODE, 1);   /* controller mode */
-       vga_wattr (regbase, VGA_ATC_OVERSCAN, 0);               /* overscan (border) color */
-       vga_wattr (regbase, VGA_ATC_PLANE_ENABLE, 15);  /* color plane enable */
-       vga_wattr (regbase, CL_AR33, 0);        /* pixel panning */
-       vga_wattr (regbase, VGA_ATC_COLOR_PAGE, 0);     /* color select */
+       vga_wattr (fb_info->regs, VGA_ATC_MODE, 1);     /* controller mode */
+       vga_wattr (fb_info->regs, VGA_ATC_OVERSCAN, 0);         /* overscan (border) color */
+       vga_wattr (fb_info->regs, VGA_ATC_PLANE_ENABLE, 15);    /* color plane enable */
+       vga_wattr (fb_info->regs, CL_AR33, 0);  /* pixel panning */
+       vga_wattr (fb_info->regs, VGA_ATC_COLOR_PAGE, 0);       /* color select */
 
        /* [ EGS: SetOffset(); ] */
        /* From SetOffset(): Turn on VideoEnable bit in Attribute controller */
-       AttrOn (cinfo);
+       AttrOn (fb_info);
 
-       vga_wgfx (regbase, VGA_GFX_SR_VALUE, 0);        /* set/reset register */
-       vga_wgfx (regbase, VGA_GFX_SR_ENABLE, 0);               /* set/reset enable */
-       vga_wgfx (regbase, VGA_GFX_COMPARE_VALUE, 0);   /* color compare */
-       vga_wgfx (regbase, VGA_GFX_DATA_ROTATE, 0);     /* data rotate */
-       vga_wgfx (regbase, VGA_GFX_PLANE_READ, 0);      /* read map select */
-       vga_wgfx (regbase, VGA_GFX_MISC, 1);    /* miscellaneous register */
-       vga_wgfx (regbase, VGA_GFX_COMPARE_MASK, 15);   /* color don't care */
-       vga_wgfx (regbase, VGA_GFX_BIT_MASK, 255);      /* bit mask */
+       vga_wgfx (fb_info->regs, VGA_GFX_SR_VALUE, 0);  /* set/reset register */
+       vga_wgfx (fb_info->regs, VGA_GFX_SR_ENABLE, 0);         /* set/reset enable */
+       vga_wgfx (fb_info->regs, VGA_GFX_COMPARE_VALUE, 0);     /* color compare */
+       vga_wgfx (fb_info->regs, VGA_GFX_DATA_ROTATE, 0);       /* data rotate */
+       vga_wgfx (fb_info->regs, VGA_GFX_PLANE_READ, 0);        /* read map select */
+       vga_wgfx (fb_info->regs, VGA_GFX_MISC, 1);      /* miscellaneous register */
+       vga_wgfx (fb_info->regs, VGA_GFX_COMPARE_MASK, 15);     /* color don't care */
+       vga_wgfx (fb_info->regs, VGA_GFX_BIT_MASK, 255);        /* bit mask */
 
-       vga_wseq (regbase, CL_SEQR12, 0x0);     /* graphics cursor attributes: nothing special */
+       vga_wseq (fb_info->regs, CL_SEQR12, 0x0);       /* graphics cursor attributes: nothing special */
 
        /* finally, turn on everything - turn off "FullBandwidth" bit */
        /* also, set "DotClock%2" bit where requested */
@@ -1546,112 +1643,149 @@ static int cirrusfb_set_par_foo (struct fb_info *info)
        tmp |= 0x08;
 */
 
-       vga_wseq (regbase, VGA_SEQ_CLOCK_MODE, tmp);
+       vga_wseq (fb_info->regs, VGA_SEQ_CLOCK_MODE, tmp);
        DPRINTK ("CL_SEQR1: %d\n", tmp);
 
-       cinfo->currentmode = regs;
-       info->fix.type = regs.type;
-       info->fix.visual = regs.visual;
-       info->fix.line_length = regs.line_length;
+       fb_info->currentmode = *_par;
 
+       DPRINTK ("virtual offset: (%d,%d)\n", _par->var.xoffset, _par->var.yoffset);
        /* pan to requested offset */
-       cirrusfb_pan_display (var, info);
+       clgen_pan_display (&fb_info->currentmode.var, (struct fb_info_gen *) fb_info);
 
-#ifdef CIRRUSFB_DEBUG
-       cirrusfb_dump ();
+#ifdef CLGEN_DEBUG
+       clgen_dump ();
 #endif
 
        DPRINTK ("EXIT\n");
-       return 0;
+       return;
 }
 
-/* for some reason incomprehensible to me, cirrusfb requires that you write
- * the registers twice for the settings to take..grr. -dte */
-int cirrusfb_set_par (struct fb_info *info)
+
+static int clgen_getcolreg (unsigned regno, unsigned *red, unsigned *green,
+                           unsigned *blue, unsigned *transp,
+                           struct fb_info *info)
 {
-       cirrusfb_set_par_foo (info);
-       return cirrusfb_set_par_foo (info);
+    struct clgenfb_info *fb_info = (struct clgenfb_info *)info;
+
+    if (regno > 255)
+       return 1;
+    *red = fb_info->palette[regno].red;
+    *green = fb_info->palette[regno].green;
+    *blue = fb_info->palette[regno].blue;
+    *transp = 0;
+    return 0;
 }
 
-int cirrusfb_setcolreg (unsigned regno, unsigned red, unsigned green,
-                       unsigned blue, unsigned transp,
-                       struct fb_info *info)
+
+static int clgenfb_setcolreg (unsigned regno, unsigned red, unsigned green,
+                             unsigned blue, unsigned transp,
+                             struct fb_info *info)
 {
-       struct cirrusfb_info *cinfo = info->par;
+       struct clgenfb_info *fb_info = (struct clgenfb_info *) info;
 
        if (regno > 255)
                return -EINVAL;
 
-       if (info->fix.visual == FB_VISUAL_TRUECOLOR) {
-               u32 v;
-               red >>= (16 - info->var.red.length);
-               green >>= (16 - info->var.green.length);
-               blue >>= (16 - info->var.blue.length);
-
-               if (regno>=16)
-                       return 1;
-               v = (red << info->var.red.offset) |
-                   (green << info->var.green.offset) |
-                   (blue << info->var.blue.offset);
-
-               switch (info->var.bits_per_pixel) {
-                       case 8:
-                               ((u8*)(info->pseudo_palette))[regno] = v;
-                               break;
-                       case 16:
-                               ((u16*)(info->pseudo_palette))[regno] = v;
-                               break;
-                       case 24:
-                       case 32:
-                               ((u32*)(info->pseudo_palette))[regno] = v;
-                               break;
-               }
-               return 0;
+#ifdef FBCON_HAS_CFB8
+       switch (fb_info->currentmode.var.bits_per_pixel) {
+       case 8:
+               /* "transparent" stuff is completely ignored. */
+               WClut (fb_info, regno, red >> 10, green >> 10, blue >> 10);
+               break;
+       default:
+               /* do nothing */
+               break;
        }
+#endif /* FBCON_HAS_CFB8 */
+
+       fb_info->palette[regno].red = red;
+       fb_info->palette[regno].green = green;
+       fb_info->palette[regno].blue = blue;
+
+       if (regno >= 16)
+               return 0;
 
-       cinfo->palette[regno].red = red;
-       cinfo->palette[regno].green = green;
-       cinfo->palette[regno].blue = blue;
+       switch (fb_info->currentmode.var.bits_per_pixel) {
+
+#ifdef FBCON_HAS_CFB16
+       case 16:
+               assert (regno < 16);
+               if(isPReP) {
+                       fb_info->fbcon_cmap.cfb16[regno] =
+                           ((red & 0xf800) >> 9) |
+                           ((green & 0xf800) >> 14) |
+                           ((green & 0xf800) << 2) |
+                           ((blue & 0xf800) >> 3);
+               } else {
+                       fb_info->fbcon_cmap.cfb16[regno] =
+                           ((red & 0xf800) >> 1) |
+                           ((green & 0xf800) >> 6) |
+                           ((blue & 0xf800) >> 11);
+               }
+#endif /* FBCON_HAS_CFB16 */
+
+#ifdef FBCON_HAS_CFB24
+       case 24:
+               assert (regno < 16);
+               fb_info->fbcon_cmap.cfb24[regno] =
+                       (red   << fb_info->currentmode.var.red.offset)   |
+                       (green << fb_info->currentmode.var.green.offset) |
+                       (blue  << fb_info->currentmode.var.blue.offset);
+               break;
+#endif /* FBCON_HAS_CFB24 */
 
-       if (info->var.bits_per_pixel == 8) {
-                       WClut (cinfo, regno, red >> 10, green >> 10, blue >> 10);
+#ifdef FBCON_HAS_CFB32
+       case 32:
+               assert (regno < 16);
+               if(isPReP) {
+                       fb_info->fbcon_cmap.cfb32[regno] =
+                           ((red & 0xff00)) |
+                           ((green & 0xff00) << 8) |
+                           ((blue & 0xff00) << 16);
+               } else {
+                       fb_info->fbcon_cmap.cfb32[regno] =
+                           ((red & 0xff00) << 8) |
+                           ((green & 0xff00)) |
+                           ((blue & 0xff00) >> 8);
+               }
+               break;
+#endif /* FBCON_HAS_CFB32 */
+       default:
+               /* do nothing */
+               break;
        }
 
        return 0;
-
 }
 
 /*************************************************************************
-       cirrusfb_pan_display()
+       clgen_pan_display()
 
        performs display panning - provided hardware permits this
 **************************************************************************/
-int cirrusfb_pan_display (struct fb_var_screeninfo *var,
-                         struct fb_info *info)
+static int clgen_pan_display (const struct fb_var_screeninfo *var,
+                             struct fb_info_gen *info)
 {
        int xoffset = 0;
        int yoffset = 0;
        unsigned long base;
        unsigned char tmp = 0, tmp2 = 0, xpix;
-       struct cirrusfb_info *cinfo = info->par;
+       struct clgenfb_info *fb_info = (struct clgenfb_info *) info;
 
        DPRINTK ("ENTER\n");
-       DPRINTK ("virtual offset: (%d,%d)\n", var->xoffset, var->yoffset);
 
        /* no range checks for xoffset and yoffset,   */
-       /* as fb_pan_display has already done this */
-       if (var->vmode & FB_VMODE_YWRAP)
-               return -EINVAL;
+       /* as fbgen_pan_display has already done this */
 
-       info->var.xoffset = var->xoffset;
-       info->var.yoffset = var->yoffset;
+       fb_info->currentmode.var.xoffset = var->xoffset;
+       fb_info->currentmode.var.yoffset = var->yoffset;
 
-       xoffset = var->xoffset * info->var.bits_per_pixel / 8;
+       xoffset = var->xoffset * fb_info->currentmode.var.bits_per_pixel / 8;
        yoffset = var->yoffset;
 
-       base = yoffset * cinfo->currentmode.line_length + xoffset;
+       base = yoffset * fb_info->currentmode.line_length + xoffset;
 
-       if (info->var.bits_per_pixel == 1) {
+       if (fb_info->currentmode.var.bits_per_pixel == 1) {
                /* base is already correct */
                xpix = (unsigned char) (var->xoffset % 8);
        } else {
@@ -1659,11 +1793,9 @@ int cirrusfb_pan_display (struct fb_var_screeninfo *var,
                xpix = (unsigned char) ((xoffset % 4) * 2);
        }
 
-        cirrusfb_WaitBLT(cinfo->regbase); /* make sure all the BLT's are done */
-
        /* lower 8 + 8 bits of screen start address */
-       vga_wcrt (cinfo->regbase, VGA_CRTC_START_LO, (unsigned char) (base & 0xff));
-       vga_wcrt (cinfo->regbase, VGA_CRTC_START_HI, (unsigned char) (base >> 8));
+       vga_wcrt (fb_info->regs, VGA_CRTC_START_LO, (unsigned char) (base & 0xff));
+       vga_wcrt (fb_info->regs, VGA_CRTC_START_HI, (unsigned char) (base >> 8));
 
        /* construct bits 16, 17 and 18 of screen start address */
        if (base & 0x10000)
@@ -1673,30 +1805,29 @@ int cirrusfb_pan_display (struct fb_var_screeninfo *var,
        if (base & 0x40000)
                tmp |= 0x08;
 
-       tmp2 = (vga_rcrt (cinfo->regbase, CL_CRT1B) & 0xf2) | tmp;      /* 0xf2 is %11110010, exclude tmp bits */
-       vga_wcrt (cinfo->regbase, CL_CRT1B, tmp2);
+       tmp2 = (vga_rcrt (fb_info->regs, CL_CRT1B) & 0xf2) | tmp;       /* 0xf2 is %11110010, exclude tmp bits */
+       vga_wcrt (fb_info->regs, CL_CRT1B, tmp2);
 
        /* construct bit 19 of screen start address */
-       if (cirrusfb_board_info[cinfo->btype].scrn_start_bit19) {
+       if (clgen_board_info[fb_info->btype].scrn_start_bit19) {
                tmp2 = 0;
                if (base & 0x80000)
                        tmp2 = 0x80;
-               vga_wcrt (cinfo->regbase, CL_CRT1D, tmp2);
+               vga_wcrt (fb_info->regs, CL_CRT1D, tmp2);
        }
 
        /* write pixel panning value to AR33; this does not quite work in 8bpp */
        /* ### Piccolo..? Will this work? */
-       if (info->var.bits_per_pixel == 1)
-               vga_wattr (cinfo->regbase, CL_AR33, xpix);
+       if (fb_info->currentmode.var.bits_per_pixel == 1)
+               vga_wattr (fb_info->regs, CL_AR33, xpix);
 
-       cirrusfb_WaitBLT (cinfo->regbase);
 
        DPRINTK ("EXIT\n");
        return (0);
 }
 
 
-int cirrusfb_blank (int blank_mode, struct fb_info *info)
+static int clgen_blank (int blank_mode, struct fb_info_gen *info)
 {
        /*
         *  Blank the screen if blank_mode != 0, else unblank. If blank == NULL
@@ -1709,51 +1840,57 @@ int cirrusfb_blank (int blank_mode, struct fb_info *info)
         *    blank_mode == 4: powerdown
         */
        unsigned char val;
-       struct cirrusfb_info *cinfo = info->par;
-       int current_mode = cinfo->blank_mode;
+       static int current_mode = 0;
+       struct clgenfb_info *fb_info = (struct clgenfb_info *) info;
 
        DPRINTK ("ENTER, blank mode = %d\n", blank_mode);
 
-       if (info->state != FBINFO_STATE_RUNNING ||
-           current_mode == blank_mode) {
+       if (current_mode == blank_mode) {
                DPRINTK ("EXIT, returning 0\n");
                return 0;
        }
 
        /* Undo current */
-       if (current_mode != VESA_NO_BLANKING) {
-               /* unblank the screen */
-               val = vga_rseq (cinfo->regbase, VGA_SEQ_CLOCK_MODE);
-               vga_wseq (cinfo->regbase, VGA_SEQ_CLOCK_MODE, val & 0xdf);      /* clear "FullBandwidth" bit */
-               /* and undo VESA suspend trickery */
-               vga_wgfx (cinfo->regbase, CL_GRE, 0x00);
+       switch (current_mode) {
+       case 0:         /* Screen is normal */
+               break;
+       case 1:         /* Screen is blanked */
+               val = vga_rseq (fb_info->regs, VGA_SEQ_CLOCK_MODE);
+               vga_wseq (fb_info->regs, VGA_SEQ_CLOCK_MODE, val & 0xdf);       /* clear "FullBandwidth" bit */
+               break;
+       case 2:         /* vsync suspended */
+       case 3:         /* hsync suspended */
+       case 4:         /* sceen is powered down */
+               vga_wgfx (fb_info->regs, CL_GRE, 0x00);
+               break;
+       default:
+               DPRINTK ("EXIT, returning 1\n");
+               return 1;
        }
 
        /* set new */
-       if(blank_mode != VESA_NO_BLANKING) {
-               /* blank the screen */
-               val = vga_rseq (cinfo->regbase, VGA_SEQ_CLOCK_MODE);
-               vga_wseq (cinfo->regbase, VGA_SEQ_CLOCK_MODE, val | 0x20);      /* set "FullBandwidth" bit */
-       }
-
        switch (blank_mode) {
-       case VESA_NO_BLANKING:
+       case 0:         /* Unblank screen */
                break;
-       case VESA_VSYNC_SUSPEND:
-               vga_wgfx (cinfo->regbase, CL_GRE, 0x04);
+       case 1:         /* Blank screen */
+               val = vga_rseq (fb_info->regs, VGA_SEQ_CLOCK_MODE);
+               vga_wseq (fb_info->regs, VGA_SEQ_CLOCK_MODE, val | 0x20);       /* set "FullBandwidth" bit */
                break;
-       case VESA_HSYNC_SUSPEND:
-               vga_wgfx (cinfo->regbase, CL_GRE, 0x02);
+       case 2:         /* suspend vsync */
+               vga_wgfx (fb_info->regs, CL_GRE, 0x04);
                break;
-       case VESA_POWERDOWN:
-               vga_wgfx (cinfo->regbase, CL_GRE, 0x06);
+       case 3:         /* suspend hsync */
+               vga_wgfx (fb_info->regs, CL_GRE, 0x02);
+               break;
+       case 4:         /* powerdown */
+               vga_wgfx (fb_info->regs, CL_GRE, 0x06);
                break;
        default:
                DPRINTK ("EXIT, returning 1\n");
                return 1;
        }
 
-       cinfo->blank_mode = blank_mode;
+       current_mode = blank_mode;
        DPRINTK ("EXIT, returning 0\n");
        return 0;
 }
@@ -1761,45 +1898,45 @@ int cirrusfb_blank (int blank_mode, struct fb_info *info)
 /****************************************************************************/
 /**** BEGIN Internal Routines ***********************************************/
 
-static void init_vgachip (struct cirrusfb_info *cinfo)
+static void __init init_vgachip (struct clgenfb_info *fb_info)
 {
-       const struct cirrusfb_board_info_rec *bi;
+       const struct clgen_board_info_rec *bi;
 
        DPRINTK ("ENTER\n");
 
-       assert (cinfo != NULL);
+       assert (fb_info != NULL);
 
-       bi = &cirrusfb_board_info[cinfo->btype];
+       bi = &clgen_board_info[fb_info->btype];
 
        /* reset board globally */
-       switch (cinfo->btype) {
+       switch (fb_info->btype) {
        case BT_PICCOLO:
-               WSFR (cinfo, 0x01);
+               WSFR (fb_info, 0x01);
                udelay (500);
-               WSFR (cinfo, 0x51);
+               WSFR (fb_info, 0x51);
                udelay (500);
                break;
        case BT_PICASSO:
-               WSFR2 (cinfo, 0xff);
+               WSFR2 (fb_info, 0xff);
                udelay (500);
                break;
        case BT_SD64:
        case BT_SPECTRUM:
-               WSFR (cinfo, 0x1f);
+               WSFR (fb_info, 0x1f);
                udelay (500);
-               WSFR (cinfo, 0x4f);
+               WSFR (fb_info, 0x4f);
                udelay (500);
                break;
        case BT_PICASSO4:
-               vga_wcrt (cinfo->regbase, CL_CRT51, 0x00);      /* disable flickerfixer */
+               vga_wcrt (fb_info->regs, CL_CRT51, 0x00);       /* disable flickerfixer */
                mdelay (100);
-               vga_wgfx (cinfo->regbase, CL_GR2F, 0x00);       /* from Klaus' NetBSD driver: */
-               vga_wgfx (cinfo->regbase, CL_GR33, 0x00);       /* put blitter into 542x compat */
-               vga_wgfx (cinfo->regbase, CL_GR31, 0x00);       /* mode */
+               vga_wgfx (fb_info->regs, CL_GR2F, 0x00);        /* from Klaus' NetBSD driver: */
+               vga_wgfx (fb_info->regs, CL_GR33, 0x00);        /* put blitter into 542x compat */
+               vga_wgfx (fb_info->regs, CL_GR31, 0x00);        /* mode */
                break;
 
        case BT_GD5480:
-               vga_wgfx (cinfo->regbase, CL_GR2F, 0x00);       /* from Klaus' NetBSD driver: */
+               vga_wgfx (fb_info->regs, CL_GR2F, 0x00);        /* from Klaus' NetBSD driver: */
                break;
 
        case BT_ALPINE:
@@ -1807,190 +1944,220 @@ static void init_vgachip (struct cirrusfb_info *cinfo)
                break;
 
        default:
-               printk (KERN_ERR "cirrusfb: Warning: Unknown board type\n");
+               printk (KERN_ERR "clgen: Warning: Unknown board type\n");
                break;
        }
 
-       assert (cinfo->size > 0); /* make sure RAM size set by this point */
+       assert (fb_info->size > 0); /* make sure RAM size set by this point */
+
+       /* assume it's a "large memory" board (2/4 MB) */
+       fb_info->smallboard = FALSE;
 
        /* the P4 is not fully initialized here; I rely on it having been */
        /* inited under AmigaOS already, which seems to work just fine    */
        /* (Klaus advised to do it this way)                              */
 
-       if (cinfo->btype != BT_PICASSO4) {
-               WGen (cinfo, CL_VSSM, 0x10);    /* EGS: 0x16 */
-               WGen (cinfo, CL_POS102, 0x01);
-               WGen (cinfo, CL_VSSM, 0x08);    /* EGS: 0x0e */
+       if (fb_info->btype != BT_PICASSO4) {
+               WGen (fb_info, CL_VSSM, 0x10);  /* EGS: 0x16 */
+               WGen (fb_info, CL_POS102, 0x01);
+               WGen (fb_info, CL_VSSM, 0x08);  /* EGS: 0x0e */
 
-               if (cinfo->btype != BT_SD64)
-                       WGen (cinfo, CL_VSSM2, 0x01);
+               if (fb_info->btype != BT_SD64)
+                       WGen (fb_info, CL_VSSM2, 0x01);
 
-               vga_wseq (cinfo->regbase, CL_SEQR0, 0x03);      /* reset sequencer logic */
+               vga_wseq (fb_info->regs, CL_SEQR0, 0x03);       /* reset sequencer logic */
 
-               vga_wseq (cinfo->regbase, VGA_SEQ_CLOCK_MODE, 0x21);    /* FullBandwidth (video off) and 8/9 dot clock */
-               WGen (cinfo, VGA_MIS_W, 0xc1);  /* polarity (-/-), disable access to display memory, VGA_CRTC_START_HI base address: color */
+               vga_wseq (fb_info->regs, VGA_SEQ_CLOCK_MODE, 0x21);     /* FullBandwidth (video off) and 8/9 dot clock */
+               WGen (fb_info, VGA_MIS_W, 0xc1);        /* polarity (-/-), disable access to display memory, VGA_CRTC_START_HI base address: color */
 
-/*      vga_wgfx (cinfo->regbase, CL_GRA, 0xce);    "magic cookie" - doesn't make any sense to me.. */
-               vga_wseq (cinfo->regbase, CL_SEQR6, 0x12);      /* unlock all extension registers */
+/*      vga_wgfx (fb_info->regs, CL_GRA, 0xce);    "magic cookie" - doesn't make any sense to me.. */
+               vga_wseq (fb_info->regs, CL_SEQR6, 0x12);       /* unlock all extension registers */
 
-               vga_wgfx (cinfo->regbase, CL_GR31, 0x04);       /* reset blitter */
+               vga_wgfx (fb_info->regs, CL_GR31, 0x04);        /* reset blitter */
 
-               switch (cinfo->btype) {
+               switch (fb_info->btype) {
                case BT_GD5480:
-                       vga_wseq (cinfo->regbase, CL_SEQRF, 0x98);
+                       vga_wseq (fb_info->regs, CL_SEQRF, 0x98);
                        break;
                case BT_ALPINE:
                        break;
                case BT_SD64:
-                       vga_wseq (cinfo->regbase, CL_SEQRF, 0xb8);
+                       vga_wseq (fb_info->regs, CL_SEQRF, 0xb8);
                        break;
                default:
-                       vga_wseq (cinfo->regbase, CL_SEQR16, 0x0f);
-                       vga_wseq (cinfo->regbase, CL_SEQRF, 0xb0);
+                       vga_wseq (fb_info->regs, CL_SEQR16, 0x0f);
+                       vga_wseq (fb_info->regs, CL_SEQRF, 0xb0);
                        break;
                }
        }
-       vga_wseq (cinfo->regbase, VGA_SEQ_PLANE_WRITE, 0xff);   /* plane mask: nothing */
-       vga_wseq (cinfo->regbase, VGA_SEQ_CHARACTER_MAP, 0x00); /* character map select: doesn't even matter in gx mode */
-       vga_wseq (cinfo->regbase, VGA_SEQ_MEMORY_MODE, 0x0e);   /* memory mode: chain-4, no odd/even, ext. memory */
+       vga_wseq (fb_info->regs, VGA_SEQ_PLANE_WRITE, 0xff);    /* plane mask: nothing */
+       vga_wseq (fb_info->regs, VGA_SEQ_CHARACTER_MAP, 0x00);  /* character map select: doesn't even matter in gx mode */
+       vga_wseq (fb_info->regs, VGA_SEQ_MEMORY_MODE, 0x0e);    /* memory mode: chain-4, no odd/even, ext. memory */
 
        /* controller-internal base address of video memory */
        if (bi->init_sr07)
-               vga_wseq (cinfo->regbase, CL_SEQR7, bi->sr07);
+               vga_wseq (fb_info->regs, CL_SEQR7, bi->sr07);
 
-       /*  vga_wseq (cinfo->regbase, CL_SEQR8, 0x00); *//* EEPROM control: shouldn't be necessary to write to this at all.. */
+       /*  vga_wseq (fb_info->regs, CL_SEQR8, 0x00); *//* EEPROM control: shouldn't be necessary to write to this at all.. */
 
-       vga_wseq (cinfo->regbase, CL_SEQR10, 0x00);             /* graphics cursor X position (incomplete; position gives rem. 3 bits */
-       vga_wseq (cinfo->regbase, CL_SEQR11, 0x00);             /* graphics cursor Y position (..."... ) */
-       vga_wseq (cinfo->regbase, CL_SEQR12, 0x00);             /* graphics cursor attributes */
-       vga_wseq (cinfo->regbase, CL_SEQR13, 0x00);             /* graphics cursor pattern address */
+       vga_wseq (fb_info->regs, CL_SEQR10, 0x00);              /* graphics cursor X position (incomplete; position gives rem. 3 bits */
+       vga_wseq (fb_info->regs, CL_SEQR11, 0x00);              /* graphics cursor Y position (..."... ) */
+       vga_wseq (fb_info->regs, CL_SEQR12, 0x00);              /* graphics cursor attributes */
+       vga_wseq (fb_info->regs, CL_SEQR13, 0x00);              /* graphics cursor pattern address */
 
        /* writing these on a P4 might give problems..  */
-       if (cinfo->btype != BT_PICASSO4) {
-               vga_wseq (cinfo->regbase, CL_SEQR17, 0x00);             /* configuration readback and ext. color */
-               vga_wseq (cinfo->regbase, CL_SEQR18, 0x02);             /* signature generator */
+       if (fb_info->btype != BT_PICASSO4) {
+               vga_wseq (fb_info->regs, CL_SEQR17, 0x00);              /* configuration readback and ext. color */
+               vga_wseq (fb_info->regs, CL_SEQR18, 0x02);              /* signature generator */
        }
 
        /* MCLK select etc. */
        if (bi->init_sr1f)
-               vga_wseq (cinfo->regbase, CL_SEQR1F, bi->sr1f);
-
-       vga_wcrt (cinfo->regbase, VGA_CRTC_PRESET_ROW, 0x00);   /* Screen A preset row scan: none */
-       vga_wcrt (cinfo->regbase, VGA_CRTC_CURSOR_START, 0x20); /* Text cursor start: disable text cursor */
-       vga_wcrt (cinfo->regbase, VGA_CRTC_CURSOR_END, 0x00);   /* Text cursor end: - */
-       vga_wcrt (cinfo->regbase, VGA_CRTC_START_HI, 0x00);     /* Screen start address high: 0 */
-       vga_wcrt (cinfo->regbase, VGA_CRTC_START_LO, 0x00);     /* Screen start address low: 0 */
-       vga_wcrt (cinfo->regbase, VGA_CRTC_CURSOR_HI, 0x00);    /* text cursor location high: 0 */
-       vga_wcrt (cinfo->regbase, VGA_CRTC_CURSOR_LO, 0x00);    /* text cursor location low: 0 */
-
-       vga_wcrt (cinfo->regbase, VGA_CRTC_UNDERLINE, 0x00);    /* Underline Row scanline: - */
-       vga_wcrt (cinfo->regbase, VGA_CRTC_MODE, 0xc3); /* mode control: timing enable, byte mode, no compat modes */
-       vga_wcrt (cinfo->regbase, VGA_CRTC_LINE_COMPARE, 0x00); /* Line Compare: not needed */
+               vga_wseq (fb_info->regs, CL_SEQR1F, bi->sr1f);
+
+       vga_wcrt (fb_info->regs, VGA_CRTC_PRESET_ROW, 0x00);    /* Screen A preset row scan: none */
+       vga_wcrt (fb_info->regs, VGA_CRTC_CURSOR_START, 0x20);  /* Text cursor start: disable text cursor */
+       vga_wcrt (fb_info->regs, VGA_CRTC_CURSOR_END, 0x00);    /* Text cursor end: - */
+       vga_wcrt (fb_info->regs, VGA_CRTC_START_HI, 0x00);      /* Screen start address high: 0 */
+       vga_wcrt (fb_info->regs, VGA_CRTC_START_LO, 0x00);      /* Screen start address low: 0 */
+       vga_wcrt (fb_info->regs, VGA_CRTC_CURSOR_HI, 0x00);     /* text cursor location high: 0 */
+       vga_wcrt (fb_info->regs, VGA_CRTC_CURSOR_LO, 0x00);     /* text cursor location low: 0 */
+
+       vga_wcrt (fb_info->regs, VGA_CRTC_UNDERLINE, 0x00);     /* Underline Row scanline: - */
+       vga_wcrt (fb_info->regs, VGA_CRTC_MODE, 0xc3);  /* mode control: timing enable, byte mode, no compat modes */
+       vga_wcrt (fb_info->regs, VGA_CRTC_LINE_COMPARE, 0x00);  /* Line Compare: not needed */
        /* ### add 0x40 for text modes with > 30 MHz pixclock */
-       vga_wcrt (cinfo->regbase, CL_CRT1B, 0x02);      /* ext. display controls: ext.adr. wrap */
-
-       vga_wgfx (cinfo->regbase, VGA_GFX_SR_VALUE, 0x00);      /* Set/Reset registes: - */
-       vga_wgfx (cinfo->regbase, VGA_GFX_SR_ENABLE, 0x00);     /* Set/Reset enable: - */
-       vga_wgfx (cinfo->regbase, VGA_GFX_COMPARE_VALUE, 0x00); /* Color Compare: - */
-       vga_wgfx (cinfo->regbase, VGA_GFX_DATA_ROTATE, 0x00);   /* Data Rotate: - */
-       vga_wgfx (cinfo->regbase, VGA_GFX_PLANE_READ, 0x00);    /* Read Map Select: - */
-       vga_wgfx (cinfo->regbase, VGA_GFX_MODE, 0x00);  /* Mode: conf. for 16/4/2 color mode, no odd/even, read/write mode 0 */
-       vga_wgfx (cinfo->regbase, VGA_GFX_MISC, 0x01);  /* Miscellaneous: memory map base address, graphics mode */
-       vga_wgfx (cinfo->regbase, VGA_GFX_COMPARE_MASK, 0x0f);  /* Color Don't care: involve all planes */
-       vga_wgfx (cinfo->regbase, VGA_GFX_BIT_MASK, 0xff);      /* Bit Mask: no mask at all */
-       if (cinfo->btype == BT_ALPINE)
-               vga_wgfx (cinfo->regbase, CL_GRB, 0x20);        /* (5434 can't have bit 3 set for bitblt) */
+       vga_wcrt (fb_info->regs, CL_CRT1B, 0x02);       /* ext. display controls: ext.adr. wrap */
+
+       vga_wgfx (fb_info->regs, VGA_GFX_SR_VALUE, 0x00);       /* Set/Reset registes: - */
+       vga_wgfx (fb_info->regs, VGA_GFX_SR_ENABLE, 0x00);      /* Set/Reset enable: - */
+       vga_wgfx (fb_info->regs, VGA_GFX_COMPARE_VALUE, 0x00);  /* Color Compare: - */
+       vga_wgfx (fb_info->regs, VGA_GFX_DATA_ROTATE, 0x00);    /* Data Rotate: - */
+       vga_wgfx (fb_info->regs, VGA_GFX_PLANE_READ, 0x00);     /* Read Map Select: - */
+       vga_wgfx (fb_info->regs, VGA_GFX_MODE, 0x00);   /* Mode: conf. for 16/4/2 color mode, no odd/even, read/write mode 0 */
+       vga_wgfx (fb_info->regs, VGA_GFX_MISC, 0x01);   /* Miscellaneous: memory map base address, graphics mode */
+       vga_wgfx (fb_info->regs, VGA_GFX_COMPARE_MASK, 0x0f);   /* Color Don't care: involve all planes */
+       vga_wgfx (fb_info->regs, VGA_GFX_BIT_MASK, 0xff);       /* Bit Mask: no mask at all */
+       if (fb_info->btype == BT_ALPINE)
+               vga_wgfx (fb_info->regs, CL_GRB, 0x20); /* (5434 can't have bit 3 set for bitblt) */
        else
-               vga_wgfx (cinfo->regbase, CL_GRB, 0x28);        /* Graphics controller mode extensions: finer granularity, 8byte data latches */
-
-       vga_wgfx (cinfo->regbase, CL_GRC, 0xff);        /* Color Key compare: - */
-       vga_wgfx (cinfo->regbase, CL_GRD, 0x00);        /* Color Key compare mask: - */
-       vga_wgfx (cinfo->regbase, CL_GRE, 0x00);        /* Miscellaneous control: - */
-       /*  vga_wgfx (cinfo->regbase, CL_GR10, 0x00); *//* Background color byte 1: - */
-/*  vga_wgfx (cinfo->regbase, CL_GR11, 0x00); */
-
-       vga_wattr (cinfo->regbase, VGA_ATC_PALETTE0, 0x00);     /* Attribute Controller palette registers: "identity mapping" */
-       vga_wattr (cinfo->regbase, VGA_ATC_PALETTE1, 0x01);
-       vga_wattr (cinfo->regbase, VGA_ATC_PALETTE2, 0x02);
-       vga_wattr (cinfo->regbase, VGA_ATC_PALETTE3, 0x03);
-       vga_wattr (cinfo->regbase, VGA_ATC_PALETTE4, 0x04);
-       vga_wattr (cinfo->regbase, VGA_ATC_PALETTE5, 0x05);
-       vga_wattr (cinfo->regbase, VGA_ATC_PALETTE6, 0x06);
-       vga_wattr (cinfo->regbase, VGA_ATC_PALETTE7, 0x07);
-       vga_wattr (cinfo->regbase, VGA_ATC_PALETTE8, 0x08);
-       vga_wattr (cinfo->regbase, VGA_ATC_PALETTE9, 0x09);
-       vga_wattr (cinfo->regbase, VGA_ATC_PALETTEA, 0x0a);
-       vga_wattr (cinfo->regbase, VGA_ATC_PALETTEB, 0x0b);
-       vga_wattr (cinfo->regbase, VGA_ATC_PALETTEC, 0x0c);
-       vga_wattr (cinfo->regbase, VGA_ATC_PALETTED, 0x0d);
-       vga_wattr (cinfo->regbase, VGA_ATC_PALETTEE, 0x0e);
-       vga_wattr (cinfo->regbase, VGA_ATC_PALETTEF, 0x0f);
-
-       vga_wattr (cinfo->regbase, VGA_ATC_MODE, 0x01); /* Attribute Controller mode: graphics mode */
-       vga_wattr (cinfo->regbase, VGA_ATC_OVERSCAN, 0x00);     /* Overscan color reg.: reg. 0 */
-       vga_wattr (cinfo->regbase, VGA_ATC_PLANE_ENABLE, 0x0f); /* Color Plane enable: Enable all 4 planes */
-/* ###  vga_wattr (cinfo->regbase, CL_AR33, 0x00); * Pixel Panning: - */
-       vga_wattr (cinfo->regbase, VGA_ATC_COLOR_PAGE, 0x00);   /* Color Select: - */
-
-       WGen (cinfo, VGA_PEL_MSK, 0xff);        /* Pixel mask: no mask */
-
-       if (cinfo->btype != BT_ALPINE && cinfo->btype != BT_GD5480)
-               WGen (cinfo, VGA_MIS_W, 0xc3);  /* polarity (-/-), enable display mem, VGA_CRTC_START_HI i/o base = color */
-
-       vga_wgfx (cinfo->regbase, CL_GR31, 0x04);       /* BLT Start/status: Blitter reset */
-       vga_wgfx (cinfo->regbase, CL_GR31, 0x00);       /* - " -           : "end-of-reset" */
+               vga_wgfx (fb_info->regs, CL_GRB, 0x28); /* Graphics controller mode extensions: finer granularity, 8byte data latches */
+
+       vga_wgfx (fb_info->regs, CL_GRC, 0xff); /* Color Key compare: - */
+       vga_wgfx (fb_info->regs, CL_GRD, 0x00); /* Color Key compare mask: - */
+       vga_wgfx (fb_info->regs, CL_GRE, 0x00); /* Miscellaneous control: - */
+       /*  vga_wgfx (fb_info->regs, CL_GR10, 0x00); *//* Background color byte 1: - */
+/*  vga_wgfx (fb_info->regs, CL_GR11, 0x00); */
+
+       vga_wattr (fb_info->regs, VGA_ATC_PALETTE0, 0x00);      /* Attribute Controller palette registers: "identity mapping" */
+       vga_wattr (fb_info->regs, VGA_ATC_PALETTE1, 0x01);
+       vga_wattr (fb_info->regs, VGA_ATC_PALETTE2, 0x02);
+       vga_wattr (fb_info->regs, VGA_ATC_PALETTE3, 0x03);
+       vga_wattr (fb_info->regs, VGA_ATC_PALETTE4, 0x04);
+       vga_wattr (fb_info->regs, VGA_ATC_PALETTE5, 0x05);
+       vga_wattr (fb_info->regs, VGA_ATC_PALETTE6, 0x06);
+       vga_wattr (fb_info->regs, VGA_ATC_PALETTE7, 0x07);
+       vga_wattr (fb_info->regs, VGA_ATC_PALETTE8, 0x08);
+       vga_wattr (fb_info->regs, VGA_ATC_PALETTE9, 0x09);
+       vga_wattr (fb_info->regs, VGA_ATC_PALETTEA, 0x0a);
+       vga_wattr (fb_info->regs, VGA_ATC_PALETTEB, 0x0b);
+       vga_wattr (fb_info->regs, VGA_ATC_PALETTEC, 0x0c);
+       vga_wattr (fb_info->regs, VGA_ATC_PALETTED, 0x0d);
+       vga_wattr (fb_info->regs, VGA_ATC_PALETTEE, 0x0e);
+       vga_wattr (fb_info->regs, VGA_ATC_PALETTEF, 0x0f);
+
+       vga_wattr (fb_info->regs, VGA_ATC_MODE, 0x01);  /* Attribute Controller mode: graphics mode */
+       vga_wattr (fb_info->regs, VGA_ATC_OVERSCAN, 0x00);      /* Overscan color reg.: reg. 0 */
+       vga_wattr (fb_info->regs, VGA_ATC_PLANE_ENABLE, 0x0f);  /* Color Plane enable: Enable all 4 planes */
+/* ###  vga_wattr (fb_info->regs, CL_AR33, 0x00); * Pixel Panning: - */
+       vga_wattr (fb_info->regs, VGA_ATC_COLOR_PAGE, 0x00);    /* Color Select: - */
+
+       WGen (fb_info, VGA_PEL_MSK, 0xff);      /* Pixel mask: no mask */
+
+       if (fb_info->btype != BT_ALPINE && fb_info->btype != BT_GD5480)
+               WGen (fb_info, VGA_MIS_W, 0xc3);        /* polarity (-/-), enable display mem, VGA_CRTC_START_HI i/o base = color */
+
+       vga_wgfx (fb_info->regs, CL_GR31, 0x04);        /* BLT Start/status: Blitter reset */
+       vga_wgfx (fb_info->regs, CL_GR31, 0x00);        /* - " -           : "end-of-reset" */
+
+       /* CLUT setup */
+       WClut (fb_info, 0, 0x00, 0x00, 0x00);   /* background: black */
+       WClut (fb_info, 1, 0x3f, 0x3f, 0x3f);   /* foreground: white */
+       WClut (fb_info, 2, 0x00, 0x20, 0x00);
+       WClut (fb_info, 3, 0x00, 0x20, 0x20);
+       WClut (fb_info, 4, 0x20, 0x00, 0x00);
+       WClut (fb_info, 5, 0x20, 0x00, 0x20);
+       WClut (fb_info, 6, 0x20, 0x10, 0x00);
+       WClut (fb_info, 7, 0x20, 0x20, 0x20);
+       WClut (fb_info, 8, 0x10, 0x10, 0x10);
+       WClut (fb_info, 9, 0x10, 0x10, 0x30);
+       WClut (fb_info, 10, 0x10, 0x30, 0x10);
+       WClut (fb_info, 11, 0x10, 0x30, 0x30);
+       WClut (fb_info, 12, 0x30, 0x10, 0x10);
+       WClut (fb_info, 13, 0x30, 0x10, 0x30);
+       WClut (fb_info, 14, 0x30, 0x30, 0x10);
+       WClut (fb_info, 15, 0x30, 0x30, 0x30);
+
+       /* the rest a grey ramp */
+       {
+               int i;
+
+               for (i = 16; i < 256; i++)
+                       WClut (fb_info, i, i >> 2, i >> 2, i >> 2);
+       }
+
 
        /* misc... */
-       WHDR (cinfo, 0);        /* Hidden DAC register: - */
+       WHDR (fb_info, 0);      /* Hidden DAC register: - */
 
-       printk (KERN_DEBUG "cirrusfb: This board has %ld bytes of DRAM memory\n", cinfo->size);
+       printk (KERN_INFO "clgen: This board has %ld bytes of DRAM memory\n", fb_info->size);
        DPRINTK ("EXIT\n");
        return;
 }
 
-static void switch_monitor (struct cirrusfb_info *cinfo, int on)
+static void switch_monitor (struct clgenfb_info *fb_info, int on)
 {
 #ifdef CONFIG_ZORRO /* only works on Zorro boards */
        static int IsOn = 0;    /* XXX not ok for multiple boards */
 
        DPRINTK ("ENTER\n");
 
-       if (cinfo->btype == BT_PICASSO4)
+       if (fb_info->btype == BT_PICASSO4)
                return;         /* nothing to switch */
-       if (cinfo->btype == BT_ALPINE)
+       if (fb_info->btype == BT_ALPINE)
                return;         /* nothing to switch */
-       if (cinfo->btype == BT_GD5480)
+       if (fb_info->btype == BT_GD5480)
                return;         /* nothing to switch */
-       if (cinfo->btype == BT_PICASSO) {
+       if (fb_info->btype == BT_PICASSO) {
                if ((on && !IsOn) || (!on && IsOn))
-                       WSFR (cinfo, 0xff);
+                       WSFR (fb_info, 0xff);
 
                DPRINTK ("EXIT\n");
                return;
        }
        if (on) {
-               switch (cinfo->btype) {
+               switch (fb_info->btype) {
                case BT_SD64:
-                       WSFR (cinfo, cinfo->SFR | 0x21);
+                       WSFR (fb_info, fb_info->SFR | 0x21);
                        break;
                case BT_PICCOLO:
-                       WSFR (cinfo, cinfo->SFR | 0x28);
+                       WSFR (fb_info, fb_info->SFR | 0x28);
                        break;
                case BT_SPECTRUM:
-                       WSFR (cinfo, 0x6f);
+                       WSFR (fb_info, 0x6f);
                        break;
                default: /* do nothing */ break;
                }
        } else {
-               switch (cinfo->btype) {
+               switch (fb_info->btype) {
                case BT_SD64:
-                       WSFR (cinfo, cinfo->SFR & 0xde);
+                       WSFR (fb_info, fb_info->SFR & 0xde);
                        break;
                case BT_PICCOLO:
-                       WSFR (cinfo, cinfo->SFR & 0xd7);
+                       WSFR (fb_info, fb_info->SFR & 0xd7);
                        break;
                case BT_SPECTRUM:
-                       WSFR (cinfo, 0x4f);
+                       WSFR (fb_info, 0x4f);
                        break;
                default: /* do nothing */ break;
                }
@@ -2000,130 +2167,238 @@ static void switch_monitor (struct cirrusfb_info *cinfo, int on)
 #endif /* CONFIG_ZORRO */
 }
 
-
-/******************************************/
-/* Linux 2.6-style  accelerated functions */
-/******************************************/
-
-static void cirrusfb_prim_fillrect(struct cirrusfb_info *cinfo,
-                                  const struct fb_fillrect *region)
-{
-       int m; /* bytes per pixel */
-       if(cinfo->info->var.bits_per_pixel == 1) {
-               cirrusfb_RectFill(cinfo->regbase, cinfo->info->var.bits_per_pixel,
-                                 region->dx / 8, region->dy,
-                                 region->width / 8, region->height,
-                                 region->color,
-                                 cinfo->currentmode.line_length);
-       } else {
-               m = ( cinfo->info->var.bits_per_pixel + 7 ) / 8;
-               cirrusfb_RectFill(cinfo->regbase, cinfo->info->var.bits_per_pixel,
-                                 region->dx * m, region->dy,
-                                 region->width * m, region->height,
-                                 region->color,
-                                 cinfo->currentmode.line_length);
-       }
-       return;
-}
-
-void cirrusfb_fillrect (struct fb_info *info, const struct fb_fillrect *region)
+static void clgen_set_disp (const void *par, struct display *disp,
+                           struct fb_info_gen *info)
 {
-       struct cirrusfb_info *cinfo = info->par;
-       struct fb_fillrect modded;
-       int vxres, vyres;
+       struct clgenfb_par *_par = (struct clgenfb_par *) par;
+       struct clgenfb_info *fb_info = (struct clgenfb_info *) info;
+       int accel_text;
 
-       if (info->state != FBINFO_STATE_RUNNING)
-               return;
-       if (info->flags & FBINFO_HWACCEL_DISABLED) {
-               cfb_fillrect(info, region);
-               return;
-       }
-
-       vxres = info->var.xres_virtual;
-       vyres = info->var.yres_virtual;
-
-       memcpy(&modded, region, sizeof(struct fb_fillrect));
-
-       if(!modded.width || !modded.height ||
-          modded.dx >= vxres || modded.dy >= vyres)
-               return;
-
-       if(modded.dx + modded.width  > vxres) modded.width  = vxres - modded.dx;
-       if(modded.dy + modded.height > vyres) modded.height = vyres - modded.dy;
-
-       cirrusfb_prim_fillrect(cinfo, &modded);
-}
+       DPRINTK ("ENTER\n");
 
-static void cirrusfb_prim_copyarea(struct cirrusfb_info *cinfo,
-                                  const struct fb_copyarea *area)
-{
-       int m; /* bytes per pixel */
-       if(cinfo->info->var.bits_per_pixel == 1) {
-               cirrusfb_BitBLT(cinfo->regbase, cinfo->info->var.bits_per_pixel,
-                               area->sx / 8, area->sy,
-                               area->dx / 8, area->dy,
-                               area->width / 8, area->height,
-                               cinfo->currentmode.line_length);
-       } else {
-               m = ( cinfo->info->var.bits_per_pixel + 7 ) / 8;
-               cirrusfb_BitBLT(cinfo->regbase, cinfo->info->var.bits_per_pixel,
-                               area->sx * m, area->sy,
-                               area->dx * m, area->dy,
-                               area->width * m, area->height,
-                               cinfo->currentmode.line_length);
-       }
-       return;
-}
+       assert (_par != NULL);
+       assert (fb_info != NULL);
 
+       accel_text = _par->var.accel_flags & FB_ACCELF_TEXT;
 
-void cirrusfb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
-{
-       struct cirrusfb_info *cinfo = info->par;
-       struct fb_copyarea modded;
-       u32 vxres, vyres;
-       modded.sx = area->sx;
-       modded.sy = area->sy;
-       modded.dx = area->dx;
-       modded.dy = area->dy;
-       modded.width  = area->width;
-       modded.height = area->height;
-
-       if (info->state != FBINFO_STATE_RUNNING)
-               return;
-       if (info->flags & FBINFO_HWACCEL_DISABLED) {
-               cfb_copyarea(info, area);
-               return;
+       printk ("Cirrus Logic video mode: ");
+       info->info.screen_base = (char *) fb_info->fbmem;
+       switch (_par->var.bits_per_pixel) {
+#ifdef FBCON_HAS_MFB
+       case 1:
+               printk ("monochrome\n");
+               if (fb_info->btype == BT_GD5480)
+                       info->info.screen_base = (char *) fb_info->fbmem;
+               disp->dispsw = &fbcon_mfb;
+               break;
+#endif
+#ifdef FBCON_HAS_CFB8
+       case 8:
+               printk ("8 bit color depth\n");
+               if (fb_info->btype == BT_GD5480)
+                       info->info.screen_base = (char *) fb_info->fbmem;
+               if (accel_text)
+                       disp->dispsw = &fbcon_clgen_8;
+               else
+                       disp->dispsw = &fbcon_cfb8;
+               break;
+#endif
+#ifdef FBCON_HAS_CFB16
+       case 16:
+               printk ("16 bit color depth\n");
+               if (accel_text)
+                       disp->dispsw = &fbcon_clgen_16;
+               else
+                       disp->dispsw = &fbcon_cfb16;
+               if (fb_info->btype == BT_GD5480)
+                       info->info.screen_base = (char *) fb_info->fbmem + 1 * MB_;
+               disp->dispsw_data = fb_info->fbcon_cmap.cfb16;
+               break;
+#endif
+#ifdef FBCON_HAS_CFB24
+       case 24:
+               printk ("24 bit color depth\n");
+               disp->dispsw = &fbcon_cfb24;
+               if (fb_info->btype == BT_GD5480)
+                       info->info.screen_base = (char *) fb_info->fbmem + 2 * MB_;
+               disp->dispsw_data = fb_info->fbcon_cmap.cfb24;
+               break;
+#endif
+#ifdef FBCON_HAS_CFB32
+       case 32:
+               printk ("32 bit color depth\n");
+               if (accel_text)
+                       disp->dispsw = &fbcon_clgen_32;
+               else
+                       disp->dispsw = &fbcon_cfb32;
+               if (fb_info->btype == BT_GD5480)
+                       info->info.screen_base = (char *) fb_info->fbmem + 2 * MB_;
+               disp->dispsw_data = fb_info->fbcon_cmap.cfb32;
+               break;
+#endif
+
+       default:
+               printk ("unsupported color depth\n");
+               disp->dispsw = &fbcon_dummy;
+               disp->dispsw_data = NULL;
+               break;
        }
 
-       vxres = info->var.xres_virtual;
-       vyres = info->var.yres_virtual;
+       DPRINTK ("EXIT\n");
+}
 
-       if(!modded.width || !modded.height ||
-          modded.sx >= vxres || modded.sy >= vyres ||
-          modded.dx >= vxres || modded.dy >= vyres)
-               return;
+#ifdef FBCON_HAS_CFB8
+static void fbcon_clgen8_bmove (struct display *p, int sy, int sx,
+                               int dy, int dx, int height, int width)
+{
+       struct clgenfb_info *fb_info = (struct clgenfb_info *) p->fb_info;
+
+       DPRINTK ("ENTER\n");
+
+       sx *= fontwidth (p);
+       sy *= fontheight (p);
+       dx *= fontwidth (p);
+       dy *= fontheight (p);
+       width *= fontwidth (p);
+       height *= fontheight (p);
+
+       clgen_BitBLT (fb_info->regs, (unsigned short) sx, (unsigned short) sy,
+                     (unsigned short) dx, (unsigned short) dy,
+                     (unsigned short) width, (unsigned short) height,
+                     fb_info->currentmode.line_length);
+
+       DPRINTK ("EXIT\n");
+}
+
+static void fbcon_clgen8_clear (struct vc_data *conp, struct display *p,
+                               int sy, int sx, int height, int width)
+{
+       struct clgenfb_info *fb_info = (struct clgenfb_info *) p->fb_info;
+       unsigned short col;
 
-       if(modded.sx + modded.width > vxres)  modded.width = vxres - modded.sx;
-       if(modded.dx + modded.width > vxres)  modded.width = vxres - modded.dx;
-       if(modded.sy + modded.height > vyres) modded.height = vyres - modded.sy;
-       if(modded.dy + modded.height > vyres) modded.height = vyres - modded.dy;
+       DPRINTK ("ENTER\n");
+
+       sx *= fontwidth (p);
+       sy *= fontheight (p);
+       width *= fontwidth (p);
+       height *= fontheight (p);
+
+       col = attr_bgcol_ec (p, conp);
+       col &= 0xff;
+
+       clgen_RectFill (fb_info, (unsigned short) sx, (unsigned short) sy,
+                       (unsigned short) width, (unsigned short) height,
+                       col, fb_info->currentmode.line_length);
+
+       DPRINTK ("EXIT\n");
+}
 
-       cirrusfb_prim_copyarea(cinfo, &modded);
+#endif
+
+#ifdef FBCON_HAS_CFB16
+static void fbcon_clgen16_bmove (struct display *p, int sy, int sx,
+                                int dy, int dx, int height, int width)
+{
+       struct clgenfb_info *fb_info = (struct clgenfb_info *) p->fb_info;
+
+       DPRINTK ("ENTER\n");
+
+       sx *= fontwidth (p) * 2;        /* 2 bytes/pixel */
+       sy *= fontheight (p);
+       dx *= fontwidth (p) * 2;        /* 2 bytes/pixel */
+       dy *= fontheight (p);
+       width *= fontwidth (p) * 2;     /* 2 bytes/pixel */
+       height *= fontheight (p);
+
+       clgen_BitBLT (fb_info->regs, (unsigned short) sx, (unsigned short) sy,
+                     (unsigned short) dx, (unsigned short) dy,
+                     (unsigned short) width, (unsigned short) height,
+                     fb_info->currentmode.line_length);
+
+       DPRINTK ("EXIT\n");
+}
+
+static void fbcon_clgen16_clear (struct vc_data *conp, struct display *p,
+                                int sy, int sx, int height, int width)
+{
+       struct clgenfb_info *fb_info = (struct clgenfb_info *) p->fb_info;
+       unsigned short col;
+
+       DPRINTK ("ENTER\n");
+
+       sx *= fontwidth (p) * 2;        /* 2 bytes/pixel */
+       sy *= fontheight (p);
+       width *= fontwidth (p) * 2;     /* 2 bytes/pixel? */
+       height *= fontheight (p);
+
+       col = attr_bgcol_ec (p, conp);
+       col &= 0xff;
+
+       clgen_RectFill (fb_info, (unsigned short) sx, (unsigned short) sy,
+                       (unsigned short) width, (unsigned short) height,
+                       col, fb_info->currentmode.line_length);
+
+       DPRINTK ("EXIT\n");
+}
+
+#endif
+
+#ifdef FBCON_HAS_CFB32
+static void fbcon_clgen32_bmove (struct display *p, int sy, int sx,
+                                int dy, int dx, int height, int width)
+{
+       struct clgenfb_info *fb_info = (struct clgenfb_info *) p->fb_info;
+
+       DPRINTK ("ENTER\n");
+
+       sx *= fontwidth (p) * 4;        /* 4 bytes/pixel */
+       sy *= fontheight (p);
+       dx *= fontwidth (p) * 4;        /* 4 bytes/pixel */
+       dy *= fontheight (p);
+       width *= fontwidth (p) * 4;     /* 4 bytes/pixel */
+       height *= fontheight (p);
+
+       clgen_BitBLT (fb_info->regs, (unsigned short) sx, (unsigned short) sy,
+                     (unsigned short) dx, (unsigned short) dy,
+                     (unsigned short) width, (unsigned short) height,
+                     fb_info->currentmode.line_length);
+
+       DPRINTK ("EXIT\n");
 }
 
-void cirrusfb_imageblit(struct fb_info *info, const struct fb_image *image)
+static void fbcon_clgen32_clear (struct vc_data *conp, struct display *p,
+                                int sy, int sx, int height, int width)
 {
-       struct cirrusfb_info *cinfo = info->par;
+       struct clgenfb_info *fb_info = (struct clgenfb_info *) p->fb_info;
 
-        cirrusfb_WaitBLT(cinfo->regbase);
-       cfb_imageblit(info, image);
+       unsigned short col;
+
+       DPRINTK ("ENTER\n");
+
+       sx *= fontwidth (p) * 4;        /* 4 bytes/pixel */
+       sy *= fontheight (p);
+       width *= fontwidth (p) * 4;     /* 4 bytes/pixel? */
+       height *= fontheight (p);
+
+       col = attr_bgcol_ec (p, conp);
+       col &= 0xff;
+
+       clgen_RectFill (fb_info, (unsigned short) sx, (unsigned short) sy,
+                       (unsigned short) width, (unsigned short) height,
+                       col, fb_info->currentmode.line_length);
+
+       DPRINTK ("EXIT\n");
 }
 
+#endif                         /* FBCON_HAS_CFB32 */
+
+
+
 
 #ifdef CONFIG_PPC_PREP
 #define PREP_VIDEO_BASE ((volatile unsigned long) 0xC0000000)
 #define PREP_IO_BASE    ((volatile unsigned char *) 0x80000000)
-static void get_prep_addrs (unsigned long *display, unsigned long *registers)
+static void __init get_prep_addrs (unsigned long *display, unsigned long *registers)
 {
        DPRINTK ("ENTER\n");
 
@@ -2136,6 +2411,8 @@ static void get_prep_addrs (unsigned long *display, unsigned long *registers)
 #endif                         /* CONFIG_PPC_PREP */
 
 
+
+
 #ifdef CONFIG_PCI
 static int release_io_ports = 0;
 
@@ -2143,7 +2420,7 @@ static int release_io_ports = 0;
  * based on the DRAM bandwidth bit and DRAM bank switching bit.  This
  * works with 1MB, 2MB and 4MB configurations (which the Motorola boards
  * seem to have. */
-static unsigned int cirrusfb_get_memsize (caddr_t regbase)
+static unsigned int __init clgen_get_memsize (caddr_t regbase)
 {
        unsigned long mem;
        unsigned char SRF;
@@ -2166,14 +2443,40 @@ static unsigned int cirrusfb_get_memsize (caddr_t regbase)
                mem *= 2;
        }
        /* TODO: Handling of GD5446/5480 (see XF86 sources ...) */
+       return mem;
 
        DPRINTK ("EXIT\n");
-       return mem;
 }
 
 
 
-static void get_pci_addrs (const struct pci_dev *pdev,
+static struct pci_dev * __init clgen_pci_dev_get (clgen_board_t *btype)
+{
+       struct pci_dev *pdev;
+       int i;
+
+       DPRINTK ("ENTER\n");
+
+       for (i = 0; i < ARRAY_SIZE(clgen_pci_probe_list); i++) {
+               pdev = NULL;
+               while ((pdev = pci_find_device (PCI_VENDOR_ID_CIRRUS,
+                               clgen_pci_probe_list[i].device, pdev)) != NULL) {
+                       if (pci_enable_device(pdev) == 0) {
+                               *btype = clgen_pci_probe_list[i].btype;
+                               DPRINTK ("EXIT, returning pdev=%p\n", pdev);
+                               return pdev;
+                       }
+               }
+       }
+
+       DPRINTK ("EXIT, returning NULL\n");
+       return NULL;
+}
+
+
+
+
+static void __init get_pci_addrs (const struct pci_dev *pdev,
                           unsigned long *display, unsigned long *registers)
 {
        assert (pdev != NULL);
@@ -2201,418 +2504,355 @@ static void get_pci_addrs (const struct pci_dev *pdev,
 }
 
 
-static void cirrusfb_pci_unmap (struct cirrusfb_info *cinfo)
+static void __exit clgen_pci_unmap (struct clgenfb_info *info)
 {
-       struct pci_dev *pdev = cinfo->pdev;
+       iounmap (info->fbmem);
+       release_mem_region(info->fbmem_phys, info->size);
 
-       iounmap(cinfo->fbmem);
 #if 0 /* if system didn't claim this region, we would... */
        release_mem_region(0xA0000, 65535);
 #endif
+
        if (release_io_ports)
                release_region(0x3C0, 32);
-       pci_release_regions(pdev);
-       framebuffer_release(cinfo->info);
-       pci_disable_device(pdev);
-}
-#endif /* CONFIG_PCI */
-
-
-#ifdef CONFIG_ZORRO
-static void __devexit cirrusfb_zorro_unmap (struct cirrusfb_info *cinfo)
-{
-       zorro_release_device(cinfo->zdev);
-
-       if (cinfo->btype == BT_PICASSO4) {
-               cinfo->regbase -= 0x600000;
-               iounmap ((void *)cinfo->regbase);
-               iounmap ((void *)cinfo->fbmem);
-       } else {
-               if (zorro_resource_start(cinfo->zdev) > 0x01000000)
-                       iounmap ((void *)cinfo->fbmem);
-       }
-       framebuffer_release(cinfo->info);
-}
-#endif /* CONFIG_ZORRO */
-
-static int cirrusfb_set_fbinfo(struct cirrusfb_info *cinfo)
-{
-       struct fb_info *info = cinfo->info;
-       struct fb_var_screeninfo *var = &info->var;
-
-       info->currcon = -1;
-       info->par = cinfo;
-       info->pseudo_palette = cinfo->pseudo_palette;
-       info->flags = FBINFO_DEFAULT
-                   | FBINFO_HWACCEL_XPAN
-                   | FBINFO_HWACCEL_YPAN
-                   | FBINFO_HWACCEL_FILLRECT
-                   | FBINFO_HWACCEL_COPYAREA;
-       if (noaccel)
-               info->flags |= FBINFO_HWACCEL_DISABLED;
-       info->fbops = &cirrusfb_ops;
-       info->screen_base = cinfo->fbmem;
-       if (cinfo->btype == BT_GD5480) {
-               if (var->bits_per_pixel == 16)
-                       info->screen_base += 1 * MB_;
-               if (var->bits_per_pixel == 24 || var->bits_per_pixel == 32)
-                       info->screen_base += 2 * MB_;
-       }
-
-       /* Fill fix common fields */
-       strlcpy(info->fix.id, cirrusfb_board_info[cinfo->btype].name,
-               sizeof(info->fix.id));
-
-       /* monochrome: only 1 memory plane */
-       /* 8 bit and above: Use whole memory area */
-       info->fix.smem_start = cinfo->fbmem_phys;
-       info->fix.smem_len   = (var->bits_per_pixel == 1) ? cinfo->size / 4 : cinfo->size;
-       info->fix.type       = cinfo->currentmode.type;
-       info->fix.type_aux   = 0;
-       info->fix.visual     = cinfo->currentmode.visual;
-       info->fix.xpanstep   = 1;
-       info->fix.ypanstep   = 1;
-       info->fix.ywrapstep  = 0;
-       info->fix.line_length = cinfo->currentmode.line_length;
-
-       /* FIXME: map region at 0xB8000 if available, fill in here */
-       info->fix.mmio_start = cinfo->fbregs_phys;
-       info->fix.mmio_len   = 0;
-       info->fix.accel = FB_ACCEL_NONE;
-
-       fb_alloc_cmap(&info->cmap, 256, 0);
-
-       return 0;
-}
-
-static int cirrusfb_register(struct cirrusfb_info *cinfo)
-{
-       struct fb_info *info;
-       int err;
-       cirrusfb_board_t btype;
-
-       DPRINTK ("ENTER\n");
-
-       printk (KERN_INFO "cirrusfb: Driver for Cirrus Logic based graphic boards, v" CIRRUSFB_VERSION "\n");
-
-       info = cinfo->info;
-       btype = cinfo->btype;
-
-       /* sanity checks */
-       assert (btype != BT_NONE);
-
-       DPRINTK ("cirrusfb: (RAM start set to: 0x%p)\n", cinfo->fbmem);
-
-       /* Make pretend we've set the var so our structures are in a "good" */
-       /* state, even though we haven't written the mode to the hw yet...  */
-       info->var = cirrusfb_predefined[cirrusfb_def_mode].var;
-       info->var.activate = FB_ACTIVATE_NOW;
-
-       err = cirrusfb_decode_var(&info->var, &cinfo->currentmode, info);
-       if (err < 0) {
-               /* should never happen */
-               DPRINTK("choking on default var... umm, no good.\n");
-               goto err_unmap_cirrusfb;
-       }
-
-       /* set all the vital stuff */
-       cirrusfb_set_fbinfo(cinfo);
-
-       err = register_framebuffer(info);
-       if (err < 0) {
-               printk (KERN_ERR "cirrusfb: could not register fb device; err = %d!\n", err);
-               goto err_dealloc_cmap;
-       }
-
-       DPRINTK ("EXIT, returning 0\n");
-       return 0;
-
-err_dealloc_cmap:
-       fb_dealloc_cmap(&info->cmap);
-err_unmap_cirrusfb:
-       cinfo->unmap(cinfo);
-       return err;
-}
-
-static void __devexit cirrusfb_cleanup (struct fb_info *info)
-{
-       struct cirrusfb_info *cinfo = info->par;
-       DPRINTK ("ENTER\n");
-
-       switch_monitor (cinfo, 0);
-
-       unregister_framebuffer (info);
-       fb_dealloc_cmap (&info->cmap);
-       printk ("Framebuffer unregistered\n");
-       cinfo->unmap(cinfo);
-
-       DPRINTK ("EXIT\n");
 }
 
 
-#ifdef CONFIG_PCI
-static int cirrusfb_pci_register (struct pci_dev *pdev,
-                                 const struct pci_device_id *ent)
+static int __init clgen_pci_setup (struct clgenfb_info *info,
+                                  clgen_board_t *btype)
 {
-       struct cirrusfb_info *cinfo;
-       struct fb_info *info;
-       cirrusfb_board_t btype;
+       struct pci_dev *pdev;
        unsigned long board_addr, board_size;
-       int ret;
 
-       ret = pci_enable_device(pdev);
-       if (ret < 0) {
-               printk(KERN_ERR "cirrusfb: Cannot enable PCI device\n");
-               goto err_out;
-       }
+       DPRINTK ("ENTER\n");
 
-       info = framebuffer_alloc(sizeof(struct cirrusfb_info), &pdev->dev);
-       if (!info) {
-               printk(KERN_ERR "cirrusfb: could not allocate memory\n");
-               ret = -ENOMEM;
-               goto err_disable;
+       pdev = clgen_pci_dev_get (btype);
+       if (!pdev) {
+               printk (KERN_INFO "cirrusfb: couldn't find Cirrus Logic PCI device\n");
+               DPRINTK ("EXIT, returning 1\n");
+               return 1;
        }
-
-       cinfo = info->par;
-       cinfo->info = info;
-       cinfo->pdev = pdev;
-       cinfo->btype = btype = (cirrusfb_board_t) ent->driver_data;
-
        DPRINTK (" Found PCI device, base address 0 is 0x%lx, btype set to %d\n",
-               pdev->resource[0].start, btype);
+                pdev->resource[0].start, *btype);
        DPRINTK (" base address 1 is 0x%lx\n", pdev->resource[1].start);
 
+       info->pdev = pdev;
+
        if(isPReP) {
-               pci_write_config_dword (pdev, PCI_BASE_ADDRESS_0, 0x00000000);
+               /* Xbh does this, though 0 seems to be the init value */
+               pcibios_write_config_dword (0, pdev->devfn, PCI_BASE_ADDRESS_0,
+                       0x00000000);
+
 #ifdef CONFIG_PPC_PREP
-               get_prep_addrs (&board_addr, &cinfo->fbregs_phys);
+               get_prep_addrs (&board_addr, &info->fbregs_phys);
 #endif
-               /* PReP dies if we ioremap the IO registers, but it works w/out... */
-               cinfo->regbase = (char *) cinfo->fbregs_phys;
        } else {
                DPRINTK ("Attempt to get PCI info for Cirrus Graphics Card\n");
-               get_pci_addrs (pdev, &board_addr, &cinfo->fbregs_phys);
-               cinfo->regbase = NULL;          /* FIXME: this forces VGA.  alternatives? */
+               get_pci_addrs (pdev, &board_addr, &info->fbregs_phys);
        }
 
-       DPRINTK ("Board address: 0x%lx, register address: 0x%lx\n", board_addr, cinfo->fbregs_phys);
+       DPRINTK ("Board address: 0x%lx, register address: 0x%lx\n", board_addr, info->fbregs_phys);
 
-       board_size = (btype == BT_GD5480) ?
-               32 * MB_ : cirrusfb_get_memsize (cinfo->regbase);
+       if(isPReP) {
+               /* PReP dies if we ioremap the IO registers, but it works w/out... */
+               info->regs = (char *) info->fbregs_phys;
+       } else
+               info->regs = 0;         /* FIXME: this forces VGA.  alternatives? */
 
-       ret = pci_request_regions(pdev, "cirrusfb");
-       if (ret <0) {
-               printk(KERN_ERR "cirrusfb: cannot reserve region 0x%lx, abort\n",
+       if (*btype == BT_GD5480) {
+               board_size = 32 * MB_;
+       } else {
+               board_size = clgen_get_memsize (info->regs);
+       }
+
+       if (!request_mem_region(board_addr, board_size, "clgenfb")) {
+               printk(KERN_ERR "clgen: cannot reserve region 0x%lx, abort\n",
                       board_addr);
-               goto err_release_fb;
+               return -1;
        }
 #if 0 /* if the system didn't claim this region, we would... */
-       if (!request_mem_region(0xA0000, 65535, "cirrusfb")) {
-               printk(KERN_ERR "cirrusfb: cannot reserve region 0x%lx, abort\n"
-,
+       if (!request_mem_region(0xA0000, 65535, "clgenfb")) {
+               printk(KERN_ERR "clgen: cannot reserve region 0x%lx, abort\n",
                       0xA0000L);
-               ret = -EBUSY;
-               goto err_release_regions;
+               release_mem_region(board_addr, board_size);
+               return -1;
        }
 #endif
-       if (request_region(0x3C0, 32, "cirrusfb"))
+       if (request_region(0x3C0, 32, "clgenfb"))
                release_io_ports = 1;
 
-       cinfo->fbmem = ioremap(board_addr, board_size);
-       if (!cinfo->fbmem) {
-               ret = -EIO;
-               goto err_release_legacy;
-       }
+       info->fbmem = ioremap (board_addr, board_size);
+       info->fbmem_phys = board_addr;
+       info->size = board_size;
 
-       cinfo->fbmem_phys = board_addr;
-       cinfo->size = board_size;
-       cinfo->unmap = cirrusfb_pci_unmap;
+       printk (" RAM (%lu kB) at 0x%lx, ", info->size / KB_, board_addr);
 
-       printk (" RAM (%lu kB) at 0xx%lx, ", cinfo->size / KB_, board_addr);
        printk ("Cirrus Logic chipset on PCI bus\n");
-       pci_set_drvdata(pdev, info);
-
-       return cirrusfb_register(cinfo);
 
-err_release_legacy:
-       if (release_io_ports)
-               release_region(0x3C0, 32);
-#if 0
-       release_mem_region(0xA0000, 65535);
-err_release_regions:
-#endif
-       pci_release_regions(pdev);
-err_release_fb:
-       framebuffer_release(info);
-err_disable:
-       pci_disable_device(pdev);
-err_out:
-       return ret;
+       DPRINTK ("EXIT, returning 0\n");
+       return 0;
 }
+#endif                         /* CONFIG_PCI */
+
+
 
-void __devexit cirrusfb_pci_unregister (struct pci_dev *pdev)
+
+#ifdef CONFIG_ZORRO
+static int __init clgen_zorro_find (struct zorro_dev **z_o,
+                                   struct zorro_dev **z2_o,
+                                   clgen_board_t *btype, unsigned long *size)
 {
-       struct fb_info *info = pci_get_drvdata(pdev);
-       DPRINTK ("ENTER\n");
+       struct zorro_dev *z = NULL;
+       int i;
 
-       cirrusfb_cleanup (info);
+       assert (z_o != NULL);
+       assert (btype != NULL);
 
-       DPRINTK ("EXIT\n");
+       for (i = 0; i < ARRAY_SIZE(clgen_zorro_probe_list); i++)
+               if ((z = zorro_find_device(clgen_zorro_probe_list[i].id, NULL)))
+                       break;
+
+       if (z) {
+               *z_o = z;
+               if (clgen_zorro_probe_list[i].id2)
+                       *z2_o = zorro_find_device(clgen_zorro_probe_list[i].id2, NULL);
+               else
+                       *z2_o = NULL;
+
+               *btype = clgen_zorro_probe_list[i].btype;
+               *size = clgen_zorro_probe_list[i].size;
+
+               printk (KERN_INFO "clgen: %s board detected; ",
+                       clgen_board_info[*btype].name);
+
+               return 0;
+       }
+
+       printk (KERN_NOTICE "clgen: no supported board found.\n");
+       return -1;
 }
 
-static struct pci_driver cirrusfb_pci_driver = {
-       .name           = "cirrusfb",
-       .id_table       = cirrusfb_pci_table,
-       .probe          = cirrusfb_pci_register,
-       .remove         = __devexit_p(cirrusfb_pci_unregister),
-#ifdef CONFIG_PM
-#if 0
-       .suspend        = cirrusfb_pci_suspend,
-       .resume         = cirrusfb_pci_resume,
-#endif
-#endif
-};
-#endif /* CONFIG_PCI */
 
+static void __exit clgen_zorro_unmap (struct clgenfb_info *info)
+{
+       release_mem_region(info->board_addr, info->board_size);
 
-#ifdef CONFIG_ZORRO
-static int cirrusfb_zorro_register(struct zorro_dev *z,
-                                  const struct zorro_device_id *ent)
+       if (info->btype == BT_PICASSO4) {
+               iounmap ((void *)info->board_addr);
+               iounmap ((void *)info->fbmem_phys);
+       } else {
+               if (info->board_addr > 0x01000000)
+                       iounmap ((void *)info->board_addr);
+       }
+}
+
+
+static int __init clgen_zorro_setup (struct clgenfb_info *info,
+                                    clgen_board_t *btype)
 {
-       struct cirrusfb_info *cinfo;
-       struct fb_info *info;
-       cirrusfb_board_t btype;
-       struct zorro_dev *z2 = NULL;
+       struct zorro_dev *z = NULL, *z2 = NULL;
        unsigned long board_addr, board_size, size;
-       int ret;
 
-       btype = ent->driver_data;
-       if (cirrusfb_zorro_table2[btype].id2)
-               z2 = zorro_find_device(cirrusfb_zorro_table2[btype].id2, NULL);
-       size = cirrusfb_zorro_table2[btype].size;
-       printk(KERN_INFO "cirrusfb: %s board detected; ",
-              cirrusfb_board_info[btype].name);
-
-       info = framebuffer_alloc(sizeof(struct cirrusfb_info), &z->dev);
-       if (!info) {
-               printk (KERN_ERR "cirrusfb: could not allocate memory\n");
-               ret = -ENOMEM;
-               goto err_out;
-       }
+       assert (info != NULL);
+       assert (btype != NULL);
 
-       cinfo = info->par;
-       cinfo->info = info;
-       cinfo->btype = btype;
+       if (clgen_zorro_find (&z, &z2, btype, &size))
+               return -1;
 
        assert (z > 0);
        assert (z2 >= 0);
-       assert (btype != BT_NONE);
+       assert (*btype != BT_NONE);
 
-       cinfo->zdev = z;
-       board_addr = zorro_resource_start(z);
-       board_size = zorro_resource_len(z);
-       cinfo->size = size;
+       info->board_addr = board_addr = z->resource.start;
+       info->board_size = board_size = z->resource.end-z->resource.start+1;
+       info->size = size;
 
-       if (!zorro_request_device(z, "cirrusfb")) {
-               printk(KERN_ERR "cirrusfb: cannot reserve region 0x%lx, abort\n",
+       if (!request_mem_region(board_addr, board_size, "clgenfb")) {
+               printk(KERN_ERR "clgen: cannot reserve region 0x%lx, abort\n",
                       board_addr);
-               ret = -EBUSY;
-               goto err_release_fb;
+               return -1;
        }
 
        printk (" RAM (%lu MB) at $%lx, ", board_size / MB_, board_addr);
 
-       ret = -EIO;
-
-       if (btype == BT_PICASSO4) {
+       if (*btype == BT_PICASSO4) {
                printk (" REG at $%lx\n", board_addr + 0x600000);
 
                /* To be precise, for the P4 this is not the */
                /* begin of the board, but the begin of RAM. */
                /* for P4, map in its address space in 2 chunks (### TEST! ) */
                /* (note the ugly hardcoded 16M number) */
-               cinfo->regbase = ioremap (board_addr, 16777216);
-               if (!cinfo->regbase)
-                       goto err_release_region;
-
-               DPRINTK ("cirrusfb: Virtual address for board set to: $%p\n", cinfo->regbase);
-               cinfo->regbase += 0x600000;
-               cinfo->fbregs_phys = board_addr + 0x600000;
-
-               cinfo->fbmem_phys = board_addr + 16777216;
-               cinfo->fbmem = ioremap (cinfo->fbmem_phys, 16777216);
-               if (!cinfo->fbmem)
-                       goto err_unmap_regbase;
+               info->regs = ioremap (board_addr, 16777216);
+               DPRINTK ("clgen: Virtual address for board set to: $%p\n", info->regs);
+               info->regs += 0x600000;
+               info->fbregs_phys = board_addr + 0x600000;
+
+               info->fbmem_phys = board_addr + 16777216;
+               info->fbmem = ioremap (info->fbmem_phys, 16777216);
        } else {
                printk (" REG at $%lx\n", (unsigned long) z2->resource.start);
 
-               cinfo->fbmem_phys = board_addr;
+               info->fbmem_phys = board_addr;
                if (board_addr > 0x01000000)
-                       cinfo->fbmem = ioremap (board_addr, board_size);
+                       info->fbmem = ioremap (board_addr, board_size);
                else
-                       cinfo->fbmem = (caddr_t) ZTWO_VADDR (board_addr);
-               if (!cinfo->fbmem)
-                       goto err_release_region;
+                       info->fbmem = (caddr_t) ZTWO_VADDR (board_addr);
 
                /* set address for REG area of board */
-               cinfo->regbase = (caddr_t) ZTWO_VADDR (z2->resource.start);
-               cinfo->fbregs_phys = z2->resource.start;
+               info->regs = (caddr_t) ZTWO_VADDR (z2->resource.start);
+               info->fbregs_phys = z2->resource.start;
 
-               DPRINTK ("cirrusfb: Virtual address for board set to: $%p\n", cinfo->regbase);
+               DPRINTK ("clgen: Virtual address for board set to: $%p\n", info->regs);
        }
-       cinfo->unmap = cirrusfb_zorro_unmap;
 
        printk (KERN_INFO "Cirrus Logic chipset on Zorro bus\n");
-       zorro_set_drvdata(z, info);
-
-       return cirrusfb_register(cinfo);
-
-err_unmap_regbase:
-       /* Parental advisory: explicit hack */
-       iounmap(cinfo->regbase - 0x600000);
-err_release_region:
-       release_region(board_addr, board_size);
-err_release_fb:
-       framebuffer_release(info);
-err_out:
-       return ret;
+
+       return 0;
 }
+#endif /* CONFIG_ZORRO */
+
 
-void __devexit cirrusfb_zorro_unregister(struct zorro_dev *z)
+
+/********************************************************************/
+/* clgenfb_init() - master initialization function                  */
+/********************************************************************/
+int __init clgenfb_init(void)
 {
-       struct fb_info *info = zorro_get_drvdata(z);
+       int err, j, k;
+
+       clgen_board_t btype = BT_NONE;
+       struct clgenfb_info *fb_info = NULL;
+
        DPRINTK ("ENTER\n");
 
-       cirrusfb_cleanup (info);
+       printk (KERN_INFO "clgen: Driver for Cirrus Logic based graphic boards, v" CLGEN_VERSION "\n");
 
-       DPRINTK ("EXIT\n");
-}
+       fb_info = &boards[0];   /* FIXME support multiple boards ... */
 
-static struct zorro_driver cirrusfb_zorro_driver = {
-       .name           = "cirrusfb",
-       .id_table       = cirrusfb_zorro_table,
-       .probe          = cirrusfb_zorro_register,
-       .remove         = __devexit_p(cirrusfb_zorro_unregister),
-};
-#endif /* CONFIG_ZORRO */
+#ifdef CONFIG_PCI
+       if (clgen_pci_setup (fb_info, &btype)) { /* Also does OF setup */
+               DPRINTK ("EXIT, returning -ENXIO\n");
+               return -ENXIO;
+       }
 
-int __init cirrusfb_init(void)
-{
-       int error = 0;
+#elif defined(CONFIG_ZORRO)
+       /* FIXME: CONFIG_PCI and CONFIG_ZORRO may both be defined */
+       if (clgen_zorro_setup (fb_info, &btype)) {
+               DPRINTK ("EXIT, returning -ENXIO\n");
+               return -ENXIO;
+       }
 
-#ifdef CONFIG_ZORRO
-       error |= zorro_module_init(&cirrusfb_zorro_driver);
+#else
+#error This driver requires Zorro or PCI bus.
+#endif                         /* !CONFIG_PCI, !CONFIG_ZORRO */
+
+       /* sanity checks */
+       assert (btype != BT_NONE);
+       assert (btype == clgen_board_info[btype].btype);
+
+       fb_info->btype = btype;
+
+       DPRINTK ("clgen: (RAM start set to: 0x%p)\n", fb_info->fbmem);
+
+       if (noaccel)
+       {
+               printk("clgen: disabling text acceleration support\n");
+#ifdef FBCON_HAS_CFB8
+               fbcon_clgen_8.bmove = fbcon_cfb8_bmove;
+               fbcon_clgen_8.clear = fbcon_cfb8_clear;
 #endif
-#ifdef CONFIG_PCI
-       error |= pci_module_init(&cirrusfb_pci_driver);
+#ifdef FBCON_HAS_CFB16
+               fbcon_clgen_16.bmove = fbcon_cfb16_bmove;
+               fbcon_clgen_16.clear = fbcon_cfb16_clear;
+#endif
+#ifdef FBCON_HAS_CFB32
+               fbcon_clgen_32.bmove = fbcon_cfb32_bmove;
+               fbcon_clgen_32.clear = fbcon_cfb32_clear;
 #endif
-       return error;
+       }
+
+       init_vgachip (fb_info);
+
+       /* set up a few more things, register framebuffer driver etc */
+       fb_info->gen.parsize = sizeof (struct clgenfb_par);
+       fb_info->gen.fbhw = &clgen_hwswitch;
+
+       strlcpy (fb_info->gen.info.modename, clgen_board_info[btype].name,
+                sizeof (fb_info->gen.info.modename));
+
+       fb_info->gen.info.fbops = &clgenfb_ops;
+       fb_info->gen.info.disp = &disp;
+       fb_info->gen.info.currcon = -1;
+       fb_info->gen.info.changevar = NULL;
+       fb_info->gen.info.switch_con = &fbgen_switch;
+       fb_info->gen.info.updatevar = &fbgen_update_var;
+       fb_info->gen.info.flags = FBINFO_FLAG_DEFAULT;
+
+       for (j = 0; j < 256; j++) {
+               if (j < 16) {
+                       k = color_table[j];
+                       fb_info->palette[j].red = default_red[k];
+                       fb_info->palette[j].green = default_grn[k];
+                       fb_info->palette[j].blue = default_blu[k];
+               } else {
+                       fb_info->palette[j].red =
+                       fb_info->palette[j].green =
+                       fb_info->palette[j].blue = j;
+               }
+       }
+
+       /* now that we know the board has been registered n' stuff, we */
+       /* can finally initialize it to a default mode */
+       clgenfb_default = clgenfb_predefined[clgen_def_mode].var;
+       clgenfb_default.activate = FB_ACTIVATE_NOW;
+       clgenfb_default.yres_virtual = 480 * 3;         /* for fast scrolling (YPAN-Mode) */
+       err = fbgen_do_set_var (&clgenfb_default, 1, &fb_info->gen);
+
+       if (err) {
+               DPRINTK ("EXIT, returning -EINVAL\n");
+               return -EINVAL;
+       }
+
+       disp.var = clgenfb_default;
+       fbgen_set_disp (-1, &fb_info->gen);
+       do_install_cmap (0, &fb_info->gen.info);
+
+       err = register_framebuffer (&fb_info->gen.info);
+       if (err) {
+               printk (KERN_ERR "clgen: ERROR - could not register fb device; err = %d!\n", err);
+               DPRINTK ("EXIT, returning -EINVAL\n");
+               return -EINVAL;
+       }
+       DPRINTK ("EXIT, returning 0\n");
+       return 0;
 }
 
 
 
+    /*
+     *  Cleanup (only needed for module)
+     */
+static void __exit clgenfb_cleanup (struct clgenfb_info *info)
+{
+       DPRINTK ("ENTER\n");
+
+#ifdef CONFIG_ZORRO
+       switch_monitor (info, 0);
+
+       clgen_zorro_unmap (info);
+#else
+       clgen_pci_unmap (info);
+#endif                         /* CONFIG_ZORRO */
+
+       unregister_framebuffer ((struct fb_info *) info);
+       printk ("Framebuffer unregistered\n");
+
+       DPRINTK ("EXIT\n");
+}
+
+
 #ifndef MODULE
-int __init cirrusfb_setup(char *options) {
+int __init clgenfb_setup(char *options) {
        char *this_opt, s[32];
        int i;
 
@@ -2624,12 +2864,12 @@ int __init cirrusfb_setup(char *options) {
        while ((this_opt = strsep (&options, ",")) != NULL) {   
                if (!*this_opt) continue;
 
-               DPRINTK("cirrusfb_setup: option '%s'\n", this_opt);
+               DPRINTK("clgenfb_setup: option '%s'\n", this_opt);
 
                for (i = 0; i < NUM_TOTAL_MODES; i++) {
-                       sprintf (s, "mode:%s", cirrusfb_predefined[i].name);
+                       sprintf (s, "mode:%s", clgenfb_predefined[i].name);
                        if (strcmp (this_opt, s) == 0)
-                               cirrusfb_def_mode = i;
+                               clgen_def_mode = i;
                }
                if (!strcmp(this_opt, "noaccel"))
                        noaccel = 1;
@@ -2647,20 +2887,19 @@ MODULE_AUTHOR("Copyright 1999,2000 Jeff Garzik <jgarzik@pobox.com>");
 MODULE_DESCRIPTION("Accelerated FBDev driver for Cirrus Logic chips");
 MODULE_LICENSE("GPL");
 
-void __exit cirrusfb_exit (void)
+static void __exit clgenfb_exit (void)
 {
-#ifdef CONFIG_PCI
-       pci_unregister_driver(&cirrusfb_pci_driver);
-#endif
-#ifdef CONFIG_ZORRO
-       zorro_unregister_driver(&cirrusfb_zorro_driver);
-#endif
+       DPRINTK ("ENTER\n");
+
+       clgenfb_cleanup (&boards[0]);   /* FIXME: support multiple boards */
+
+       DPRINTK ("EXIT\n");
 }
 
 #ifdef MODULE
-module_init(cirrusfb_init);
-module_exit(cirrusfb_exit);
+module_init(clgenfb_init);
 #endif
+module_exit(clgenfb_exit);
 
 
 /**********************************************************************/
@@ -2671,55 +2910,55 @@ module_exit(cirrusfb_exit);
 /**********************************************************************/
 
 /*** WGen() - write into one of the external/general registers ***/
-static void WGen (const struct cirrusfb_info *cinfo,
+static void WGen (const struct clgenfb_info *fb_info,
                  int regnum, unsigned char val)
 {
        unsigned long regofs = 0;
 
-       if (cinfo->btype == BT_PICASSO) {
+       if (fb_info->btype == BT_PICASSO) {
                /* Picasso II specific hack */
 /*              if (regnum == VGA_PEL_IR || regnum == VGA_PEL_D || regnum == CL_VSSM2) */
                if (regnum == VGA_PEL_IR || regnum == VGA_PEL_D)
                        regofs = 0xfff;
        }
 
-       vga_w (cinfo->regbase, regofs + regnum, val);
+       vga_w (fb_info->regs, regofs + regnum, val);
 }
 
 /*** RGen() - read out one of the external/general registers ***/
-static unsigned char RGen (const struct cirrusfb_info *cinfo, int regnum)
+static unsigned char RGen (const struct clgenfb_info *fb_info, int regnum)
 {
        unsigned long regofs = 0;
 
-       if (cinfo->btype == BT_PICASSO) {
+       if (fb_info->btype == BT_PICASSO) {
                /* Picasso II specific hack */
 /*              if (regnum == VGA_PEL_IR || regnum == VGA_PEL_D || regnum == CL_VSSM2) */
                if (regnum == VGA_PEL_IR || regnum == VGA_PEL_D)
                        regofs = 0xfff;
        }
 
-       return vga_r (cinfo->regbase, regofs + regnum);
+       return vga_r (fb_info->regs, regofs + regnum);
 }
 
 /*** AttrOn() - turn on VideoEnable for Attribute controller ***/
-static void AttrOn (const struct cirrusfb_info *cinfo)
+static void AttrOn (const struct clgenfb_info *fb_info)
 {
-       assert (cinfo != NULL);
+       assert (fb_info != NULL);
 
        DPRINTK ("ENTER\n");
 
-       if (vga_rcrt (cinfo->regbase, CL_CRT24) & 0x80) {
+       if (vga_rcrt (fb_info->regs, CL_CRT24) & 0x80) {
                /* if we're just in "write value" mode, write back the */
                /* same value as before to not modify anything */
-               vga_w (cinfo->regbase, VGA_ATT_IW,
-                      vga_r (cinfo->regbase, VGA_ATT_R));
+               vga_w (fb_info->regs, VGA_ATT_IW,
+                      vga_r (fb_info->regs, VGA_ATT_R));
        }
        /* turn on video bit */
-/*      vga_w (cinfo->regbase, VGA_ATT_IW, 0x20); */
-       vga_w (cinfo->regbase, VGA_ATT_IW, 0x33);
+/*      vga_w (fb_info->regs, VGA_ATT_IW, 0x20); */
+       vga_w (fb_info->regs, VGA_ATT_IW, 0x33);
 
        /* dummy write on Reg0 to be on "write index" mode next time */
-       vga_w (cinfo->regbase, VGA_ATT_IW, 0x00);
+       vga_w (fb_info->regs, VGA_ATT_IW, 0x00);
 
        DPRINTK ("EXIT\n");
 }
@@ -2730,127 +2969,127 @@ static void AttrOn (const struct cirrusfb_info *cinfo)
  * registers of their functional group) here is a specialized routine for
  * accessing the HDR
  */
-static void WHDR (const struct cirrusfb_info *cinfo, unsigned char val)
+static void WHDR (const struct clgenfb_info *fb_info, unsigned char val)
 {
        unsigned char dummy;
 
-       if (cinfo->btype == BT_PICASSO) {
+       if (fb_info->btype == BT_PICASSO) {
                /* Klaus' hint for correct access to HDR on some boards */
                /* first write 0 to pixel mask (3c6) */
-               WGen (cinfo, VGA_PEL_MSK, 0x00);
+               WGen (fb_info, VGA_PEL_MSK, 0x00);
                udelay (200);
                /* next read dummy from pixel address (3c8) */
-               dummy = RGen (cinfo, VGA_PEL_IW);
+               dummy = RGen (fb_info, VGA_PEL_IW);
                udelay (200);
        }
        /* now do the usual stuff to access the HDR */
 
-       dummy = RGen (cinfo, VGA_PEL_MSK);
+       dummy = RGen (fb_info, VGA_PEL_MSK);
        udelay (200);
-       dummy = RGen (cinfo, VGA_PEL_MSK);
+       dummy = RGen (fb_info, VGA_PEL_MSK);
        udelay (200);
-       dummy = RGen (cinfo, VGA_PEL_MSK);
+       dummy = RGen (fb_info, VGA_PEL_MSK);
        udelay (200);
-       dummy = RGen (cinfo, VGA_PEL_MSK);
+       dummy = RGen (fb_info, VGA_PEL_MSK);
        udelay (200);
 
-       WGen (cinfo, VGA_PEL_MSK, val);
+       WGen (fb_info, VGA_PEL_MSK, val);
        udelay (200);
 
-       if (cinfo->btype == BT_PICASSO) {
+       if (fb_info->btype == BT_PICASSO) {
                /* now first reset HDR access counter */
-               dummy = RGen (cinfo, VGA_PEL_IW);
+               dummy = RGen (fb_info, VGA_PEL_IW);
                udelay (200);
 
                /* and at the end, restore the mask value */
                /* ## is this mask always 0xff? */
-               WGen (cinfo, VGA_PEL_MSK, 0xff);
+               WGen (fb_info, VGA_PEL_MSK, 0xff);
                udelay (200);
        }
 }
 
 
 /*** WSFR() - write to the "special function register" (SFR) ***/
-static void WSFR (struct cirrusfb_info *cinfo, unsigned char val)
+static void WSFR (struct clgenfb_info *fb_info, unsigned char val)
 {
 #ifdef CONFIG_ZORRO
-       assert (cinfo->regbase != NULL);
-       cinfo->SFR = val;
-       z_writeb (val, cinfo->regbase + 0x8000);
+       assert (fb_info->regs != NULL);
+       fb_info->SFR = val;
+       z_writeb (val, fb_info->regs + 0x8000);
 #endif
 }
 
 /* The Picasso has a second register for switching the monitor bit */
-static void WSFR2 (struct cirrusfb_info *cinfo, unsigned char val)
+static void WSFR2 (struct clgenfb_info *fb_info, unsigned char val)
 {
 #ifdef CONFIG_ZORRO
        /* writing an arbitrary value to this one causes the monitor switcher */
        /* to flip to Amiga display */
-       assert (cinfo->regbase != NULL);
-       cinfo->SFR = val;
-       z_writeb (val, cinfo->regbase + 0x9000);
+       assert (fb_info->regs != NULL);
+       fb_info->SFR = val;
+       z_writeb (val, fb_info->regs + 0x9000);
 #endif
 }
 
 
 /*** WClut - set CLUT entry (range: 0..63) ***/
-static void WClut (struct cirrusfb_info *cinfo, unsigned char regnum, unsigned char red,
+static void WClut (struct clgenfb_info *fb_info, unsigned char regnum, unsigned char red,
            unsigned char green, unsigned char blue)
 {
        unsigned int data = VGA_PEL_D;
 
        /* address write mode register is not translated.. */
-       vga_w (cinfo->regbase, VGA_PEL_IW, regnum);
+       vga_w (fb_info->regs, VGA_PEL_IW, regnum);
 
-       if (cinfo->btype == BT_PICASSO || cinfo->btype == BT_PICASSO4 ||
-           cinfo->btype == BT_ALPINE || cinfo->btype == BT_GD5480) {
+       if (fb_info->btype == BT_PICASSO || fb_info->btype == BT_PICASSO4 ||
+           fb_info->btype == BT_ALPINE || fb_info->btype == BT_GD5480) {
                /* but DAC data register IS, at least for Picasso II */
-               if (cinfo->btype == BT_PICASSO)
+               if (fb_info->btype == BT_PICASSO)
                        data += 0xfff;
-               vga_w (cinfo->regbase, data, red);
-               vga_w (cinfo->regbase, data, green);
-               vga_w (cinfo->regbase, data, blue);
+               vga_w (fb_info->regs, data, red);
+               vga_w (fb_info->regs, data, green);
+               vga_w (fb_info->regs, data, blue);
        } else {
-               vga_w (cinfo->regbase, data, blue);
-               vga_w (cinfo->regbase, data, green);
-               vga_w (cinfo->regbase, data, red);
+               vga_w (fb_info->regs, data, blue);
+               vga_w (fb_info->regs, data, green);
+               vga_w (fb_info->regs, data, red);
        }
 }
 
 
 #if 0
 /*** RClut - read CLUT entry (range 0..63) ***/
-static void RClut (struct cirrusfb_info *cinfo, unsigned char regnum, unsigned char *red,
+static void RClut (struct clgenfb_info *fb_info, unsigned char regnum, unsigned char *red,
            unsigned char *green, unsigned char *blue)
 {
        unsigned int data = VGA_PEL_D;
 
-       vga_w (cinfo->regbase, VGA_PEL_IR, regnum);
+       vga_w (fb_info->regs, VGA_PEL_IR, regnum);
 
-       if (cinfo->btype == BT_PICASSO || cinfo->btype == BT_PICASSO4 ||
-           cinfo->btype == BT_ALPINE || cinfo->btype == BT_GD5480) {
-               if (cinfo->btype == BT_PICASSO)
+       if (fb_info->btype == BT_PICASSO || fb_info->btype == BT_PICASSO4 ||
+           fb_info->btype == BT_ALPINE || fb_info->btype == BT_GD5480) {
+               if (fb_info->btype == BT_PICASSO)
                        data += 0xfff;
-               *red = vga_r (cinfo->regbase, data);
-               *green = vga_r (cinfo->regbase, data);
-               *blue = vga_r (cinfo->regbase, data);
+               *red = vga_r (fb_info->regs, data);
+               *green = vga_r (fb_info->regs, data);
+               *blue = vga_r (fb_info->regs, data);
        } else {
-               *blue = vga_r (cinfo->regbase, data);
-               *green = vga_r (cinfo->regbase, data);
-               *red = vga_r (cinfo->regbase, data);
+               *blue = vga_r (fb_info->regs, data);
+               *green = vga_r (fb_info->regs, data);
+               *red = vga_r (fb_info->regs, data);
        }
 }
 #endif
 
 
 /*******************************************************************
-       cirrusfb_WaitBLT()
+       clgen_WaitBLT()
 
        Wait for the BitBLT engine to complete a possible earlier job
 *********************************************************************/
 
 /* FIXME: use interrupts instead */
-static void cirrusfb_WaitBLT (caddr_t regbase)
+static inline void clgen_WaitBLT (caddr_t regbase)
 {
        /* now busy-wait until we're done */
        while (vga_rgfx (regbase, CL_GR31) & 0x08)
@@ -2858,14 +3097,13 @@ static void cirrusfb_WaitBLT (caddr_t regbase)
 }
 
 /*******************************************************************
-       cirrusfb_BitBLT()
+       clgen_BitBLT()
 
        perform accelerated "scrolling"
 ********************************************************************/
 
-static void cirrusfb_BitBLT (caddr_t regbase, int bits_per_pixel,
-                            u_short curx, u_short cury, u_short destx, u_short desty,
-                            u_short width, u_short height, u_short line_length)
+static void clgen_BitBLT (caddr_t regbase, u_short curx, u_short cury, u_short destx, u_short desty,
+                  u_short width, u_short height, u_short line_length)
 {
        u_short nwidth, nheight;
        u_long nsrc, ndest;
@@ -2896,6 +3134,8 @@ static void cirrusfb_BitBLT (caddr_t regbase, int bits_per_pixel,
                ndest = desty * line_length + destx + nheight * line_length + nwidth;
        }
 
+        clgen_WaitBLT(regbase);
+
        /*
           run-down of registers to be programmed:
           destination pitch
@@ -2909,8 +3149,6 @@ static void cirrusfb_BitBLT (caddr_t regbase, int bits_per_pixel,
           start/stop
         */
 
-        cirrusfb_WaitBLT(regbase);
-
        /* pitch: set to line_length */
        vga_wgfx (regbase, CL_GR24, line_length & 0xff);        /* dest pitch low */
        vga_wgfx (regbase, CL_GR25, (line_length >> 8));        /* dest pitch hi */
@@ -2949,12 +3187,12 @@ static void cirrusfb_BitBLT (caddr_t regbase, int bits_per_pixel,
 
 
 /*******************************************************************
-       cirrusfb_RectFill()
+       clgen_RectFill()
 
        perform accelerated rectangle fill
 ********************************************************************/
 
-static void cirrusfb_RectFill (caddr_t regbase, int bits_per_pixel,
+static void clgen_RectFill (struct clgenfb_info *fb_info,
                     u_short x, u_short y, u_short width, u_short height,
                     u_char color, u_short line_length)
 {
@@ -2969,61 +3207,61 @@ static void cirrusfb_RectFill (caddr_t regbase, int bits_per_pixel,
 
        ndest = (y * line_length) + x;
 
-        cirrusfb_WaitBLT(regbase);
+        clgen_WaitBLT(fb_info->regs);
 
        /* pitch: set to line_length */
-       vga_wgfx (regbase, CL_GR24, line_length & 0xff);        /* dest pitch low */
-       vga_wgfx (regbase, CL_GR25, (line_length >> 8));        /* dest pitch hi */
-       vga_wgfx (regbase, CL_GR26, line_length & 0xff);        /* source pitch low */
-       vga_wgfx (regbase, CL_GR27, (line_length >> 8));        /* source pitch hi */
+       vga_wgfx (fb_info->regs, CL_GR24, line_length & 0xff);  /* dest pitch low */
+       vga_wgfx (fb_info->regs, CL_GR25, (line_length >> 8));  /* dest pitch hi */
+       vga_wgfx (fb_info->regs, CL_GR26, line_length & 0xff);  /* source pitch low */
+       vga_wgfx (fb_info->regs, CL_GR27, (line_length >> 8));  /* source pitch hi */
 
        /* BLT width: actual number of pixels - 1 */
-       vga_wgfx (regbase, CL_GR20, nwidth & 0xff);     /* BLT width low */
-       vga_wgfx (regbase, CL_GR21, (nwidth >> 8));     /* BLT width hi */
+       vga_wgfx (fb_info->regs, CL_GR20, nwidth & 0xff);       /* BLT width low */
+       vga_wgfx (fb_info->regs, CL_GR21, (nwidth >> 8));       /* BLT width hi */
 
        /* BLT height: actual number of lines -1 */
-       vga_wgfx (regbase, CL_GR22, nheight & 0xff);            /* BLT height low */
-       vga_wgfx (regbase, CL_GR23, (nheight >> 8));            /* BLT width hi */
+       vga_wgfx (fb_info->regs, CL_GR22, nheight & 0xff);              /* BLT height low */
+       vga_wgfx (fb_info->regs, CL_GR23, (nheight >> 8));              /* BLT width hi */
 
        /* BLT destination */
-       vga_wgfx (regbase, CL_GR28, (u_char) (ndest & 0xff));   /* BLT dest low */
-       vga_wgfx (regbase, CL_GR29, (u_char) (ndest >> 8));     /* BLT dest mid */
-       vga_wgfx (regbase, CL_GR2A, (u_char) (ndest >> 16));            /* BLT dest hi */
+       vga_wgfx (fb_info->regs, CL_GR28, (u_char) (ndest & 0xff));     /* BLT dest low */
+       vga_wgfx (fb_info->regs, CL_GR29, (u_char) (ndest >> 8));       /* BLT dest mid */
+       vga_wgfx (fb_info->regs, CL_GR2A, (u_char) (ndest >> 16));              /* BLT dest hi */
 
        /* BLT source: set to 0 (is a dummy here anyway) */
-       vga_wgfx (regbase, CL_GR2C, 0x00);      /* BLT src low */
-       vga_wgfx (regbase, CL_GR2D, 0x00);      /* BLT src mid */
-       vga_wgfx (regbase, CL_GR2E, 0x00);      /* BLT src hi */
+       vga_wgfx (fb_info->regs, CL_GR2C, 0x00);        /* BLT src low */
+       vga_wgfx (fb_info->regs, CL_GR2D, 0x00);        /* BLT src mid */
+       vga_wgfx (fb_info->regs, CL_GR2E, 0x00);        /* BLT src hi */
 
        /* This is a ColorExpand Blt, using the */
        /* same color for foreground and background */
-       vga_wgfx (regbase, VGA_GFX_SR_VALUE, color);    /* foreground color */
-       vga_wgfx (regbase, VGA_GFX_SR_ENABLE, color);   /* background color */
+       vga_wgfx (fb_info->regs, VGA_GFX_SR_VALUE, color);      /* foreground color */
+       vga_wgfx (fb_info->regs, VGA_GFX_SR_ENABLE, color);     /* background color */
 
        op = 0xc0;
-       if (bits_per_pixel == 16) {
-               vga_wgfx (regbase, CL_GR10, color);     /* foreground color */
-               vga_wgfx (regbase, CL_GR11, color);     /* background color */
+       if (fb_info->currentmode.var.bits_per_pixel == 16) {
+               vga_wgfx (fb_info->regs, CL_GR10, color);       /* foreground color */
+               vga_wgfx (fb_info->regs, CL_GR11, color);       /* background color */
                op = 0x50;
                op = 0xd0;
-       } else if (bits_per_pixel == 32) {
-               vga_wgfx (regbase, CL_GR10, color);     /* foreground color */
-               vga_wgfx (regbase, CL_GR11, color);     /* background color */
-               vga_wgfx (regbase, CL_GR12, color);     /* foreground color */
-               vga_wgfx (regbase, CL_GR13, color);     /* background color */
-               vga_wgfx (regbase, CL_GR14, 0); /* foreground color */
-               vga_wgfx (regbase, CL_GR15, 0); /* background color */
+       } else if (fb_info->currentmode.var.bits_per_pixel == 32) {
+               vga_wgfx (fb_info->regs, CL_GR10, color);       /* foreground color */
+               vga_wgfx (fb_info->regs, CL_GR11, color);       /* background color */
+               vga_wgfx (fb_info->regs, CL_GR12, color);       /* foreground color */
+               vga_wgfx (fb_info->regs, CL_GR13, color);       /* background color */
+               vga_wgfx (fb_info->regs, CL_GR14, 0);   /* foreground color */
+               vga_wgfx (fb_info->regs, CL_GR15, 0);   /* background color */
                op = 0x50;
                op = 0xf0;
        }
        /* BLT mode: color expand, Enable 8x8 copy (faster?) */
-       vga_wgfx (regbase, CL_GR30, op);        /* BLT mode */
+       vga_wgfx (fb_info->regs, CL_GR30, op);  /* BLT mode */
 
        /* BLT ROP: SrcCopy */
-       vga_wgfx (regbase, CL_GR32, 0x0d);      /* BLT ROP */
+       vga_wgfx (fb_info->regs, CL_GR32, 0x0d);        /* BLT ROP */
 
        /* and finally: GO! */
-       vga_wgfx (regbase, CL_GR31, 0x02);      /* BLT Start/status */
+       vga_wgfx (fb_info->regs, CL_GR31, 0x02);        /* BLT Start/status */
 
        DPRINTK ("EXIT\n");
 }
@@ -3111,10 +3349,10 @@ static void bestclock (long freq, long *best, long *nom,
  * -------------------------------------------------------------------------
  */
 
-#ifdef CIRRUSFB_DEBUG
+#ifdef CLGEN_DEBUG
 
 /**
- * cirrusfb_dbg_print_byte
+ * clgen_dbg_print_byte
  * @name: name associated with byte value to be displayed
  * @val: byte value to be displayed
  *
@@ -3125,7 +3363,7 @@ static void bestclock (long freq, long *best, long *nom,
  */
 
 static
-void cirrusfb_dbg_print_byte (const char *name, unsigned char val)
+void clgen_dbg_print_byte (const char *name, unsigned char val)
 {
        DPRINTK ("%8s = 0x%02X (bits 7-0: %c%c%c%c%c%c%c%c)\n",
                 name, val,
@@ -3141,7 +3379,7 @@ void cirrusfb_dbg_print_byte (const char *name, unsigned char val)
 
 
 /**
- * cirrusfb_dbg_print_regs
+ * clgen_dbg_print_regs
  * @base: If using newmmio, the newmmio base address, otherwise %NULL
  * @reg_class: type of registers to read: %CRT, or %SEQ
  *
@@ -3152,7 +3390,7 @@ void cirrusfb_dbg_print_byte (const char *name, unsigned char val)
  */
 
 static
-void cirrusfb_dbg_print_regs (caddr_t regbase, cirrusfb_dbg_reg_class_t reg_class,...)
+void clgen_dbg_print_regs (caddr_t regbase, clgen_dbg_reg_class_t reg_class,...)
 {
        va_list list;
        unsigned char val = 0;
@@ -3178,7 +3416,7 @@ void cirrusfb_dbg_print_regs (caddr_t regbase, cirrusfb_dbg_reg_class_t reg_clas
                        break;
                }
 
-               cirrusfb_dbg_print_byte (name, val);
+               clgen_dbg_print_byte (name, val);
 
                name = va_arg (list, char *);
        }
@@ -3188,35 +3426,35 @@ void cirrusfb_dbg_print_regs (caddr_t regbase, cirrusfb_dbg_reg_class_t reg_clas
 
 
 /**
- * cirrusfb_dump
- * @cirrusfbinfo:
+ * clgen_dump
+ * @clgeninfo:
  *
  * DESCRIPTION:
  */
 
 static
-void cirrusfb_dump (void)
+void clgen_dump (void)
 {
-       cirrusfb_dbg_reg_dump (NULL);
+       clgen_dbg_reg_dump (NULL);
 }
 
 
 /**
- * cirrusfb_dbg_reg_dump
+ * clgen_dbg_reg_dump
  * @base: If using newmmio, the newmmio base address, otherwise %NULL
  *
  * DESCRIPTION:
- * Dumps a list of interesting VGA and CIRRUSFB registers.  If @base is %NULL,
+ * Dumps a list of interesting VGA and CLGEN registers.  If @base is %NULL,
  * old-style I/O ports are queried for information, otherwise MMIO is
  * used at the given @base address to query the information.
  */
 
 static
-void cirrusfb_dbg_reg_dump (caddr_t regbase)
+void clgen_dbg_reg_dump (caddr_t regbase)
 {
-       DPRINTK ("CIRRUSFB VGA CRTC register dump:\n");
+       DPRINTK ("CLGEN VGA CRTC register dump:\n");
 
-       cirrusfb_dbg_print_regs (regbase, CRT,
+       clgen_dbg_print_regs (regbase, CRT,
                           "CR00", 0x00,
                           "CR01", 0x01,
                           "CR02", 0x02,
@@ -3268,9 +3506,9 @@ void cirrusfb_dbg_reg_dump (caddr_t regbase)
 
        DPRINTK ("\n");
 
-       DPRINTK ("CIRRUSFB VGA SEQ register dump:\n");
+       DPRINTK ("CLGEN VGA SEQ register dump:\n");
 
-       cirrusfb_dbg_print_regs (regbase, SEQ,
+       clgen_dbg_print_regs (regbase, SEQ,
                           "SR00", 0x00,
                           "SR01", 0x01,
                           "SR02", 0x02,
@@ -3302,5 +3540,5 @@ void cirrusfb_dbg_reg_dump (caddr_t regbase)
        DPRINTK ("\n");
 }
 
-#endif                         /* CIRRUSFB_DEBUG */
+#endif                         /* CLGEN_DEBUG */