X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fvideo%2Fhgafb.c;h=c2a06ca2ea980e5579b9793ee4831d643db2d075;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=87d008af2a19283b204618cc1951f4b88291273e;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git

diff --git a/drivers/video/hgafb.c b/drivers/video/hgafb.c
index 87d008af2..c2a06ca2e 100644
--- a/drivers/video/hgafb.c
+++ b/drivers/video/hgafb.c
@@ -59,16 +59,16 @@
 
 /* Description of the hardware layout */
 
-static unsigned long hga_vram_base;		/* Base of video memory */
+static void __iomem *hga_vram;			/* Base of video memory */
 static unsigned long hga_vram_len;		/* Size of video memory */
 
 #define HGA_ROWADDR(row) ((row%4)*8192 + (row>>2)*90)
 #define HGA_TXT			0
 #define HGA_GFX			1
 
-static inline u8* rowaddr(struct fb_info *info, u_int row)
+static inline u8 __iomem * rowaddr(struct fb_info *info, u_int row)
 {
-        return info->screen_base + HGA_ROWADDR(row);
+	return info->screen_base + HGA_ROWADDR(row);
 }
 
 static int hga_mode = -1;			/* 0 = txt, 1 = gfx mode */
@@ -103,7 +103,7 @@ static char *hga_type_name;
 
 /* Global locks */
 
-static spinlock_t hga_reg_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(hga_reg_lock);
 
 /* Framebuffer driver structures */
 
@@ -176,7 +176,7 @@ static void hga_clear_screen(void)
 		fillchar = 0x00;
 	spin_unlock_irqrestore(&hga_reg_lock, flags);
 	if (fillchar != 0xbf)
-		isa_memset_io(hga_vram_base, fillchar, hga_vram_len);
+		memset_io(hga_vram, fillchar, hga_vram_len);
 }
 
 static void hga_txt_mode(void)
@@ -244,13 +244,13 @@ static void hga_gfx_mode(void)
 static void hga_show_logo(struct fb_info *info)
 {
 /*
-	unsigned long dest = hga_vram_base;
+	void __iomem *dest = hga_vram;
 	char *logo = linux_logo_bw;
 	int x, y;
 	
 	for (y = 134; y < 134 + 80 ; y++) * this needs some cleanup *
 		for (x = 0; x < 10 ; x++)
-			isa_writeb(~*(logo++),(dest + HGA_ROWADDR(y) + x + 40));
+			writeb(~*(logo++),(dest + HGA_ROWADDR(y) + x + 40));
 */
 }
 
