* [PATCH] Macfb compile fixes
@ 2003-07-26 14:51 ` Geert Uytterhoeven
0 siblings, 0 replies; 4+ messages in thread
From: Geert Uytterhoeven @ 2003-07-26 14:51 UTC (permalink / raw)
To: Linus Torvalds, Alan Cox
Cc: Linux Fbdev, Linux Kernel Development, Geert Uytterhoeven
Macfb compile fixes
--- linux-2.6.x/drivers/video/macfb.c Mon May 5 10:32:15 2003
+++ linux-m68k-2.6.x/drivers/video/macfb.c Sun Jun 8 11:24:51 2003
@@ -233,11 +233,11 @@
/* Loop until we get to the register we want */
for (i = 0; i < regno; i++) {
- nubus_writeb(info->cmap[i].red >> 8, &dafb_cmap_regs->lut);
+ nubus_writeb(info->cmap.red[i] >> 8, &dafb_cmap_regs->lut);
nop();
- nubus_writeb(info->cmap[i].green >> 8, &dafb_cmap_regs->lut);
+ nubus_writeb(info->cmap.green[i] >> 8, &dafb_cmap_regs->lut);
nop();
- nubus_writeb(info->cmap[i].blue >> 8, &dafb_cmap_regs->lut);
+ nubus_writeb(info->cmap.blue[i] >> 8, &dafb_cmap_regs->lut);
nop();
}
}
@@ -528,10 +528,10 @@
* != 0 for invalid regno.
*/
- if (regno >= info->cmap.len)
+ if (regno >= fb_info->cmap.len)
return 1;
- switch (info->var.bits_per_pixel) {
+ switch (fb_info->var.bits_per_pixel) {
case 1:
/* We shouldn't get here */
break;
@@ -539,21 +539,21 @@
case 4:
case 8:
if (macfb_setpalette)
- macfb_setpalette(regno, red, green, blue, info);
+ macfb_setpalette(regno, red, green, blue, fb_info);
else
return 1;
break;
case 16:
- if (info->var.red.offset == 10) {
+ if (fb_info->var.red.offset == 10) {
/* 1:5:5:5 */
- ((u32*) (info->pseudo_palette))[regno] =
+ ((u32*) (fb_info->pseudo_palette))[regno] =
((red & 0xf800) >> 1) |
((green & 0xf800) >> 6) |
((blue & 0xf800) >> 11) |
((transp != 0) << 15);
} else {
/* 0:5:6:5 */
- ((u32*) (info->pseudo_palette))[regno] =
+ ((u32*) (fb_info->pseudo_palette))[regno] =
((red & 0xf800) ) |
((green & 0xfc00) >> 5) |
((blue & 0xf800) >> 11);
@@ -565,19 +565,19 @@
red >>= 8;
green >>= 8;
blue >>= 8;
- ((u32 *)(info->pseudo_palette))[regno] =
- (red << info->var.red.offset) |
- (green << info->var.green.offset) |
- (blue << info->var.blue.offset);
+ ((u32 *)(fb_info->pseudo_palette))[regno] =
+ (red << fb_info->var.red.offset) |
+ (green << fb_info->var.green.offset) |
+ (blue << fb_info->var.blue.offset);
break;
case 32:
red >>= 8;
green >>= 8;
blue >>= 8;
- ((u32 *)(info->pseudo_palette))[regno] =
- (red << info->var.red.offset) |
- (green << info->var.green.offset) |
- (blue << info->var.blue.offset);
+ ((u32 *)(fb_info->pseudo_palette))[regno] =
+ (red << fb_info->var.red.offset) |
+ (green << fb_info->var.green.offset) |
+ (blue << fb_info->var.blue.offset);
break;
}
return 0;
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] Macfb compile fixes
@ 2003-07-26 14:51 ` Geert Uytterhoeven
0 siblings, 0 replies; 4+ messages in thread
From: Geert Uytterhoeven @ 2003-07-26 14:51 UTC (permalink / raw)
To: Linus Torvalds, Alan Cox
Cc: Linux Fbdev, Linux Kernel Development, Geert Uytterhoeven
Macfb compile fixes
--- linux-2.6.x/drivers/video/macfb.c Mon May 5 10:32:15 2003
+++ linux-m68k-2.6.x/drivers/video/macfb.c Sun Jun 8 11:24:51 2003
@@ -233,11 +233,11 @@
/* Loop until we get to the register we want */
for (i = 0; i < regno; i++) {
- nubus_writeb(info->cmap[i].red >> 8, &dafb_cmap_regs->lut);
+ nubus_writeb(info->cmap.red[i] >> 8, &dafb_cmap_regs->lut);
nop();
- nubus_writeb(info->cmap[i].green >> 8, &dafb_cmap_regs->lut);
+ nubus_writeb(info->cmap.green[i] >> 8, &dafb_cmap_regs->lut);
nop();
- nubus_writeb(info->cmap[i].blue >> 8, &dafb_cmap_regs->lut);
+ nubus_writeb(info->cmap.blue[i] >> 8, &dafb_cmap_regs->lut);
nop();
}
}
@@ -528,10 +528,10 @@
* != 0 for invalid regno.
*/
- if (regno >= info->cmap.len)
+ if (regno >= fb_info->cmap.len)
return 1;
- switch (info->var.bits_per_pixel) {
+ switch (fb_info->var.bits_per_pixel) {
case 1:
/* We shouldn't get here */
break;
@@ -539,21 +539,21 @@
case 4:
case 8:
if (macfb_setpalette)
- macfb_setpalette(regno, red, green, blue, info);
+ macfb_setpalette(regno, red, green, blue, fb_info);
else
return 1;
break;
case 16:
- if (info->var.red.offset == 10) {
+ if (fb_info->var.red.offset == 10) {
/* 1:5:5:5 */
- ((u32*) (info->pseudo_palette))[regno] =
+ ((u32*) (fb_info->pseudo_palette))[regno] =
((red & 0xf800) >> 1) |
((green & 0xf800) >> 6) |
((blue & 0xf800) >> 11) |
((transp != 0) << 15);
} else {
/* 0:5:6:5 */
- ((u32*) (info->pseudo_palette))[regno] =
+ ((u32*) (fb_info->pseudo_palette))[regno] =
((red & 0xf800) ) |
((green & 0xfc00) >> 5) |
((blue & 0xf800) >> 11);
@@ -565,19 +565,19 @@
red >>= 8;
green >>= 8;
blue >>= 8;
- ((u32 *)(info->pseudo_palette))[regno] =
- (red << info->var.red.offset) |
- (green << info->var.green.offset) |
- (blue << info->var.blue.offset);
+ ((u32 *)(fb_info->pseudo_palette))[regno] =
+ (red << fb_info->var.red.offset) |
+ (green << fb_info->var.green.offset) |
+ (blue << fb_info->var.blue.offset);
break;
case 32:
red >>= 8;
green >>= 8;
blue >>= 8;
- ((u32 *)(info->pseudo_palette))[regno] =
- (red << info->var.red.offset) |
- (green << info->var.green.offset) |
- (blue << info->var.blue.offset);
+ ((u32 *)(fb_info->pseudo_palette))[regno] =
+ (red << fb_info->var.red.offset) |
+ (green << fb_info->var.green.offset) |
+ (blue << fb_info->var.blue.offset);
break;
}
return 0;
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Macfb compile fixes
2003-06-15 18:38 Geert Uytterhoeven
@ 2003-06-19 5:12 ` James Simmons
0 siblings, 0 replies; 4+ messages in thread
From: James Simmons @ 2003-06-19 5:12 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Linus Torvalds, Linux Fbdev
> Macfb compile fixes
Applied to BK tree.
-------------------------------------------------------
This SF.Net email is sponsored by: INetU
Attention Web Developers & Consultants: Become An INetU Hosting Partner.
Refer Dedicated Servers. We Manage Them. You Get 10% Monthly Commission!
INetU Dedicated Managed Hosting http://www.inetu.net/partner/index.php
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] Macfb compile fixes
@ 2003-06-15 18:38 Geert Uytterhoeven
2003-06-19 5:12 ` James Simmons
0 siblings, 1 reply; 4+ messages in thread
From: Geert Uytterhoeven @ 2003-06-15 18:38 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Linux Fbdev, Geert Uytterhoeven
Macfb compile fixes
--- linux-2.5.x/drivers/video/macfb.c Mon May 5 10:32:15 2003
+++ linux-m68k-2.5.x/drivers/video/macfb.c Sun Jun 8 11:24:51 2003
@@ -233,11 +233,11 @@
/* Loop until we get to the register we want */
for (i = 0; i < regno; i++) {
- nubus_writeb(info->cmap[i].red >> 8, &dafb_cmap_regs->lut);
+ nubus_writeb(info->cmap.red[i] >> 8, &dafb_cmap_regs->lut);
nop();
- nubus_writeb(info->cmap[i].green >> 8, &dafb_cmap_regs->lut);
+ nubus_writeb(info->cmap.green[i] >> 8, &dafb_cmap_regs->lut);
nop();
- nubus_writeb(info->cmap[i].blue >> 8, &dafb_cmap_regs->lut);
+ nubus_writeb(info->cmap.blue[i] >> 8, &dafb_cmap_regs->lut);
nop();
}
}
@@ -528,10 +528,10 @@
* != 0 for invalid regno.
*/
- if (regno >= info->cmap.len)
+ if (regno >= fb_info->cmap.len)
return 1;
- switch (info->var.bits_per_pixel) {
+ switch (fb_info->var.bits_per_pixel) {
case 1:
/* We shouldn't get here */
break;
@@ -539,21 +539,21 @@
case 4:
case 8:
if (macfb_setpalette)
- macfb_setpalette(regno, red, green, blue, info);
+ macfb_setpalette(regno, red, green, blue, fb_info);
else
return 1;
break;
case 16:
- if (info->var.red.offset == 10) {
+ if (fb_info->var.red.offset == 10) {
/* 1:5:5:5 */
- ((u32*) (info->pseudo_palette))[regno] =
+ ((u32*) (fb_info->pseudo_palette))[regno] =
((red & 0xf800) >> 1) |
((green & 0xf800) >> 6) |
((blue & 0xf800) >> 11) |
((transp != 0) << 15);
} else {
/* 0:5:6:5 */
- ((u32*) (info->pseudo_palette))[regno] =
+ ((u32*) (fb_info->pseudo_palette))[regno] =
((red & 0xf800) ) |
((green & 0xfc00) >> 5) |
((blue & 0xf800) >> 11);
@@ -565,19 +565,19 @@
red >>= 8;
green >>= 8;
blue >>= 8;
- ((u32 *)(info->pseudo_palette))[regno] =
- (red << info->var.red.offset) |
- (green << info->var.green.offset) |
- (blue << info->var.blue.offset);
+ ((u32 *)(fb_info->pseudo_palette))[regno] =
+ (red << fb_info->var.red.offset) |
+ (green << fb_info->var.green.offset) |
+ (blue << fb_info->var.blue.offset);
break;
case 32:
red >>= 8;
green >>= 8;
blue >>= 8;
- ((u32 *)(info->pseudo_palette))[regno] =
- (red << info->var.red.offset) |
- (green << info->var.green.offset) |
- (blue << info->var.blue.offset);
+ ((u32 *)(fb_info->pseudo_palette))[regno] =
+ (red << fb_info->var.red.offset) |
+ (green << fb_info->var.green.offset) |
+ (blue << fb_info->var.blue.offset);
break;
}
return 0;
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
-------------------------------------------------------
This SF.NET email is sponsored by: eBay
Great deals on office technology -- on eBay now! Click here:
http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2003-07-26 14:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-07-26 14:51 [PATCH] Macfb compile fixes Geert Uytterhoeven
2003-07-26 14:51 ` Geert Uytterhoeven
-- strict thread matches above, loose matches on Subject: below --
2003-06-15 18:38 Geert Uytterhoeven
2003-06-19 5:12 ` James Simmons
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.