@@ -282,12 +282,13 @@ static void hga_blank(int blank_mode)
 static int __init hga_card_detect(void)
 {
 	int count=0;
-	unsigned long p, q;
+	void __iomem *p, *q;
 	unsigned short p_save, q_save;
 
-	hga_vram_base = 0xb0000;
 	hga_vram_len  = 0x08000;
 
+	hga_vram = ioremap(0xb0000, hga_vram_len);
+
 	if (request_region(0x3b0, 12, "hgafb"))
 		release_io_ports = 1;
 	if (request_region(0x3bf, 1, "hgafb"))
@@ -295,14 +296,14 @@ static int __init hga_card_detect(void)
 
 	/* do a memory check */
 
-	p = hga_vram_base;
-	q = hga_vram_base + 0x01000;
+	p = hga_vram;
+	q = hga_vram + 0x01000;
 
-	p_save = isa_readw(p); q_save = isa_readw(q);
+	p_save = readw(p); q_save = readw(q);
 
-	isa_writew(0xaa55, p); if (isa_readw(p) == 0xaa55) count++;
-	isa_writew(0x55aa, p); if (isa_readw(p) == 0x55aa) count++;
-	isa_writew(p_save, p);
+	writew(0xaa55, p); if (readw(p) == 0xaa55) count++;
+	writew(0x55aa, p); if (readw(p) == 0x55aa) count++;
+	writew(p_save, p);
 
 	if (count != 2) {
 		return 0;
@@ -455,7 +456,7 @@ static int hgafb_blank(int blank_mode, struct fb_info *info)
 static void hgafb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
 {
 	u_int rows, y;
-	u8 *dest;
+	u8 __iomem *dest;
 
 	y = rect->dy;
 
@@ -466,7 +467,7 @@ static void hgafb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
 			//fb_memset(dest, rect->color, (rect->width >> 3));
 			break;
 		case ROP_XOR:
-			*dest = ~*dest;
+			fb_writeb(~(fb_readb(dest)), dest);
 			break;
 		}
 	}
@@ -475,7 +476,8 @@ static void hgafb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
 static void hgafb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
 {
 	u_int rows, y1, y2;
-	u8 *src, *dest;
+	u8 __iomem *src;
+	u8 __iomem *dest;
 
 	if (area->dy <= area->sy) {
 		y1 = area->sy;
@@ -504,14 +506,15 @@ static void hgafb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
 
 static void hgafb_imageblit(struct fb_info *info, const struct fb_image *image)
 {
-	u8 *dest, *cdat = (u8 *) image->data;
+	u8 __iomem *dest;
+	u8 *cdat = (u8 *) image->data;
 	u_int rows, y = image->dy;
 	u8 d;
 
 	for (rows = image->height; rows--; y++) {
 		d = *cdat++;
 		dest = rowaddr(info, y) + (image->dx >> 3);
-		*dest = d;
+		fb_writeb(d, dest);
 	}
 }
 #else /* !CONFIG_FB_HGA_ACCEL */
@@ -552,13 +555,15 @@ int __init hgafb_init(void)
 
 	if (! hga_card_detect()) {
 		printk(KERN_INFO "hgafb: HGA card not detected.\n");
+		if (hga_vram)
+			iounmap(hga_vram);
 		return -EINVAL;
 	}
 
 	printk(KERN_INFO "hgafb: %s with %ldK of memory detected.\n",
 		hga_type_name, hga_vram_len/1024);
 
-	hga_fix.smem_start = VGA_MAP_MEM(hga_vram_base);
+	hga_fix.smem_start = (unsigned long)hga_vram;
 	hga_fix.smem_len = hga_vram_len;
 
 	fb_info.flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;
@@ -570,10 +575,12 @@ int __init hgafb_init(void)
 	fb_info.monspecs.vfmax = 10000;
 	fb_info.monspecs.dpms = 0;
 	fb_info.fbops = &hgafb_ops;
-	fb_info.screen_base = (char *)hga_fix.smem_start;
+	fb_info.screen_base = hga_vram;
 
-        if (register_framebuffer(&fb_info) < 0)
-                return -EINVAL;
+        if (register_framebuffer(&fb_info) < 0) {
+		iounmap(hga_vram);
+		return -EINVAL;
+	}
 
         printk(KERN_INFO "fb%d: %s frame buffer device\n",
                fb_info.node, fb_info.fix.id);
@@ -595,6 +602,7 @@ static void __exit hgafb_exit(void)
 	hga_txt_mode();
 	hga_clear_screen();
 	unregister_framebuffer(&fb_info);
+	iounmap(hga_vram);
 	if (release_io_ports) release_region(0x3b0, 12);
 	if (release_io_port) release_region(0x3bf, 1);
 }
@@ -610,7 +618,7 @@ MODULE_AUTHOR("Ferenc Bakonyi (fero@drama.obuda.kando.hu)");
 MODULE_DESCRIPTION("FBDev driver for Hercules Graphics Adaptor");
 MODULE_LICENSE("GPL");
 
-MODULE_PARM(nologo, "i");
+module_param(nologo, bool, 0);
 MODULE_PARM_DESC(nologo, "Disables startup logo if != 0 (default=0)");
 module_init(hgafb_init);