Hi Geert,
I applied all 8 patches of this series.
Thanks,
Florian Tobias Schandinat
On 11/21/2011 08:53 PM, Geert Uytterhoeven wrote:
> - indentation
> - spacing around binary operators
>
> No functional changes
>
> Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
> ---
> drivers/video/amifb.c | 1186 +++++++++++++++++++++++++------------------------
> 1 files changed, 606 insertions(+), 580 deletions(-)
>
> diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
> index 5ea6596..72454c7 100644
> --- a/drivers/video/amifb.c
> +++ b/drivers/video/amifb.c
> @@ -152,10 +152,10 @@
>
> - hsstrt: Start of horizontal synchronization pulse
> - hsstop: End of horizontal synchronization pulse
> - - htotal: Last value on the line (i.e. line length = htotal+1)
> + - htotal: Last value on the line (i.e. line length = htotal + 1)
> - vsstrt: Start of vertical synchronization pulse
> - vsstop: End of vertical synchronization pulse
> - - vtotal: Last line value (i.e. number of lines = vtotal+1)
> + - vtotal: Last line value (i.e. number of lines = vtotal + 1)
> - hcenter: Start of vertical retrace for interlace
>
> You can specify the blanking timings independently. Currently I just set
> @@ -184,7 +184,7 @@
> clock):
>
> - diwstrt_h: Horizontal start of the visible window
> - - diwstop_h: Horizontal stop+1(*) of the visible window
> + - diwstop_h: Horizontal stop + 1(*) of the visible window
> - diwstrt_v: Vertical start of the visible window
> - diwstop_v: Vertical stop of the visible window
> - ddfstrt: Horizontal start of display DMA
> @@ -193,7 +193,7 @@
>
> Sprite positioning:
>
> - - sprstrt_h: Horizontal start-4 of sprite
> + - sprstrt_h: Horizontal start - 4 of sprite
> - sprstrt_v: Vertical start of sprite
>
> (*) Even Commodore did it wrong in the AGA monitor drivers by not adding 1.
> @@ -212,21 +212,21 @@
> display parameters. Here's what I found out:
>
> - ddfstrt and ddfstop are best aligned to 64 pixels.
> - - the chipset needs 64+4 horizontal pixels after the DMA start before the
> - first pixel is output, so diwstrt_h = ddfstrt+64+4 if you want to
> - display the first pixel on the line too. Increase diwstrt_h for virtual
> - screen panning.
> + - the chipset needs 64 + 4 horizontal pixels after the DMA start before
> + the first pixel is output, so diwstrt_h = ddfstrt + 64 + 4 if you want
> + to display the first pixel on the line too. Increase diwstrt_h for
> + virtual screen panning.
> - the display DMA always fetches 64 pixels at a time (fmode = 3).
> - - ddfstop is ddfstrt+#pixels-64.
> - - diwstop_h = diwstrt_h+xres+1. Because of the additional 1 this can be 1
> - more than htotal.
> + - ddfstop is ddfstrt+#pixels - 64.
> + - diwstop_h = diwstrt_h + xres + 1. Because of the additional 1 this can
> + be 1 more than htotal.
> - hscroll simply adds a delay to the display output. Smooth horizontal
> - panning needs an extra 64 pixels on the left to prefetch the pixels that
> - `fall off' on the left.
> + panning needs an extra 64 pixels on the left to prefetch the pixels that
> + `fall off' on the left.
> - if ddfstrt < 192, the sprite DMA cycles are all stolen by the bitplane
> - DMA, so it's best to make the DMA start as late as possible.
> + DMA, so it's best to make the DMA start as late as possible.
> - you really don't want to make ddfstrt < 128, since this will steal DMA
> - cycles from the other DMA channels (audio, floppy and Chip RAM refresh).
> + cycles from the other DMA channels (audio, floppy and Chip RAM refresh).
> - I make diwstop_h and diwstop_v as large as possible.
>
> General dependencies
> @@ -234,8 +234,8 @@
>
> - all values are SHRES pixel (35ns)
>
> - table 1:fetchstart table 2:prefetch table 3:fetchsize
> - ------------------ ---------------- -----------------
> + table 1:fetchstart table 2:prefetch table 3:fetchsize
> + ------------------ ---------------- -----------------
> Pixclock # SHRES|HIRES|LORES # SHRES|HIRES|LORES # SHRES|HIRES|LORES
> -------------#------+-----+------#------+-----+------#------+-----+------
> Bus width 1x # 16 | 32 | 64 # 16 | 32 | 64 # 64 | 64 | 64
> @@ -245,21 +245,21 @@
> - chipset needs 4 pixels before the first pixel is output
> - ddfstrt must be aligned to fetchstart (table 1)
> - chipset needs also prefetch (table 2) to get first pixel data, so
> - ddfstrt = ((diwstrt_h-4) & -fetchstart) - prefetch
> + ddfstrt = ((diwstrt_h - 4) & -fetchstart) - prefetch
> - for horizontal panning decrease diwstrt_h
> - the length of a fetchline must be aligned to fetchsize (table 3)
> - if fetchstart is smaller than fetchsize, then ddfstrt can a little bit
> - moved to optimize use of dma (useful for OCS/ECS overscan displays)
> - - ddfstop is ddfstrt+ddfsize-fetchsize
> + moved to optimize use of dma (useful for OCS/ECS overscan displays)
> + - ddfstop is ddfstrt + ddfsize - fetchsize
> - If C= didn't change anything for AGA, then at following positions the
> - dma bus is already used:
> - ddfstrt < 48 -> memory refresh
> - < 96 -> disk dma
> - < 160 -> audio dma
> - < 192 -> sprite 0 dma
> - < 416 -> sprite dma (32 per sprite)
> + dma bus is already used:
> + ddfstrt < 48 -> memory refresh
> + < 96 -> disk dma
> + < 160 -> audio dma
> + < 192 -> sprite 0 dma
> + < 416 -> sprite dma (32 per sprite)
> - in accordance with the hardware reference manual a hardware stop is at
> - 192, but AGA (ECS?) can go below this.
> + 192, but AGA (ECS?) can go below this.
>
> DMA priorities
> --------------
> @@ -269,7 +269,7 @@
> the hardware cursor:
>
> - if you want to start display DMA too early, you lose the ability to
> - do smooth horizontal panning (xpanstep 1 -> 64).
> + do smooth horizontal panning (xpanstep 1 -> 64).
> - if you want to go even further, you lose the hardware cursor too.
>
> IMHO a hardware cursor is more important for X than horizontal scrolling,
> @@ -286,8 +286,8 @@
> Standard VGA timings
> --------------------
>
> - xres yres left right upper lower hsync vsync
> - ---- ---- ---- ----- ----- ----- ----- -----
> + xres yres left right upper lower hsync vsync
> + ---- ---- ---- ----- ----- ----- ----- -----
> 80x25 720 400 27 45 35 12 108 2
> 80x30 720 480 27 45 30 9 108 2
>
> @@ -297,8 +297,8 @@
>
> As a comparison, graphics/monitor.h suggests the following:
>
> - xres yres left right upper lower hsync vsync
> - ---- ---- ---- ----- ----- ----- ----- -----
> + xres yres left right upper lower hsync vsync
> + ---- ---- ---- ----- ----- ----- ----- -----
>
> VGA 640 480 52 112 24 19 112 - 2 +
> VGA70 640 400 52 112 27 21 112 - 2 -
> @@ -309,10 +309,10 @@
>
> VSYNC HSYNC Vertical size Vertical total
> ----- ----- ------------- --------------
> - + + Reserved Reserved
> - + - 400 414
> - - + 350 362
> - - - 480 496
> + + + Reserved Reserved
> + + - 400 414
> + - + 350 362
> + - - 480 496
>
> Source: CL-GD542X Technical Reference Manual, Cirrus Logic, Oct 1992
>
> @@ -326,33 +326,34 @@
> -----------
>
> - a scanline is 64 µs long, of which 52.48 µs are visible. This is about
> - 736 visible 70 ns pixels per line.
> + 736 visible 70 ns pixels per line.
> - we have 625 scanlines, of which 575 are visible (interlaced); after
> - rounding this becomes 576.
> + rounding this becomes 576.
>
> RETMA -> NTSC
> -------------
>
> - a scanline is 63.5 µs long, of which 53.5 µs are visible. This is about
> - 736 visible 70 ns pixels per line.
> + 736 visible 70 ns pixels per line.
> - we have 525 scanlines, of which 485 are visible (interlaced); after
> - rounding this becomes 484.
> + rounding this becomes 484.
>
> Thus if you want a PAL compatible display, you have to do the following:
>
> - set the FB_SYNC_BROADCAST flag to indicate that standard broadcast
> - timings are to be used.
> - - make sure upper_margin+yres+lower_margin+vsync_len = 625 for an
> - interlaced, 312 for a non-interlaced and 156 for a doublescanned
> - display.
> - - make sure left_margin+xres+right_margin+hsync_len = 1816 for a SHRES,
> - 908 for a HIRES and 454 for a LORES display.
> + timings are to be used.
> + - make sure upper_margin + yres + lower_margin + vsync_len = 625 for an
> + interlaced, 312 for a non-interlaced and 156 for a doublescanned
> + display.
> + - make sure left_margin + xres + right_margin + hsync_len = 1816 for a
> + SHRES, 908 for a HIRES and 454 for a LORES display.
> - the left visible part begins at 360 (SHRES; HIRES:180, LORES:90),
> - left_margin+2*hsync_len must be greater or equal.
> + left_margin + 2 * hsync_len must be greater or equal.
> - the upper visible part begins at 48 (interlaced; non-interlaced:24,
> - doublescanned:12), upper_margin+2*vsync_len must be greater or equal.
> + doublescanned:12), upper_margin + 2 * vsync_len must be greater or
> + equal.
> - ami_encode_var() calculates margins with a hsync of 5320 ns and a vsync
> - of 4 scanlines
> + of 4 scanlines
>
> The settings for a NTSC compatible display are straightforward.
>
> @@ -361,7 +362,7 @@
> anything about horizontal/vertical synchronization nor refresh rates.
>
>
> - -- Geert --
> + -- Geert --
>
> *******************************************************************************/
>
> @@ -540,45 +541,45 @@ static u_short maxfmode, chipset;
> * Various macros
> */
>
> -#define up2(v) (((v)+1) & -2)
> +#define up2(v) (((v) + 1) & -2)
> #define down2(v) ((v) & -2)
> #define div2(v) ((v)>>1)
> #define mod2(v) ((v) & 1)
>
> -#define up4(v) (((v)+3) & -4)
> +#define up4(v) (((v) + 3) & -4)
> #define down4(v) ((v) & -4)
> -#define mul4(v) ((v)<<2)
> +#define mul4(v) ((v) << 2)
> #define div4(v) ((v)>>2)
> #define mod4(v) ((v) & 3)
>
> -#define up8(v) (((v)+7) & -8)
> +#define up8(v) (((v) + 7) & -8)
> #define down8(v) ((v) & -8)
> #define div8(v) ((v)>>3)
> #define mod8(v) ((v) & 7)
>
> -#define up16(v) (((v)+15) & -16)
> +#define up16(v) (((v) + 15) & -16)
> #define down16(v) ((v) & -16)
> #define div16(v) ((v)>>4)
> #define mod16(v) ((v) & 15)
>
> -#define up32(v) (((v)+31) & -32)
> +#define up32(v) (((v) + 31) & -32)
> #define down32(v) ((v) & -32)
> #define div32(v) ((v)>>5)
> #define mod32(v) ((v) & 31)
>
> -#define up64(v) (((v)+63) & -64)
> +#define up64(v) (((v) + 63) & -64)
> #define down64(v) ((v) & -64)
> #define div64(v) ((v)>>6)
> #define mod64(v) ((v) & 63)
>
> -#define upx(x,v) (((v)+(x)-1) & -(x))
> -#define downx(x,v) ((v) & -(x))
> -#define modx(x,v) ((v) & ((x)-1))
> +#define upx(x, v) (((v) + (x) - 1) & -(x))
> +#define downx(x, v) ((v) & -(x))
> +#define modx(x, v) ((v) & ((x) - 1))
>
> /* if x1 is not a constant, this macro won't make real sense :-) */
> #ifdef __mc68000__
> #define DIVUL(x1, x2) ({int res; asm("divul %1,%2,%3": "=d" (res): \
> - "d" (x2), "d" ((long)((x1)/0x100000000ULL)), "0" ((long)(x1))); res;})
> + "d" (x2), "d" ((long)((x1) / 0x100000000ULL)), "0" ((long)(x1))); res;})
> #else
> /* We know a bit about the numbers, so we can do it this way */
> #define DIVUL(x1, x2) ((((long)((unsigned long long)x1 >> 8) / x2) << 8) + \
> @@ -607,7 +608,7 @@ static u_short maxfmode, chipset;
> #define VIDEOMEMSIZE_ECS_1M (393216) /* ECS (1MB) : max 1024*768*16 */
> #define VIDEOMEMSIZE_OCS (262144) /* OCS : max ca. 800*600*16 */
>
> -#define SPRITEMEMSIZE (64*64/4) /* max 64*64*4 */
> +#define SPRITEMEMSIZE (64 * 64 / 4) /* max 64*64*4 */
> #define DUMMYSPRITEMEMSIZE (8)
> static u_long spritememory;
>
> @@ -634,9 +635,9 @@ static u_long min_fstrt = 192;
> * Copper Instructions
> */
>
> -#define CMOVE(val, reg) (CUSTOM_OFS(reg)<<16 | (val))
> -#define CMOVE2(val, reg) ((CUSTOM_OFS(reg)+2)<<16 | (val))
> -#define CWAIT(x, y) (((y) & 0x1fe)<<23 | ((x) & 0x7f0)<<13 | 0x0001fffe)
> +#define CMOVE(val, reg) (CUSTOM_OFS(reg) << 16 | (val))
> +#define CMOVE2(val, reg) ((CUSTOM_OFS(reg) + 2) << 16 | (val))
> +#define CWAIT(x, y) (((y) & 0x1fe) << 23 | ((x) & 0x7f0) << 13 | 0x0001fffe)
> #define CEND (0xfffffffe)
>
>
> @@ -776,11 +777,11 @@ static struct amifb_par {
>
>
> static struct fb_info fb_info = {
> - .fix = {
> - .id = "Amiga ",
> - .visual = FB_VISUAL_PSEUDOCOLOR,
> - .accel = FB_ACCEL_AMIGABLITT
> - }
> + .fix = {
> + .id = "Amiga ",
> + .visual = FB_VISUAL_PSEUDOCOLOR,
> + .accel = FB_ACCEL_AMIGABLITT
> + }
> };
>
>
> @@ -820,116 +821,123 @@ static u_short is_lace = 0; /* Screen is laced */
>
> static struct fb_videomode ami_modedb[] __initdata = {
>
> - /*
> - * AmigaOS Video Modes
> - *
> - * If you change these, make sure to update DEFMODE_* as well!
> - */
> -
> - {
> - /* 640x200, 15 kHz, 60 Hz (NTSC) */
> - "ntsc", 60, 640, 200, TAG_HIRES, 106, 86, 44, 16, 76, 2,
> - FB_SYNC_BROADCAST, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
> - }, {
> - /* 640x400, 15 kHz, 60 Hz interlaced (NTSC) */
> - "ntsc-lace", 60, 640, 400, TAG_HIRES, 106, 86, 88, 33, 76, 4,
> - FB_SYNC_BROADCAST, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
> - }, {
> - /* 640x256, 15 kHz, 50 Hz (PAL) */
> - "pal", 50, 640, 256, TAG_HIRES, 106, 86, 40, 14, 76, 2,
> - FB_SYNC_BROADCAST, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
> - }, {
> - /* 640x512, 15 kHz, 50 Hz interlaced (PAL) */
> - "pal-lace", 50, 640, 512, TAG_HIRES, 106, 86, 80, 29, 76, 4,
> - FB_SYNC_BROADCAST, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
> - }, {
> - /* 640x480, 29 kHz, 57 Hz */
> - "multiscan", 57, 640, 480, TAG_SHRES, 96, 112, 29, 8, 72, 8,
> - 0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
> - }, {
> - /* 640x960, 29 kHz, 57 Hz interlaced */
> - "multiscan-lace", 57, 640, 960, TAG_SHRES, 96, 112, 58, 16, 72, 16,
> - 0, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
> - }, {
> - /* 640x200, 15 kHz, 72 Hz */
> - "euro36", 72, 640, 200, TAG_HIRES, 92, 124, 6, 6, 52, 5,
> - 0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
> - }, {
> - /* 640x400, 15 kHz, 72 Hz interlaced */
> - "euro36-lace", 72, 640, 400, TAG_HIRES, 92, 124, 12, 12, 52, 10,
> - 0, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
> - }, {
> - /* 640x400, 29 kHz, 68 Hz */
> - "euro72", 68, 640, 400, TAG_SHRES, 164, 92, 9, 9, 80, 8,
> - 0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
> - }, {
> - /* 640x800, 29 kHz, 68 Hz interlaced */
> - "euro72-lace", 68, 640, 800, TAG_SHRES, 164, 92, 18, 18, 80, 16,
> - 0, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
> - }, {
> - /* 800x300, 23 kHz, 70 Hz */
> - "super72", 70, 800, 300, TAG_SHRES, 212, 140, 10, 11, 80, 7,
> - 0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
> - }, {
> - /* 800x600, 23 kHz, 70 Hz interlaced */
> - "super72-lace", 70, 800, 600, TAG_SHRES, 212, 140, 20, 22, 80, 14,
> - 0, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
> - }, {
> - /* 640x200, 27 kHz, 57 Hz doublescan */
> - "dblntsc", 57, 640, 200, TAG_SHRES, 196, 124, 18, 17, 80, 4,
> - 0, FB_VMODE_DOUBLE | FB_VMODE_YWRAP
> - }, {
> - /* 640x400, 27 kHz, 57 Hz */
> - "dblntsc-ff", 57, 640, 400, TAG_SHRES, 196, 124, 36, 35, 80, 7,
> - 0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
> - }, {
> - /* 640x800, 27 kHz, 57 Hz interlaced */
> - "dblntsc-lace", 57, 640, 800, TAG_SHRES, 196, 124, 72, 70, 80, 14,
> - 0, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
> - }, {
> - /* 640x256, 27 kHz, 47 Hz doublescan */
> - "dblpal", 47, 640, 256, TAG_SHRES, 196, 124, 14, 13, 80, 4,
> - 0, FB_VMODE_DOUBLE | FB_VMODE_YWRAP
> - }, {
> - /* 640x512, 27 kHz, 47 Hz */
> - "dblpal-ff", 47, 640, 512, TAG_SHRES, 196, 124, 28, 27, 80, 7,
> - 0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
> - }, {
> - /* 640x1024, 27 kHz, 47 Hz interlaced */
> - "dblpal-lace", 47, 640, 1024, TAG_SHRES, 196, 124, 56, 54, 80, 14,
> - 0, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
> - },
> -
> - /*
> - * VGA Video Modes
> - */
> -
> - {
> - /* 640x480, 31 kHz, 60 Hz (VGA) */
> - "vga", 60, 640, 480, TAG_SHRES, 64, 96, 30, 9, 112, 2,
> - 0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
> - }, {
> - /* 640x400, 31 kHz, 70 Hz (VGA) */
> - "vga70", 70, 640, 400, TAG_SHRES, 64, 96, 35, 12, 112, 2,
> - FB_SYNC_VERT_HIGH_ACT | FB_SYNC_COMP_HIGH_ACT, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
> - },
> + /*
> + * AmigaOS Video Modes
> + *
> + * If you change these, make sure to update DEFMODE_* as well!
> + */
> +
> + {
> + /* 640x200, 15 kHz, 60 Hz (NTSC) */
> + "ntsc", 60, 640, 200, TAG_HIRES, 106, 86, 44, 16, 76, 2,
> + FB_SYNC_BROADCAST, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
> + }, {
> + /* 640x400, 15 kHz, 60 Hz interlaced (NTSC) */
> + "ntsc-lace", 60, 640, 400, TAG_HIRES, 106, 86, 88, 33, 76, 4,
> + FB_SYNC_BROADCAST, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
> + }, {
> + /* 640x256, 15 kHz, 50 Hz (PAL) */
> + "pal", 50, 640, 256, TAG_HIRES, 106, 86, 40, 14, 76, 2,
> + FB_SYNC_BROADCAST, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
> + }, {
> + /* 640x512, 15 kHz, 50 Hz interlaced (PAL) */
> + "pal-lace", 50, 640, 512, TAG_HIRES, 106, 86, 80, 29, 76, 4,
> + FB_SYNC_BROADCAST, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
> + }, {
> + /* 640x480, 29 kHz, 57 Hz */
> + "multiscan", 57, 640, 480, TAG_SHRES, 96, 112, 29, 8, 72, 8,
> + 0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
> + }, {
> + /* 640x960, 29 kHz, 57 Hz interlaced */
> + "multiscan-lace", 57, 640, 960, TAG_SHRES, 96, 112, 58, 16, 72,
> + 16,
> + 0, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
> + }, {
> + /* 640x200, 15 kHz, 72 Hz */
> + "euro36", 72, 640, 200, TAG_HIRES, 92, 124, 6, 6, 52, 5,
> + 0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
> + }, {
> + /* 640x400, 15 kHz, 72 Hz interlaced */
> + "euro36-lace", 72, 640, 400, TAG_HIRES, 92, 124, 12, 12, 52,
> + 10,
> + 0, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
> + }, {
> + /* 640x400, 29 kHz, 68 Hz */
> + "euro72", 68, 640, 400, TAG_SHRES, 164, 92, 9, 9, 80, 8,
> + 0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
> + }, {
> + /* 640x800, 29 kHz, 68 Hz interlaced */
> + "euro72-lace", 68, 640, 800, TAG_SHRES, 164, 92, 18, 18, 80,
> + 16,
> + 0, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
> + }, {
> + /* 800x300, 23 kHz, 70 Hz */
> + "super72", 70, 800, 300, TAG_SHRES, 212, 140, 10, 11, 80, 7,
> + 0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
> + }, {
> + /* 800x600, 23 kHz, 70 Hz interlaced */
> + "super72-lace", 70, 800, 600, TAG_SHRES, 212, 140, 20, 22, 80,
> + 14,
> + 0, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
> + }, {
> + /* 640x200, 27 kHz, 57 Hz doublescan */
> + "dblntsc", 57, 640, 200, TAG_SHRES, 196, 124, 18, 17, 80, 4,
> + 0, FB_VMODE_DOUBLE | FB_VMODE_YWRAP
> + }, {
> + /* 640x400, 27 kHz, 57 Hz */
> + "dblntsc-ff", 57, 640, 400, TAG_SHRES, 196, 124, 36, 35, 80, 7,
> + 0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
> + }, {
> + /* 640x800, 27 kHz, 57 Hz interlaced */
> + "dblntsc-lace", 57, 640, 800, TAG_SHRES, 196, 124, 72, 70, 80,
> + 14,
> + 0, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
> + }, {
> + /* 640x256, 27 kHz, 47 Hz doublescan */
> + "dblpal", 47, 640, 256, TAG_SHRES, 196, 124, 14, 13, 80, 4,
> + 0, FB_VMODE_DOUBLE | FB_VMODE_YWRAP
> + }, {
> + /* 640x512, 27 kHz, 47 Hz */
> + "dblpal-ff", 47, 640, 512, TAG_SHRES, 196, 124, 28, 27, 80, 7,
> + 0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
> + }, {
> + /* 640x1024, 27 kHz, 47 Hz interlaced */
> + "dblpal-lace", 47, 640, 1024, TAG_SHRES, 196, 124, 56, 54, 80,
> + 14,
> + 0, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
> + },
> +
> + /*
> + * VGA Video Modes
> + */
> +
> + {
> + /* 640x480, 31 kHz, 60 Hz (VGA) */
> + "vga", 60, 640, 480, TAG_SHRES, 64, 96, 30, 9, 112, 2,
> + 0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
> + }, {
> + /* 640x400, 31 kHz, 70 Hz (VGA) */
> + "vga70", 70, 640, 400, TAG_SHRES, 64, 96, 35, 12, 112, 2,
> + FB_SYNC_VERT_HIGH_ACT | FB_SYNC_COMP_HIGH_ACT,
> + FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
> + },
>
> #if 0
>
> - /*
> - * A2024 video modes
> - * These modes don't work yet because there's no A2024 driver.
> - */
> -
> - {
> - /* 1024x800, 10 Hz */
> - "a2024-10", 10, 1024, 800, TAG_HIRES, 0, 0, 0, 0, 0, 0,
> - 0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
> - }, {
> - /* 1024x800, 15 Hz */
> - "a2024-15", 15, 1024, 800, TAG_HIRES, 0, 0, 0, 0, 0, 0,
> - 0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
> - }
> + /*
> + * A2024 video modes
> + * These modes don't work yet because there's no A2024 driver.
> + */
> +
> + {
> + /* 1024x800, 10 Hz */
> + "a2024-10", 10, 1024, 800, TAG_HIRES, 0, 0, 0, 0, 0, 0,
> + 0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
> + }, {
> + /* 1024x800, 15 Hz */
> + "a2024-15", 15, 1024, 800, TAG_HIRES, 0, 0, 0, 0, 0, 0,
> + 0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
> + }
> #endif
> };
>
> @@ -992,19 +1000,20 @@ static int amifb_inverse = 0;
> /* bplcon1 (smooth scrolling) */
>
> #define hscroll2hw(hscroll) \
> - (((hscroll)<<12 & 0x3000) | ((hscroll)<<8 & 0xc300) | \
> - ((hscroll)<<4 & 0x0c00) | ((hscroll)<<2 & 0x00f0) | ((hscroll)>>2 & 0x000f))
> + (((hscroll) << 12 & 0x3000) | ((hscroll) << 8 & 0xc300) | \
> + ((hscroll) << 4 & 0x0c00) | ((hscroll) << 2 & 0x00f0) | \
> + ((hscroll)>>2 & 0x000f))
>
> /* diwstrt/diwstop/diwhigh (visible display window) */
>
> #define diwstrt2hw(diwstrt_h, diwstrt_v) \
> - (((diwstrt_v)<<7 & 0xff00) | ((diwstrt_h)>>2 & 0x00ff))
> + (((diwstrt_v) << 7 & 0xff00) | ((diwstrt_h)>>2 & 0x00ff))
> #define diwstop2hw(diwstop_h, diwstop_v) \
> - (((diwstop_v)<<7 & 0xff00) | ((diwstop_h)>>2 & 0x00ff))
> + (((diwstop_v) << 7 & 0xff00) | ((diwstop_h)>>2 & 0x00ff))
> #define diwhigh2hw(diwstrt_h, diwstrt_v, diwstop_h, diwstop_v) \
> - (((diwstop_h)<<3 & 0x2000) | ((diwstop_h)<<11 & 0x1800) | \
> + (((diwstop_h) << 3 & 0x2000) | ((diwstop_h) << 11 & 0x1800) | \
> ((diwstop_v)>>1 & 0x0700) | ((diwstrt_h)>>5 & 0x0020) | \
> - ((diwstrt_h)<<3 & 0x0018) | ((diwstrt_v)>>9 & 0x0007))
> + ((diwstrt_h) << 3 & 0x0018) | ((diwstrt_v)>>9 & 0x0007))
>
> /* ddfstrt/ddfstop (display DMA) */
>
> @@ -1015,38 +1024,39 @@ static int amifb_inverse = 0;
>
> #define hsstrt2hw(hsstrt) (div8(hsstrt))
> #define hsstop2hw(hsstop) (div8(hsstop))
> -#define htotal2hw(htotal) (div8(htotal)-1)
> +#define htotal2hw(htotal) (div8(htotal) - 1)
> #define vsstrt2hw(vsstrt) (div2(vsstrt))
> #define vsstop2hw(vsstop) (div2(vsstop))
> -#define vtotal2hw(vtotal) (div2(vtotal)-1)
> +#define vtotal2hw(vtotal) (div2(vtotal) - 1)
> #define hcenter2hw(htotal) (div8(htotal))
>
> /* hbstrt/hbstop/vbstrt/vbstop (blanking timings) */
>
> -#define hbstrt2hw(hbstrt) (((hbstrt)<<8 & 0x0700) | ((hbstrt)>>3 & 0x00ff))
> -#define hbstop2hw(hbstop) (((hbstop)<<8 & 0x0700) | ((hbstop)>>3 & 0x00ff))
> +#define hbstrt2hw(hbstrt) (((hbstrt) << 8 & 0x0700) | ((hbstrt)>>3 & 0x00ff))
> +#define hbstop2hw(hbstop) (((hbstop) << 8 & 0x0700) | ((hbstop)>>3 & 0x00ff))
> #define vbstrt2hw(vbstrt) (div2(vbstrt))
> #define vbstop2hw(vbstop) (div2(vbstop))
>
> /* colour */
>
> #define rgb2hw8_high(red, green, blue) \
> - (((red & 0xf0)<<4) | (green & 0xf0) | ((blue & 0xf0)>>4))
> + (((red & 0xf0) << 4) | (green & 0xf0) | ((blue & 0xf0)>>4))
> #define rgb2hw8_low(red, green, blue) \
> - (((red & 0x0f)<<8) | ((green & 0x0f)<<4) | (blue & 0x0f))
> + (((red & 0x0f) << 8) | ((green & 0x0f) << 4) | (blue & 0x0f))
> #define rgb2hw4(red, green, blue) \
> - (((red & 0xf0)<<4) | (green & 0xf0) | ((blue & 0xf0)>>4))
> + (((red & 0xf0) << 4) | (green & 0xf0) | ((blue & 0xf0)>>4))
> #define rgb2hw2(red, green, blue) \
> - (((red & 0xc0)<<4) | (green & 0xc0) | ((blue & 0xc0)>>4))
> + (((red & 0xc0) << 4) | (green & 0xc0) | ((blue & 0xc0)>>4))
>
> /* sprpos/sprctl (sprite positioning) */
>
> #define spr2hw_pos(start_v, start_h) \
> - (((start_v)<<7&0xff00) | ((start_h)>>3&0x00ff))
> + (((start_v) << 7 & 0xff00) | ((start_h)>>3 & 0x00ff))
> #define spr2hw_ctl(start_v, start_h, stop_v) \
> - (((stop_v)<<7&0xff00) | ((start_v)>>4&0x0040) | ((stop_v)>>5&0x0020) | \
> - ((start_h)<<3&0x0018) | ((start_v)>>7&0x0004) | ((stop_v)>>8&0x0002) | \
> - ((start_h)>>2&0x0001))
> + (((stop_v) << 7 & 0xff00) | ((start_v)>>4 & 0x0040) | \
> + ((stop_v)>>5 & 0x0020) | ((start_h) << 3 & 0x0018) | \
> + ((start_v)>>7 & 0x0004) | ((stop_v)>>8 & 0x0002) | \
> + ((start_h)>>2 & 0x0001))
>
> /* get current vertical position of beam */
> #define get_vbpos() ((u_short)((*(u_long volatile *)&custom.vposr >> 7) & 0xffe))
> @@ -1055,7 +1065,7 @@ static int amifb_inverse = 0;
> * Copper Initialisation List
> */
>
> -#define COPINITSIZE (sizeof(copins)*40)
> +#define COPINITSIZE (sizeof(copins) * 40)
>
> enum {
> cip_bplcon0
> @@ -1066,7 +1076,7 @@ enum {
> * Don't change the order, build_copper()/rebuild_copper() rely on this
> */
>
> -#define COPLISTSIZE (sizeof(copins)*64)
> +#define COPLISTSIZE (sizeof(copins) * 64)
>
> enum {
> cop_wait, cop_bplcon0,
> @@ -1152,9 +1162,9 @@ static void chipfree(void);
> */
>
> static int ami_decode_var(struct fb_var_screeninfo *var,
> - struct amifb_par *par);
> + struct amifb_par *par);
> static int ami_encode_var(struct fb_var_screeninfo *var,
> - struct amifb_par *par);
> + struct amifb_par *par);
> static void ami_pan_var(struct fb_var_screeninfo *var);
> static int ami_update_par(void);
> static void ami_update_display(void);
> @@ -1238,9 +1248,9 @@ int __init amifb_setup(char *options)
> } else if (!strcmp(this_opt, "ilbm"))
> amifb_ilbm = 1;
> else if (!strncmp(this_opt, "monitorcap:", 11))
> - amifb_setup_mcap(this_opt+11);
> + amifb_setup_mcap(this_opt + 11);
> else if (!strncmp(this_opt, "fstart:", 7))
> - min_fstrt = simple_strtoul(this_opt+7, NULL, 0);
> + min_fstrt = simple_strtoul(this_opt + 7, NULL, 0);
> else
> mode_option = this_opt;
> }
> @@ -1295,20 +1305,20 @@ static int amifb_set_par(struct fb_info *info)
> info->fix.type = FB_TYPE_PLANES;
> info->fix.type_aux = 0;
> }
> - info->fix.line_length = div8(upx(16<<maxfmode, par->vxres));
> + info->fix.line_length = div8(upx(16 << maxfmode, par->vxres));
>
> if (par->vmode & FB_VMODE_YWRAP) {
> info->fix.ywrapstep = 1;
> info->fix.xpanstep = 0;
> info->fix.ypanstep = 0;
> info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YWRAP |
> - FBINFO_READS_FAST; /* override SCROLL_REDRAW */
> + FBINFO_READS_FAST; /* override SCROLL_REDRAW */
> } else {
> info->fix.ywrapstep = 0;
> if (par->vmode & FB_VMODE_SMOOTH_XPAN)
> info->fix.xpanstep = 1;
> else
> - info->fix.xpanstep = 16<<maxfmode;
> + info->fix.xpanstep = 16 << maxfmode;
> info->fix.ypanstep = 1;
> info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;
> }
> @@ -1327,15 +1337,16 @@ static int amifb_pan_display(struct fb_var_screeninfo *var,
> {
> if (var->vmode & FB_VMODE_YWRAP) {
> if (var->yoffset < 0 ||
> - var->yoffset >= info->var.yres_virtual || var->xoffset)
> - return -EINVAL;
> + var->yoffset >= info->var.yres_virtual || var->xoffset)
> + return -EINVAL;
> } else {
> /*
> * TODO: There will be problems when xpan!=1, so some columns
> * on the right side will never be seen
> */
> - if (var->xoffset+info->var.xres > upx(16<<maxfmode, info->var.xres_virtual) ||
> - var->yoffset+info->var.yres > info->var.yres_virtual)
> + if (var->xoffset + info->var.xres >
> + upx(16 << maxfmode, info->var.xres_virtual) ||
> + var->yoffset + info->var.yres > info->var.yres_virtual)
> return -EINVAL;
> }
> ami_pan_var(var);
> @@ -1360,10 +1371,10 @@ static int amifb_pan_display(struct fb_var_screeninfo *var,
> #endif
>
>
> - /*
> - * Compose two values, using a bitmask as decision value
> - * This is equivalent to (a & mask) | (b & ~mask)
> - */
> + /*
> + * Compose two values, using a bitmask as decision value
> + * This is equivalent to (a & mask) | (b & ~mask)
> + */
>
> static inline unsigned long comp(unsigned long a, unsigned long b,
> unsigned long mask)
> @@ -1379,29 +1390,29 @@ static inline unsigned long xor(unsigned long a, unsigned long b,
> }
>
>
> - /*
> - * Unaligned forward bit copy using 32-bit or 64-bit memory accesses
> - */
> + /*
> + * Unaligned forward bit copy using 32-bit or 64-bit memory accesses
> + */
>
> static void bitcpy(unsigned long *dst, int dst_idx, const unsigned long *src,
> int src_idx, u32 n)
> {
> unsigned long first, last;
> - int shift = dst_idx-src_idx, left, right;
> + int shift = dst_idx - src_idx, left, right;
> unsigned long d0, d1;
> int m;
>
> if (!n)
> return;
>
> - shift = dst_idx-src_idx;
> + shift = dst_idx - src_idx;
> first = ~0UL >> dst_idx;
> - last = ~(~0UL >> ((dst_idx+n) % BITS_PER_LONG));
> + last = ~(~0UL >> ((dst_idx + n) % BITS_PER_LONG));
>
> if (!shift) {
> // Same alignment for source and dest
>
> - if (dst_idx+n <= BITS_PER_LONG) {
> + if (dst_idx + n <= BITS_PER_LONG) {
> // Single word
> if (last)
> first &= last;
> @@ -1413,7 +1424,7 @@ static void bitcpy(unsigned long *dst, int dst_idx, const unsigned long *src,
> *dst = comp(*src, *dst, first);
> dst++;
> src++;
> - n -= BITS_PER_LONG-dst_idx;
> + n -= BITS_PER_LONG - dst_idx;
> }
>
> // Main chunk
> @@ -1439,17 +1450,17 @@ static void bitcpy(unsigned long *dst, int dst_idx, const unsigned long *src,
> } else {
> // Different alignment for source and dest
>
> - right = shift & (BITS_PER_LONG-1);
> - left = -shift & (BITS_PER_LONG-1);
> + right = shift & (BITS_PER_LONG - 1);
> + left = -shift & (BITS_PER_LONG - 1);
>
> - if (dst_idx+n <= BITS_PER_LONG) {
> + if (dst_idx + n <= BITS_PER_LONG) {
> // Single destination word
> if (last)
> first &= last;
> if (shift > 0) {
> // Single source word
> *dst = comp(*src >> right, *dst, first);
> - } else if (src_idx+n <= BITS_PER_LONG) {
> + } else if (src_idx + n <= BITS_PER_LONG) {
> // Single source word
> *dst = comp(*src << left, *dst, first);
> } else {
> @@ -1467,7 +1478,7 @@ static void bitcpy(unsigned long *dst, int dst_idx, const unsigned long *src,
> // Single source word
> *dst = comp(d0 >> right, *dst, first);
> dst++;
> - n -= BITS_PER_LONG-dst_idx;
> + n -= BITS_PER_LONG - dst_idx;
> } else {
> // 2 source words
> d1 = *src++;
> @@ -1475,7 +1486,7 @@ static void bitcpy(unsigned long *dst, int dst_idx, const unsigned long *src,
> first);
> d0 = d1;
> dst++;
> - n -= BITS_PER_LONG-dst_idx;
> + n -= BITS_PER_LONG - dst_idx;
> }
>
> // Main chunk
> @@ -1519,40 +1530,40 @@ static void bitcpy(unsigned long *dst, int dst_idx, const unsigned long *src,
> }
>
>
> - /*
> - * Unaligned reverse bit copy using 32-bit or 64-bit memory accesses
> - */
> + /*
> + * Unaligned reverse bit copy using 32-bit or 64-bit memory accesses
> + */
>
> static void bitcpy_rev(unsigned long *dst, int dst_idx,
> const unsigned long *src, int src_idx, u32 n)
> {
> unsigned long first, last;
> - int shift = dst_idx-src_idx, left, right;
> + int shift = dst_idx - src_idx, left, right;
> unsigned long d0, d1;
> int m;
>
> if (!n)
> return;
>
> - dst += (n-1)/BITS_PER_LONG;
> - src += (n-1)/BITS_PER_LONG;
> - if ((n-1) % BITS_PER_LONG) {
> - dst_idx += (n-1) % BITS_PER_LONG;
> + dst += (n - 1) / BITS_PER_LONG;
> + src += (n - 1) / BITS_PER_LONG;
> + if ((n - 1) % BITS_PER_LONG) {
> + dst_idx += (n - 1) % BITS_PER_LONG;
> dst += dst_idx >> SHIFT_PER_LONG;
> - dst_idx &= BITS_PER_LONG-1;
> - src_idx += (n-1) % BITS_PER_LONG;
> + dst_idx &= BITS_PER_LONG - 1;
> + src_idx += (n - 1) % BITS_PER_LONG;
> src += src_idx >> SHIFT_PER_LONG;
> - src_idx &= BITS_PER_LONG-1;
> + src_idx &= BITS_PER_LONG - 1;
> }
>
> - shift = dst_idx-src_idx;
> - first = ~0UL << (BITS_PER_LONG-1-dst_idx);
> - last = ~(~0UL << (BITS_PER_LONG-1-((dst_idx-n) % BITS_PER_LONG)));
> + shift = dst_idx - src_idx;
> + first = ~0UL << (BITS_PER_LONG - 1 - dst_idx);
> + last = ~(~0UL << (BITS_PER_LONG - 1 - ((dst_idx - n) % BITS_PER_LONG)));
>
> if (!shift) {
> // Same alignment for source and dest
>
> - if ((unsigned long)dst_idx+1 >= n) {
> + if ((unsigned long)dst_idx + 1 >= n) {
> // Single word
> if (last)
> first &= last;
> @@ -1564,7 +1575,7 @@ static void bitcpy_rev(unsigned long *dst, int dst_idx,
> *dst = comp(*src, *dst, first);
> dst--;
> src--;
> - n -= dst_idx+1;
> + n -= dst_idx + 1;
> }
>
> // Main chunk
> @@ -1590,17 +1601,17 @@ static void bitcpy_rev(unsigned long *dst, int dst_idx,
> } else {
> // Different alignment for source and dest
>
> - right = shift & (BITS_PER_LONG-1);
> - left = -shift & (BITS_PER_LONG-1);
> + right = shift & (BITS_PER_LONG - 1);
> + left = -shift & (BITS_PER_LONG - 1);
>
> - if ((unsigned long)dst_idx+1 >= n) {
> + if ((unsigned long)dst_idx + 1 >= n) {
> // Single destination word
> if (last)
> first &= last;
> if (shift < 0) {
> // Single source word
> *dst = comp(*src << left, *dst, first);
> - } else if (1+(unsigned long)src_idx >= n) {
> + } else if (1 + (unsigned long)src_idx >= n) {
> // Single source word
> *dst = comp(*src >> right, *dst, first);
> } else {
> @@ -1618,7 +1629,7 @@ static void bitcpy_rev(unsigned long *dst, int dst_idx,
> // Single source word
> *dst = comp(d0 << left, *dst, first);
> dst--;
> - n -= dst_idx+1;
> + n -= dst_idx + 1;
> } else {
> // 2 source words
> d1 = *src--;
> @@ -1626,7 +1637,7 @@ static void bitcpy_rev(unsigned long *dst, int dst_idx,
> first);
> d0 = d1;
> dst--;
> - n -= dst_idx+1;
> + n -= dst_idx + 1;
> }
>
> // Main chunk
> @@ -1670,30 +1681,30 @@ static void bitcpy_rev(unsigned long *dst, int dst_idx,
> }
>
>
> - /*
> - * Unaligned forward inverting bit copy using 32-bit or 64-bit memory
> - * accesses
> - */
> + /*
> + * Unaligned forward inverting bit copy using 32-bit or 64-bit memory
> + * accesses
> + */
>
> static void bitcpy_not(unsigned long *dst, int dst_idx,
> const unsigned long *src, int src_idx, u32 n)
> {
> unsigned long first, last;
> - int shift = dst_idx-src_idx, left, right;
> + int shift = dst_idx - src_idx, left, right;
> unsigned long d0, d1;
> int m;
>
> if (!n)
> return;
>
> - shift = dst_idx-src_idx;
> + shift = dst_idx - src_idx;
> first = ~0UL >> dst_idx;
> - last = ~(~0UL >> ((dst_idx+n) % BITS_PER_LONG));
> + last = ~(~0UL >> ((dst_idx + n) % BITS_PER_LONG));
>
> if (!shift) {
> // Same alignment for source and dest
>
> - if (dst_idx+n <= BITS_PER_LONG) {
> + if (dst_idx + n <= BITS_PER_LONG) {
> // Single word
> if (last)
> first &= last;
> @@ -1705,7 +1716,7 @@ static void bitcpy_not(unsigned long *dst, int dst_idx,
> *dst = comp(~*src, *dst, first);
> dst++;
> src++;
> - n -= BITS_PER_LONG-dst_idx;
> + n -= BITS_PER_LONG - dst_idx;
> }
>
> // Main chunk
> @@ -1731,17 +1742,17 @@ static void bitcpy_not(unsigned long *dst, int dst_idx,
> } else {
> // Different alignment for source and dest
>
> - right = shift & (BITS_PER_LONG-1);
> - left = -shift & (BITS_PER_LONG-1);
> + right = shift & (BITS_PER_LONG - 1);
> + left = -shift & (BITS_PER_LONG - 1);
>
> - if (dst_idx+n <= BITS_PER_LONG) {
> + if (dst_idx + n <= BITS_PER_LONG) {
> // Single destination word
> if (last)
> first &= last;
> if (shift > 0) {
> // Single source word
> *dst = comp(~*src >> right, *dst, first);
> - } else if (src_idx+n <= BITS_PER_LONG) {
> + } else if (src_idx + n <= BITS_PER_LONG) {
> // Single source word
> *dst = comp(~*src << left, *dst, first);
> } else {
> @@ -1759,7 +1770,7 @@ static void bitcpy_not(unsigned long *dst, int dst_idx,
> // Single source word
> *dst = comp(d0 >> right, *dst, first);
> dst++;
> - n -= BITS_PER_LONG-dst_idx;
> + n -= BITS_PER_LONG - dst_idx;
> } else {
> // 2 source words
> d1 = ~*src++;
> @@ -1767,7 +1778,7 @@ static void bitcpy_not(unsigned long *dst, int dst_idx,
> first);
> d0 = d1;
> dst++;
> - n -= BITS_PER_LONG-dst_idx;
> + n -= BITS_PER_LONG - dst_idx;
> }
>
> // Main chunk
> @@ -1811,9 +1822,9 @@ static void bitcpy_not(unsigned long *dst, int dst_idx,
> }
>
>
> - /*
> - * Unaligned 32-bit pattern fill using 32/64-bit memory accesses
> - */
> + /*
> + * Unaligned 32-bit pattern fill using 32/64-bit memory accesses
> + */
>
> static void bitfill32(unsigned long *dst, int dst_idx, u32 pat, u32 n)
> {
> @@ -1828,9 +1839,9 @@ static void bitfill32(unsigned long *dst, int dst_idx, u32 pat, u32 n)
> #endif
>
> first = ~0UL >> dst_idx;
> - last = ~(~0UL >> ((dst_idx+n) % BITS_PER_LONG));
> + last = ~(~0UL >> ((dst_idx + n) % BITS_PER_LONG));
>
> - if (dst_idx+n <= BITS_PER_LONG) {
> + if (dst_idx + n <= BITS_PER_LONG) {
> // Single word
> if (last)
> first &= last;
> @@ -1841,7 +1852,7 @@ static void bitfill32(unsigned long *dst, int dst_idx, u32 pat, u32 n)
> if (first) {
> *dst = comp(val, *dst, first);
> dst++;
> - n -= BITS_PER_LONG-dst_idx;
> + n -= BITS_PER_LONG - dst_idx;
> }
>
> // Main chunk
> @@ -1867,9 +1878,9 @@ static void bitfill32(unsigned long *dst, int dst_idx, u32 pat, u32 n)
> }
>
>
> - /*
> - * Unaligned 32-bit pattern xor using 32/64-bit memory accesses
> - */
> + /*
> + * Unaligned 32-bit pattern xor using 32/64-bit memory accesses
> + */
>
> static void bitxor32(unsigned long *dst, int dst_idx, u32 pat, u32 n)
> {
> @@ -1884,9 +1895,9 @@ static void bitxor32(unsigned long *dst, int dst_idx, u32 pat, u32 n)
> #endif
>
> first = ~0UL >> dst_idx;
> - last = ~(~0UL >> ((dst_idx+n) % BITS_PER_LONG));
> + last = ~(~0UL >> ((dst_idx + n) % BITS_PER_LONG));
>
> - if (dst_idx+n <= BITS_PER_LONG) {
> + if (dst_idx + n <= BITS_PER_LONG) {
> // Single word
> if (last)
> first &= last;
> @@ -1897,7 +1908,7 @@ static void bitxor32(unsigned long *dst, int dst_idx, u32 pat, u32 n)
> if (first) {
> *dst = xor(val, *dst, first);
> dst++;
> - n -= BITS_PER_LONG-dst_idx;
> + n -= BITS_PER_LONG - dst_idx;
> }
>
> // Main chunk
> @@ -1924,12 +1935,12 @@ static inline void fill_one_line(int bpp, unsigned long next_plane,
> {
> while (1) {
> dst += dst_idx >> SHIFT_PER_LONG;
> - dst_idx &= (BITS_PER_LONG-1);
> + dst_idx &= (BITS_PER_LONG - 1);
> bitfill32(dst, dst_idx, color & 1 ? ~0 : 0, n);
> if (!--bpp)
> break;
> color >>= 1;
> - dst_idx += next_plane*8;
> + dst_idx += next_plane * 8;
> }
> }
>
> @@ -1939,12 +1950,12 @@ static inline void xor_one_line(int bpp, unsigned long next_plane,
> {
> while (color) {
> dst += dst_idx >> SHIFT_PER_LONG;
> - dst_idx &= (BITS_PER_LONG-1);
> + dst_idx &= (BITS_PER_LONG - 1);
> bitxor32(dst, dst_idx, color & 1 ? ~0 : 0, n);
> if (!--bpp)
> break;
> color >>= 1;
> - dst_idx += next_plane*8;
> + dst_idx += next_plane * 8;
> }
> }
>
> @@ -1972,23 +1983,23 @@ static void amifb_fillrect(struct fb_info *info,
> height = y2 - rect->dy;
>
> dst = (unsigned long *)
> - ((unsigned long)info->screen_base & ~(BYTES_PER_LONG-1));
> - dst_idx = ((unsigned long)info->screen_base & (BYTES_PER_LONG-1))*8;
> - dst_idx += rect->dy*par->next_line*8+rect->dx;
> + ((unsigned long)info->screen_base & ~(BYTES_PER_LONG - 1));
> + dst_idx = ((unsigned long)info->screen_base & (BYTES_PER_LONG - 1)) * 8;
> + dst_idx += rect->dy * par->next_line * 8 + rect->dx;
> while (height--) {
> switch (rect->rop) {
> - case ROP_COPY:
> + case ROP_COPY:
> fill_one_line(info->var.bits_per_pixel,
> par->next_plane, dst, dst_idx, width,
> rect->color);
> break;
>
> - case ROP_XOR:
> + case ROP_XOR:
> xor_one_line(info->var.bits_per_pixel, par->next_plane,
> dst, dst_idx, width, rect->color);
> break;
> }
> - dst_idx += par->next_line*8;
> + dst_idx += par->next_line * 8;
> }
> }
>
> @@ -1998,14 +2009,14 @@ static inline void copy_one_line(int bpp, unsigned long next_plane,
> {
> while (1) {
> dst += dst_idx >> SHIFT_PER_LONG;
> - dst_idx &= (BITS_PER_LONG-1);
> + dst_idx &= (BITS_PER_LONG - 1);
> src += src_idx >> SHIFT_PER_LONG;
> - src_idx &= (BITS_PER_LONG-1);
> + src_idx &= (BITS_PER_LONG - 1);
> bitcpy(dst, dst_idx, src, src_idx, n);
> if (!--bpp)
> break;
> - dst_idx += next_plane*8;
> - src_idx += next_plane*8;
> + dst_idx += next_plane * 8;
> + src_idx += next_plane * 8;
> }
> }
>
> @@ -2015,14 +2026,14 @@ static inline void copy_one_line_rev(int bpp, unsigned long next_plane,
> {
> while (1) {
> dst += dst_idx >> SHIFT_PER_LONG;
> - dst_idx &= (BITS_PER_LONG-1);
> + dst_idx &= (BITS_PER_LONG - 1);
> src += src_idx >> SHIFT_PER_LONG;
> - src_idx &= (BITS_PER_LONG-1);
> + src_idx &= (BITS_PER_LONG - 1);
> bitcpy_rev(dst, dst_idx, src, src_idx, n);
> if (!--bpp)
> break;
> - dst_idx += next_plane*8;
> - src_idx += next_plane*8;
> + dst_idx += next_plane * 8;
> + src_idx += next_plane * 8;
> }
> }
>
> @@ -2065,16 +2076,16 @@ static void amifb_copyarea(struct fb_info *info,
> rev_copy = 1;
> }
> dst = (unsigned long *)
> - ((unsigned long)info->screen_base & ~(BYTES_PER_LONG-1));
> + ((unsigned long)info->screen_base & ~(BYTES_PER_LONG - 1));
> src = dst;
> - dst_idx = ((unsigned long)info->screen_base & (BYTES_PER_LONG-1))*8;
> + dst_idx = ((unsigned long)info->screen_base & (BYTES_PER_LONG - 1)) * 8;
> src_idx = dst_idx;
> - dst_idx += dy*par->next_line*8+dx;
> - src_idx += sy*par->next_line*8+sx;
> + dst_idx += dy * par->next_line * 8 + dx;
> + src_idx += sy * par->next_line * 8 + sx;
> if (rev_copy) {
> while (height--) {
> - dst_idx -= par->next_line*8;
> - src_idx -= par->next_line*8;
> + dst_idx -= par->next_line * 8;
> + src_idx -= par->next_line * 8;
> copy_one_line_rev(info->var.bits_per_pixel,
> par->next_plane, dst, dst_idx, src,
> src_idx, width);
> @@ -2084,8 +2095,8 @@ static void amifb_copyarea(struct fb_info *info,
> copy_one_line(info->var.bits_per_pixel,
> par->next_plane, dst, dst_idx, src,
> src_idx, width);
> - dst_idx += par->next_line*8;
> - src_idx += par->next_line*8;
> + dst_idx += par->next_line * 8;
> + src_idx += par->next_line * 8;
> }
> }
> }
> @@ -2095,28 +2106,29 @@ static inline void expand_one_line(int bpp, unsigned long next_plane,
> unsigned long *dst, int dst_idx, u32 n,
> const u8 *data, u32 bgcolor, u32 fgcolor)
> {
> - const unsigned long *src;
> - int src_idx;
> -
> - while (1) {
> - dst += dst_idx >> SHIFT_PER_LONG;
> - dst_idx &= (BITS_PER_LONG-1);
> - if ((bgcolor ^ fgcolor) & 1) {
> - src = (unsigned long *)((unsigned long)data & ~(BYTES_PER_LONG-1));
> - src_idx = ((unsigned long)data & (BYTES_PER_LONG-1))*8;
> - if (fgcolor & 1)
> - bitcpy(dst, dst_idx, src, src_idx, n);
> - else
> - bitcpy_not(dst, dst_idx, src, src_idx, n);
> - /* set or clear */
> - } else
> - bitfill32(dst, dst_idx, fgcolor & 1 ? ~0 : 0, n);
> - if (!--bpp)
> - break;
> - bgcolor >>= 1;
> - fgcolor >>= 1;
> - dst_idx += next_plane*8;
> - }
> + const unsigned long *src;
> + int src_idx;
> +
> + while (1) {
> + dst += dst_idx >> SHIFT_PER_LONG;
> + dst_idx &= (BITS_PER_LONG - 1);
> + if ((bgcolor ^ fgcolor) & 1) {
> + src = (unsigned long *)
> + ((unsigned long)data & ~(BYTES_PER_LONG - 1));
> + src_idx = ((unsigned long)data & (BYTES_PER_LONG - 1)) * 8;
> + if (fgcolor & 1)
> + bitcpy(dst, dst_idx, src, src_idx, n);
> + else
> + bitcpy_not(dst, dst_idx, src, src_idx, n);
> + /* set or clear */
> + } else
> + bitfill32(dst, dst_idx, fgcolor & 1 ? ~0 : 0, n);
> + if (!--bpp)
> + break;
> + bgcolor >>= 1;
> + fgcolor >>= 1;
> + dst_idx += next_plane * 8;
> + }
> }
>
>
> @@ -2145,17 +2157,17 @@ static void amifb_imageblit(struct fb_info *info, const struct fb_image *image)
>
> if (image->depth == 1) {
> dst = (unsigned long *)
> - ((unsigned long)info->screen_base & ~(BYTES_PER_LONG-1));
> - dst_idx = ((unsigned long)info->screen_base & (BYTES_PER_LONG-1))*8;
> - dst_idx += dy*par->next_line*8+dx;
> + ((unsigned long)info->screen_base & ~(BYTES_PER_LONG - 1));
> + dst_idx = ((unsigned long)info->screen_base & (BYTES_PER_LONG - 1)) * 8;
> + dst_idx += dy * par->next_line * 8 + dx;
> src = image->data;
> - pitch = (image->width+7)/8;
> + pitch = (image->width + 7) / 8;
> while (height--) {
> expand_one_line(info->var.bits_per_pixel,
> par->next_plane, dst, dst_idx, width,
> src, image->bg_color,
> image->fg_color);
> - dst_idx += par->next_line*8;
> + dst_idx += par->next_line * 8;
> src += pitch;
> }
> } else {
> @@ -2182,39 +2194,38 @@ static int amifb_ioctl(struct fb_info *info,
> int i;
>
> switch (cmd) {
> - case FBIOGET_FCURSORINFO:
> - i = ami_get_fix_cursorinfo(&crsr.fix);
> - if (i)
> - return i;
> - return copy_to_user(argp, &crsr.fix,
> - sizeof(crsr.fix)) ? -EFAULT : 0;
> -
> - case FBIOGET_VCURSORINFO:
> - i = ami_get_var_cursorinfo(&crsr.var,
> - ((struct fb_var_cursorinfo __user *)arg)->data);
> - if (i)
> - return i;
> - return copy_to_user(argp, &crsr.var,
> - sizeof(crsr.var)) ? -EFAULT : 0;
> -
> - case FBIOPUT_VCURSORINFO:
> - if (copy_from_user(&crsr.var, argp, sizeof(crsr.var)))
> - return -EFAULT;
> - return ami_set_var_cursorinfo(&crsr.var,
> - ((struct fb_var_cursorinfo __user *)arg)->data);
> -
> - case FBIOGET_CURSORSTATE:
> - i = ami_get_cursorstate(&crsr.state);
> - if (i)
> - return i;
> - return copy_to_user(argp, &crsr.state,
> - sizeof(crsr.state)) ? -EFAULT : 0;
> -
> - case FBIOPUT_CURSORSTATE:
> - if (copy_from_user(&crsr.state, argp,
> - sizeof(crsr.state)))
> - return -EFAULT;
> - return ami_set_cursorstate(&crsr.state);
> + case FBIOGET_FCURSORINFO:
> + i = ami_get_fix_cursorinfo(&crsr.fix);
> + if (i)
> + return i;
> + return copy_to_user(argp, &crsr.fix,
> + sizeof(crsr.fix)) ? -EFAULT : 0;
> +
> + case FBIOGET_VCURSORINFO:
> + i = ami_get_var_cursorinfo(&crsr.var,
> + ((struct fb_var_cursorinfo __user *)arg)->data);
> + if (i)
> + return i;
> + return copy_to_user(argp, &crsr.var,
> + sizeof(crsr.var)) ? -EFAULT : 0;
> +
> + case FBIOPUT_VCURSORINFO:
> + if (copy_from_user(&crsr.var, argp, sizeof(crsr.var)))
> + return -EFAULT;
> + return ami_set_var_cursorinfo(&crsr.var,
> + ((struct fb_var_cursorinfo __user *)arg)->data);
> +
> + case FBIOGET_CURSORSTATE:
> + i = ami_get_cursorstate(&crsr.state);
> + if (i)
> + return i;
> + return copy_to_user(argp, &crsr.state,
> + sizeof(crsr.state)) ? -EFAULT : 0;
> +
> + case FBIOPUT_CURSORSTATE:
> + if (copy_from_user(&crsr.state, argp, sizeof(crsr.state)))
> + return -EFAULT;
> + return ami_set_cursorstate(&crsr.state);
> }
> return -EINVAL;
> }
> @@ -2267,69 +2278,68 @@ static int __init amifb_probe(struct platform_device *pdev)
>
> switch (amiga_chipset) {
> #ifdef CONFIG_FB_AMIGA_OCS
> - case CS_OCS:
> - strcat(fb_info.fix.id, "OCS");
> + case CS_OCS:
> + strcat(fb_info.fix.id, "OCS");
> default_chipset:
> - chipset = TAG_OCS;
> - maxdepth[TAG_SHRES] = 0; /* OCS means no SHRES */
> - maxdepth[TAG_HIRES] = 4;
> - maxdepth[TAG_LORES] = 6;
> - maxfmode = TAG_FMODE_1;
> - defmode = amiga_vblank == 50 ? DEFMODE_PAL
> - : DEFMODE_NTSC;
> - fb_info.fix.smem_len = VIDEOMEMSIZE_OCS;
> - break;
> + chipset = TAG_OCS;
> + maxdepth[TAG_SHRES] = 0; /* OCS means no SHRES */
> + maxdepth[TAG_HIRES] = 4;
> + maxdepth[TAG_LORES] = 6;
> + maxfmode = TAG_FMODE_1;
> + defmode = amiga_vblank == 50 ? DEFMODE_PAL : DEFMODE_NTSC;
> + fb_info.fix.smem_len = VIDEOMEMSIZE_OCS;
> + break;
> #endif /* CONFIG_FB_AMIGA_OCS */
>
> #ifdef CONFIG_FB_AMIGA_ECS
> - case CS_ECS:
> - strcat(fb_info.fix.id, "ECS");
> - chipset = TAG_ECS;
> - maxdepth[TAG_SHRES] = 2;
> - maxdepth[TAG_HIRES] = 4;
> - maxdepth[TAG_LORES] = 6;
> - maxfmode = TAG_FMODE_1;
> - if (AMIGAHW_PRESENT(AMBER_FF))
> - defmode = amiga_vblank == 50 ? DEFMODE_AMBER_PAL
> - : DEFMODE_AMBER_NTSC;
> - else
> - defmode = amiga_vblank == 50 ? DEFMODE_PAL
> - : DEFMODE_NTSC;
> - if (amiga_chip_avail()-CHIPRAM_SAFETY_LIMIT >
> - VIDEOMEMSIZE_ECS_2M)
> - fb_info.fix.smem_len = VIDEOMEMSIZE_ECS_2M;
> - else
> - fb_info.fix.smem_len = VIDEOMEMSIZE_ECS_1M;
> - break;
> + case CS_ECS:
> + strcat(fb_info.fix.id, "ECS");
> + chipset = TAG_ECS;
> + maxdepth[TAG_SHRES] = 2;
> + maxdepth[TAG_HIRES] = 4;
> + maxdepth[TAG_LORES] = 6;
> + maxfmode = TAG_FMODE_1;
> + if (AMIGAHW_PRESENT(AMBER_FF))
> + defmode = amiga_vblank == 50 ? DEFMODE_AMBER_PAL
> + : DEFMODE_AMBER_NTSC;
> + else
> + defmode = amiga_vblank == 50 ? DEFMODE_PAL
> + : DEFMODE_NTSC;
> + if (amiga_chip_avail() - CHIPRAM_SAFETY_LIMIT >
> + VIDEOMEMSIZE_ECS_2M)
> + fb_info.fix.smem_len = VIDEOMEMSIZE_ECS_2M;
> + else
> + fb_info.fix.smem_len = VIDEOMEMSIZE_ECS_1M;
> + break;
> #endif /* CONFIG_FB_AMIGA_ECS */
>
> #ifdef CONFIG_FB_AMIGA_AGA
> - case CS_AGA:
> - strcat(fb_info.fix.id, "AGA");
> - chipset = TAG_AGA;
> - maxdepth[TAG_SHRES] = 8;
> - maxdepth[TAG_HIRES] = 8;
> - maxdepth[TAG_LORES] = 8;
> - maxfmode = TAG_FMODE_4;
> - defmode = DEFMODE_AGA;
> - if (amiga_chip_avail()-CHIPRAM_SAFETY_LIMIT >
> - VIDEOMEMSIZE_AGA_2M)
> - fb_info.fix.smem_len = VIDEOMEMSIZE_AGA_2M;
> - else
> - fb_info.fix.smem_len = VIDEOMEMSIZE_AGA_1M;
> - break;
> + case CS_AGA:
> + strcat(fb_info.fix.id, "AGA");
> + chipset = TAG_AGA;
> + maxdepth[TAG_SHRES] = 8;
> + maxdepth[TAG_HIRES] = 8;
> + maxdepth[TAG_LORES] = 8;
> + maxfmode = TAG_FMODE_4;
> + defmode = DEFMODE_AGA;
> + if (amiga_chip_avail() - CHIPRAM_SAFETY_LIMIT >
> + VIDEOMEMSIZE_AGA_2M)
> + fb_info.fix.smem_len = VIDEOMEMSIZE_AGA_2M;
> + else
> + fb_info.fix.smem_len = VIDEOMEMSIZE_AGA_1M;
> + break;
> #endif /* CONFIG_FB_AMIGA_AGA */
>
> - default:
> + default:
> #ifdef CONFIG_FB_AMIGA_OCS
> - printk("Unknown graphics chipset, defaulting to OCS\n");
> - strcat(fb_info.fix.id, "Unknown");
> - goto default_chipset;
> + printk("Unknown graphics chipset, defaulting to OCS\n");
> + strcat(fb_info.fix.id, "Unknown");
> + goto default_chipset;
> #else /* CONFIG_FB_AMIGA_OCS */
> - err = -ENODEV;
> - goto amifb_error;
> + err = -ENODEV;
> + goto amifb_error;
> #endif /* CONFIG_FB_AMIGA_OCS */
> - break;
> + break;
> }
>
> /*
> @@ -2360,10 +2370,10 @@ default_chipset:
> * These monitor specs are for a typical Amiga monitor (e.g. A1960)
> */
> if (fb_info.monspecs.hfmin == 0) {
> - fb_info.monspecs.hfmin = 15000;
> - fb_info.monspecs.hfmax = 38000;
> - fb_info.monspecs.vfmin = 49;
> - fb_info.monspecs.vfmax = 90;
> + fb_info.monspecs.hfmin = 15000;
> + fb_info.monspecs.hfmax = 38000;
> + fb_info.monspecs.vfmin = 49;
> + fb_info.monspecs.vfmax = 90;
> }
>
> fb_info.fbops = &amifb_ops;
> @@ -2381,11 +2391,9 @@ default_chipset:
> &fb_info.modelist);
>
> round_down_bpp = 0;
> - chipptr = chipalloc(fb_info.fix.smem_len+
> - SPRITEMEMSIZE+
> - DUMMYSPRITEMEMSIZE+
> - COPINITSIZE+
> - 4*COPLISTSIZE);
> + chipptr = chipalloc(fb_info.fix.smem_len + SPRITEMEMSIZE +
> + DUMMYSPRITEMEMSIZE + COPINITSIZE +
> + 4 * COPLISTSIZE);
> if (!chipptr) {
> err = -ENOMEM;
> goto amifb_error;
> @@ -2419,7 +2427,7 @@ default_chipset:
> */
>
> custom.dmacon = DMAF_SETCLR | DMAF_MASTER | DMAF_RASTER | DMAF_COPPER |
> - DMAF_BLITTER | DMAF_SPRITE;
> + DMAF_BLITTER | DMAF_SPRITE;
>
> /*
> * Make sure the Copper has something to do
> @@ -2428,12 +2436,12 @@ default_chipset:
> ami_init_copper();
>
> if (request_irq(IRQ_AMIGA_COPPER, amifb_interrupt, 0,
> - "fb vertb handler", ¤tpar)) {
> + "fb vertb handler", ¤tpar)) {
> err = -EBUSY;
> goto amifb_error;
> }
>
> - err = fb_alloc_cmap(&fb_info.cmap, 1<<fb_info.var.bits_per_pixel, 0);
> + err = fb_alloc_cmap(&fb_info.cmap, 1 << fb_info.var.bits_per_pixel, 0);
> if (err)
> goto amifb_error;
>
> @@ -2459,7 +2467,7 @@ static void amifb_deinit(struct platform_device *pdev)
> fb_dealloc_cmap(&fb_info.cmap);
> chipfree();
> if (videomemory)
> - iounmap((void*)videomemory);
> + iounmap((void *)videomemory);
> custom.dmacon = DMAF_ALL | DMAF_MASTER;
> }
>
> @@ -2539,7 +2547,7 @@ static irqreturn_t amifb_interrupt(int irq, void *dev_id)
> */
>
> static int ami_decode_var(struct fb_var_screeninfo *var,
> - struct amifb_par *par)
> + struct amifb_par *par)
> {
> u_short clk_shift, line_shift;
> u_long maxfetchstop, fstrt, fsize, fconst, xres_n, yres_n;
> @@ -2606,23 +2614,23 @@ static int ami_decode_var(struct fb_var_screeninfo *var,
>
> par->vmode = var->vmode | FB_VMODE_SMOOTH_XPAN;
> switch (par->vmode & FB_VMODE_MASK) {
> - case FB_VMODE_INTERLACED:
> - line_shift = 0;
> - break;
> - case FB_VMODE_NONINTERLACED:
> - line_shift = 1;
> - break;
> - case FB_VMODE_DOUBLE:
> - if (!IS_AGA) {
> - DPRINTK("double mode only possible with aga\n");
> - return -EINVAL;
> - }
> - line_shift = 2;
> - break;
> - default:
> - DPRINTK("unknown video mode\n");
> + case FB_VMODE_INTERLACED:
> + line_shift = 0;
> + break;
> + case FB_VMODE_NONINTERLACED:
> + line_shift = 1;
> + break;
> + case FB_VMODE_DOUBLE:
> + if (!IS_AGA) {
> + DPRINTK("double mode only possible with aga\n");
> return -EINVAL;
> - break;
> + }
> + line_shift = 2;
> + break;
> + default:
> + DPRINTK("unknown video mode\n");
> + return -EINVAL;
> + break;
> }
> par->line_shift = line_shift;
>
> @@ -2630,26 +2638,31 @@ static int ami_decode_var(struct fb_var_screeninfo *var,
> * Vertical and Horizontal Timings
> */
>
> - xres_n = par->xres<<clk_shift;
> - yres_n = par->yres<<line_shift;
> - par->htotal = down8((var->left_margin+par->xres+var->right_margin+var->hsync_len)<<clk_shift);
> - par->vtotal = down2(((var->upper_margin+par->yres+var->lower_margin+var->vsync_len)<<line_shift)+1);
> + xres_n = par->xres << clk_shift;
> + yres_n = par->yres << line_shift;
> + par->htotal = down8((var->left_margin + par->xres + var->right_margin +
> + var->hsync_len) << clk_shift);
> + par->vtotal =
> + down2(((var->upper_margin + par->yres + var->lower_margin +
> + var->vsync_len) << line_shift) + 1);
>
> if (IS_AGA)
> par->bplcon3 = sprpixmode[clk_shift];
> else
> par->bplcon3 = 0;
> if (var->sync & FB_SYNC_BROADCAST) {
> - par->diwstop_h = par->htotal-((var->right_margin-var->hsync_len)<<clk_shift);
> + par->diwstop_h = par->htotal -
> + ((var->right_margin - var->hsync_len) << clk_shift);
> if (IS_AGA)
> par->diwstop_h += mod4(var->hsync_len);
> else
> par->diwstop_h = down4(par->diwstop_h);
>
> par->diwstrt_h = par->diwstop_h - xres_n;
> - par->diwstop_v = par->vtotal-((var->lower_margin-var->vsync_len)<<line_shift);
> + par->diwstop_v = par->vtotal -
> + ((var->lower_margin - var->vsync_len) << line_shift);
> par->diwstrt_v = par->diwstop_v - yres_n;
> - if (par->diwstop_h >= par->htotal+8) {
> + if (par->diwstop_h >= par->htotal + 8) {
> DPRINTK("invalid diwstop_h\n");
> return -EINVAL;
> }
> @@ -2670,7 +2683,7 @@ static int ami_decode_var(struct fb_var_screeninfo *var,
> par->vsstrt = 0;
> par->vsstop = 0;
> }
> - if (par->vtotal > (PAL_VTOTAL+NTSC_VTOTAL)/2) {
> + if (par->vtotal > (PAL_VTOTAL + NTSC_VTOTAL) / 2) {
> /* PAL video mode */
> if (par->htotal != PAL_HTOTAL) {
> DPRINTK("htotal invalid for pal\n");
> @@ -2690,7 +2703,7 @@ static int ami_decode_var(struct fb_var_screeninfo *var,
> par->beamcon0 = BMC0_PAL;
> par->bplcon3 |= BPC3_BRDRBLNK;
> } else if (AMIGAHW_PRESENT(AGNUS_HR_PAL) ||
> - AMIGAHW_PRESENT(AGNUS_HR_NTSC)) {
> + AMIGAHW_PRESENT(AGNUS_HR_NTSC)) {
> par->beamcon0 = BMC0_PAL;
> par->hsstop = 1;
> } else if (amiga_vblank != 50) {
> @@ -2720,7 +2733,7 @@ static int ami_decode_var(struct fb_var_screeninfo *var,
> par->beamcon0 = 0;
> par->bplcon3 |= BPC3_BRDRBLNK;
> } else if (AMIGAHW_PRESENT(AGNUS_HR_PAL) ||
> - AMIGAHW_PRESENT(AGNUS_HR_NTSC)) {
> + AMIGAHW_PRESENT(AGNUS_HR_NTSC)) {
> par->beamcon0 = 0;
> par->hsstop = 1;
> } else if (amiga_vblank != 60) {
> @@ -2737,8 +2750,8 @@ static int ami_decode_var(struct fb_var_screeninfo *var,
> }
> } else if (!IS_OCS) {
> /* Programmable video mode */
> - par->hsstrt = var->right_margin<<clk_shift;
> - par->hsstop = (var->right_margin+var->hsync_len)<<clk_shift;
> + par->hsstrt = var->right_margin << clk_shift;
> + par->hsstop = (var->right_margin + var->hsync_len) << clk_shift;
> par->diwstop_h = par->htotal - mod8(par->hsstrt) + 8 - (1 << clk_shift);
> if (!IS_AGA)
> par->diwstop_h = down4(par->diwstop_h) - 16;
> @@ -2748,8 +2761,8 @@ static int ami_decode_var(struct fb_var_screeninfo *var,
> if (par->hbstrt >= par->htotal + 8)
> par->hbstrt -= par->htotal;
> par->hcenter = par->hsstrt + (par->htotal >> 1);
> - par->vsstrt = var->lower_margin<<line_shift;
> - par->vsstop = (var->lower_margin+var->vsync_len)<<line_shift;
> + par->vsstrt = var->lower_margin << line_shift;
> + par->vsstop = (var->lower_margin + var->vsync_len) << line_shift;
> par->diwstop_v = par->vtotal;
> if ((par->vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED)
> par->diwstop_v -= 2;
> @@ -2766,8 +2779,8 @@ static int ami_decode_var(struct fb_var_screeninfo *var,
> }
> par->bplcon3 |= BPC3_EXTBLKEN;
> par->beamcon0 = BMC0_HARDDIS | BMC0_VARVBEN | BMC0_LOLDIS |
> - BMC0_VARVSYEN | BMC0_VARHSYEN | BMC0_VARBEAMEN |
> - BMC0_PAL | BMC0_VARCSYEN;
> + BMC0_VARVSYEN | BMC0_VARHSYEN | BMC0_VARBEAMEN |
> + BMC0_PAL | BMC0_VARCSYEN;
> if (var->sync & FB_SYNC_HOR_HIGH_ACT)
> par->beamcon0 |= BMC0_HSYTRUE;
> if (var->sync & FB_SYNC_VERT_HIGH_ACT)
> @@ -2785,7 +2798,7 @@ static int ami_decode_var(struct fb_var_screeninfo *var,
> * Checking the DMA timing
> */
>
> - fconst = 16<<maxfmode<<clk_shift;
> + fconst = 16 << maxfmode << clk_shift;
>
> /*
> * smallest window start value without turn off other dma cycles
> @@ -2793,8 +2806,8 @@ static int ami_decode_var(struct fb_var_screeninfo *var,
> */
>
>
> - fsize = ((maxfmode+clk_shift <= 1) ? fconst : 64);
> - fstrt = downx(fconst, par->diwstrt_h-4) - fsize;
> + fsize = ((maxfmode + clk_shift <= 1) ? fconst : 64);
> + fstrt = downx(fconst, par->diwstrt_h - 4) - fsize;
> if (fstrt < min_fstrt) {
> DPRINTK("fetch start too low\n");
> return -EINVAL;
> @@ -2804,14 +2817,16 @@ static int ami_decode_var(struct fb_var_screeninfo *var,
> * smallest window start value where smooth scrolling is possible
> */
>
> - fstrt = downx(fconst, par->diwstrt_h-fconst+(1<<clk_shift)-4) - fsize;
> + fstrt = downx(fconst, par->diwstrt_h - fconst + (1 << clk_shift) - 4) -
> + fsize;
> if (fstrt < min_fstrt)
> par->vmode &= ~FB_VMODE_SMOOTH_XPAN;
>
> maxfetchstop = down16(par->htotal - 80);
>
> - fstrt = downx(fconst, par->diwstrt_h-4) - 64 - fconst;
> - fsize = upx(fconst, xres_n + modx(fconst, downx(1<<clk_shift, par->diwstrt_h-4)));
> + fstrt = downx(fconst, par->diwstrt_h - 4) - 64 - fconst;
> + fsize = upx(fconst, xres_n +
> + modx(fconst, downx(1 << clk_shift, par->diwstrt_h - 4)));
> if (fstrt + fsize > maxfetchstop)
> par->vmode &= ~FB_VMODE_SMOOTH_XPAN;
>
> @@ -2840,7 +2855,7 @@ static int ami_decode_var(struct fb_var_screeninfo *var,
> * Check if there is enough time to update the bitplane pointers for ywrap
> */
>
> - if (par->htotal-fsize-64 < par->bpp*64)
> + if (par->htotal - fsize - 64 < par->bpp * 64)
> par->vmode &= ~FB_VMODE_YWRAP;
>
> /*
> @@ -2848,15 +2863,15 @@ static int ami_decode_var(struct fb_var_screeninfo *var,
> */
>
> if (amifb_ilbm) {
> - par->next_plane = div8(upx(16<<maxfmode, par->vxres));
> - par->next_line = par->bpp*par->next_plane;
> + par->next_plane = div8(upx(16 << maxfmode, par->vxres));
> + par->next_line = par->bpp * par->next_plane;
> if (par->next_line * par->vyres > fb_info.fix.smem_len) {
> DPRINTK("too few video mem\n");
> return -EINVAL;
> }
> } else {
> - par->next_line = div8(upx(16<<maxfmode, par->vxres));
> - par->next_plane = par->vyres*par->next_line;
> + par->next_line = div8(upx(16 << maxfmode, par->vxres));
> + par->next_plane = par->vyres * par->next_line;
> if (par->next_plane * par->bpp > fb_info.fix.smem_len) {
> DPRINTK("too few video mem\n");
> return -EINVAL;
> @@ -2873,7 +2888,7 @@ static int ami_decode_var(struct fb_var_screeninfo *var,
> if (par->bpp == 8)
> par->bplcon0 |= BPC0_BPU3;
> else
> - par->bplcon0 |= par->bpp<<12;
> + par->bplcon0 |= par->bpp << 12;
> if (var->nonstd == FB_NONSTD_HAM)
> par->bplcon0 |= BPC0_HAM;
> if (var->sync & FB_SYNC_EXT)
> @@ -2883,24 +2898,26 @@ static int ami_decode_var(struct fb_var_screeninfo *var,
> par->fmode = bplfetchmode[maxfmode];
>
> switch (par->vmode & FB_VMODE_MASK) {
> - case FB_VMODE_INTERLACED:
> - par->bplcon0 |= BPC0_LACE;
> - break;
> - case FB_VMODE_DOUBLE:
> - if (IS_AGA)
> - par->fmode |= FMODE_SSCAN2 | FMODE_BSCAN2;
> - break;
> + case FB_VMODE_INTERLACED:
> + par->bplcon0 |= BPC0_LACE;
> + break;
> + case FB_VMODE_DOUBLE:
> + if (IS_AGA)
> + par->fmode |= FMODE_SSCAN2 | FMODE_BSCAN2;
> + break;
> }
>
> if (!((par->vmode ^ var->vmode) & FB_VMODE_YWRAP)) {
> par->xoffset = var->xoffset;
> par->yoffset = var->yoffset;
> if (par->vmode & FB_VMODE_YWRAP) {
> - if (par->xoffset || par->yoffset < 0 || par->yoffset >= par->vyres)
> + if (par->xoffset || par->yoffset < 0 ||
> + par->yoffset >= par->vyres)
> par->xoffset = par->yoffset = 0;
> } else {
> - if (par->xoffset < 0 || par->xoffset > upx(16<<maxfmode, par->vxres-par->xres) ||
> - par->yoffset < 0 || par->yoffset > par->vyres-par->yres)
> + if (par->xoffset < 0 ||
> + par->xoffset > upx(16 << maxfmode, par->vxres - par->xres) ||
> + par->yoffset < 0 || par->yoffset > par->vyres - par->yres)
> par->xoffset = par->yoffset = 0;
> }
> } else
> @@ -2919,7 +2936,7 @@ static int ami_decode_var(struct fb_var_screeninfo *var,
> */
>
> static int ami_encode_var(struct fb_var_screeninfo *var,
> - struct amifb_par *par)
> + struct amifb_par *par)
> {
> u_short clk_shift, line_shift;
>
> @@ -2942,7 +2959,7 @@ static int ami_encode_var(struct fb_var_screeninfo *var,
> var->red.msb_right = 0;
> var->red.length = par->bpp;
> if (par->bplcon0 & BPC0_HAM)
> - var->red.length -= 2;
> + var->red.length -= 2;
> var->blue = var->green = var->red;
> var->transp.offset = 0;
> var->transp.length = 0;
> @@ -2967,10 +2984,10 @@ static int ami_encode_var(struct fb_var_screeninfo *var,
> var->vmode = FB_VMODE_NONINTERLACED;
>
> if (!IS_OCS && par->beamcon0 & BMC0_VARBEAMEN) {
> - var->hsync_len = (par->hsstop-par->hsstrt)>>clk_shift;
> + var->hsync_len = (par->hsstop - par->hsstrt)>>clk_shift;
> var->right_margin = par->hsstrt>>clk_shift;
> var->left_margin = (par->htotal>>clk_shift) - var->xres - var->right_margin - var->hsync_len;
> - var->vsync_len = (par->vsstop-par->vsstrt)>>line_shift;
> + var->vsync_len = (par->vsstop - par->vsstrt)>>line_shift;
> var->lower_margin = par->vsstrt>>line_shift;
> var->upper_margin = (par->vtotal>>line_shift) - var->yres - var->lower_margin - var->vsync_len;
> var->sync = 0;
> @@ -2988,7 +3005,7 @@ static int ami_encode_var(struct fb_var_screeninfo *var,
> var->vsync_len = 4>>line_shift;
> var->lower_margin = ((par->vtotal - par->diwstop_v)>>line_shift) + var->vsync_len;
> var->upper_margin = (((par->vtotal - 2)>>line_shift) + 1) - var->yres -
> - var->lower_margin - var->vsync_len;
> + var->lower_margin - var->vsync_len;
> }
>
> if (par->bplcon0 & BPC0_ERSY)
> @@ -3035,14 +3052,14 @@ static int ami_update_par(void)
> clk_shift = par->clk_shift;
>
> if (!(par->vmode & FB_VMODE_SMOOTH_XPAN))
> - par->xoffset = upx(16<<maxfmode, par->xoffset);
> + par->xoffset = upx(16 << maxfmode, par->xoffset);
>
> - fconst = 16<<maxfmode<<clk_shift;
> - vshift = modx(16<<maxfmode, par->xoffset);
> - fstrt = par->diwstrt_h - (vshift<<clk_shift) - 4;
> - fsize = (par->xres+vshift)<<clk_shift;
> + fconst = 16 << maxfmode << clk_shift;
> + vshift = modx(16 << maxfmode, par->xoffset);
> + fstrt = par->diwstrt_h - (vshift << clk_shift) - 4;
> + fsize = (par->xres + vshift) << clk_shift;
> shift = modx(fconst, fstrt);
> - move = downx(2<<maxfmode, div8(par->xoffset));
> + move = downx(2 << maxfmode, div8(par->xoffset));
> if (maxfmode + clk_shift > 1) {
> fstrt = downx(fconst, fstrt) - 64;
> fsize = upx(fconst, fsize);
> @@ -3056,7 +3073,7 @@ static int ami_update_par(void)
> fstop += min_fstrt - fstrt;
> fstrt = min_fstrt;
> }
> - move = move - div8((mod-fstrt)>>clk_shift);
> + move = move - div8((mod - fstrt)>>clk_shift);
> }
> mod = par->next_line - div8(fsize>>clk_shift);
> par->ddfstrt = fstrt;
> @@ -3071,11 +3088,14 @@ static int ami_update_par(void)
> par->bpl1mod = par->bpl2mod;
>
> if (par->yoffset) {
> - par->bplpt0 = fb_info.fix.smem_start + par->next_line*par->yoffset + move;
> + par->bplpt0 = fb_info.fix.smem_start +
> + par->next_line * par->yoffset + move;
> if (par->vmode & FB_VMODE_YWRAP) {
> - if (par->yoffset > par->vyres-par->yres) {
> + if (par->yoffset > par->vyres - par->yres) {
> par->bplpt0wrap = fb_info.fix.smem_start + move;
> - if (par->bplcon0 & BPC0_LACE && mod2(par->diwstrt_v+par->vyres-par->yoffset))
> + if (par->bplcon0 & BPC0_LACE &&
> + mod2(par->diwstrt_v + par->vyres -
> + par->yoffset))
> par->bplpt0wrap += par->next_line;
> }
> }
> @@ -3096,7 +3116,7 @@ static int ami_update_par(void)
> */
>
> static int amifb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
> - u_int transp, struct fb_info *info)
> + u_int transp, struct fb_info *info)
> {
> if (IS_AGA) {
> if (regno > 255)
> @@ -3130,10 +3150,13 @@ static int amifb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
> if (IS_AGA) {
> u_short bplcon3 = currentpar.bplcon3;
> VBlankOff();
> - custom.bplcon3 = bplcon3 | (regno<<8 & 0xe000);
> - custom.color[regno&31] = rgb2hw8_high(red, green, blue);
> - custom.bplcon3 = bplcon3 | (regno<<8 & 0xe000) | BPC3_LOCT;
> - custom.color[regno&31] = rgb2hw8_low(red, green, blue);
> + custom.bplcon3 = bplcon3 | (regno << 8 & 0xe000);
> + custom.color[regno & 31] = rgb2hw8_high(red, green,
> + blue);
> + custom.bplcon3 = bplcon3 | (regno << 8 & 0xe000) |
> + BPC3_LOCT;
> + custom.color[regno & 31] = rgb2hw8_low(red, green,
> + blue);
> custom.bplcon3 = bplcon3;
> VBlankOn();
> } else
> @@ -3146,11 +3169,11 @@ static int amifb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
> mask = 0x3333;
> color = rgb2hw2(red, green, blue);
> VBlankOff();
> - for (i = regno+12; i >= (int)regno; i -= 4)
> + for (i = regno + 12; i >= (int)regno; i -= 4)
> custom.color[i] = ecs_palette[i] = (ecs_palette[i] & mask) | color;
> - mask <<=2; color >>= 2;
> - regno = down16(regno)+mul4(mod4(regno));
> - for (i = regno+3; i >= (int)regno; i--)
> + mask <<= 2; color >>= 2;
> + regno = down16(regno) + mul4(mod4(regno));
> + for (i = regno + 3; i >= (int)regno; i--)
> custom.color[i] = ecs_palette[i] = (ecs_palette[i] & mask) | color;
> VBlankOn();
> } else
> @@ -3243,30 +3266,30 @@ static void ami_do_blank(void)
> red = green = blue = 0;
> if (!IS_OCS && do_blank > 1) {
> switch (do_blank) {
> - case FB_BLANK_VSYNC_SUSPEND:
> - custom.hsstrt = hsstrt2hw(par->hsstrt);
> - custom.hsstop = hsstop2hw(par->hsstop);
> - custom.vsstrt = vsstrt2hw(par->vtotal+4);
> - custom.vsstop = vsstop2hw(par->vtotal+4);
> - break;
> - case FB_BLANK_HSYNC_SUSPEND:
> - custom.hsstrt = hsstrt2hw(par->htotal+16);
> - custom.hsstop = hsstop2hw(par->htotal+16);
> - custom.vsstrt = vsstrt2hw(par->vsstrt);
> - custom.vsstop = vsstrt2hw(par->vsstop);
> - break;
> - case FB_BLANK_POWERDOWN:
> - custom.hsstrt = hsstrt2hw(par->htotal+16);
> - custom.hsstop = hsstop2hw(par->htotal+16);
> - custom.vsstrt = vsstrt2hw(par->vtotal+4);
> - custom.vsstop = vsstop2hw(par->vtotal+4);
> - break;
> + case FB_BLANK_VSYNC_SUSPEND:
> + custom.hsstrt = hsstrt2hw(par->hsstrt);
> + custom.hsstop = hsstop2hw(par->hsstop);
> + custom.vsstrt = vsstrt2hw(par->vtotal + 4);
> + custom.vsstop = vsstop2hw(par->vtotal + 4);
> + break;
> + case FB_BLANK_HSYNC_SUSPEND:
> + custom.hsstrt = hsstrt2hw(par->htotal + 16);
> + custom.hsstop = hsstop2hw(par->htotal + 16);
> + custom.vsstrt = vsstrt2hw(par->vsstrt);
> + custom.vsstop = vsstrt2hw(par->vsstop);
> + break;
> + case FB_BLANK_POWERDOWN:
> + custom.hsstrt = hsstrt2hw(par->htotal + 16);
> + custom.hsstop = hsstop2hw(par->htotal + 16);
> + custom.vsstrt = vsstrt2hw(par->vtotal + 4);
> + custom.vsstop = vsstop2hw(par->vtotal + 4);
> + break;
> }
> if (!(par->beamcon0 & BMC0_VARBEAMEN)) {
> custom.htotal = htotal2hw(par->htotal);
> custom.vtotal = vtotal2hw(par->vtotal);
> custom.beamcon0 = BMC0_HARDDIS | BMC0_VARBEAMEN |
> - BMC0_VARVSYEN | BMC0_VARHSYEN | BMC0_VARCSYEN;
> + BMC0_VARVSYEN | BMC0_VARHSYEN | BMC0_VARCSYEN;
> }
> }
> } else {
> @@ -3300,7 +3323,7 @@ static void ami_do_blank(void)
> color = rgb2hw2(red, green, blue);
> for (i = 12; i >= 0; i -= 4)
> custom.color[i] = ecs_palette[i] = (ecs_palette[i] & mask) | color;
> - mask <<=2; color >>= 2;
> + mask <<= 2; color >>= 2;
> for (i = 3; i >= 0; i--)
> custom.color[i] = ecs_palette[i] = (ecs_palette[i] & mask) | color;
> } else
> @@ -3334,32 +3357,32 @@ static int ami_get_var_cursorinfo(struct fb_var_cursorinfo *var, u_char __user *
> short height, width, bits, words;
> int size, alloc;
>
> - size = par->crsr.height*par->crsr.width;
> - alloc = var->height*var->width;
> + size = par->crsr.height * par->crsr.width;
> + alloc = var->height * var->width;
> var->height = par->crsr.height;
> var->width = par->crsr.width;
> var->xspot = par->crsr.spot_x;
> var->yspot = par->crsr.spot_y;
> - if (size > var->height*var->width)
> + if (size > var->height * var->width)
> return -ENAMETOOLONG;
> if (!access_ok(VERIFY_WRITE, data, size))
> return -EFAULT;
> - delta = 1<<par->crsr.fmode;
> - lspr = lofsprite + (delta<<1);
> + delta = 1 << par->crsr.fmode;
> + lspr = lofsprite + (delta << 1);
> if (par->bplcon0 & BPC0_LACE)
> - sspr = shfsprite + (delta<<1);
> + sspr = shfsprite + (delta << 1);
> else
> sspr = NULL;
> - for (height = (short)var->height-1; height >= 0; height--) {
> + for (height = (short)var->height - 1; height >= 0; height--) {
> bits = 0; words = delta; datawords = 0;
> - for (width = (short)var->width-1; width >= 0; width--) {
> + for (width = (short)var->width - 1; width >= 0; width--) {
> if (bits == 0) {
> bits = 16; --words;
> #ifdef __mc68000__
> asm volatile ("movew %1@(%3:w:2),%0 ; swap %0 ; movew %1@+,%0"
> : "=d" (datawords), "=a" (lspr) : "1" (lspr), "d" (delta));
> #else
> - datawords = (*(lspr+delta) << 16) | (*lspr++);
> + datawords = (*(lspr + delta) << 16) | (*lspr++);
> #endif
> }
> --bits;
> @@ -3422,26 +3445,26 @@ static int ami_set_var_cursorinfo(struct fb_var_cursorinfo *var, u_char __user *
> return -EINVAL;
> if (!var->height)
> return -EINVAL;
> - if (!access_ok(VERIFY_READ, data, var->width*var->height))
> + if (!access_ok(VERIFY_READ, data, var->width * var->height))
> return -EFAULT;
> - delta = 1<<fmode;
> + delta = 1 << fmode;
> lofsprite = shfsprite = (u_short *)spritememory;
> - lspr = lofsprite + (delta<<1);
> + lspr = lofsprite + (delta << 1);
> if (par->bplcon0 & BPC0_LACE) {
> - if (((var->height+4)<<fmode<<2) > SPRITEMEMSIZE)
> + if (((var->height + 4) << fmode << 2) > SPRITEMEMSIZE)
> return -EINVAL;
> - memset(lspr, 0, (var->height+4)<<fmode<<2);
> - shfsprite += ((var->height+5)&-2)<<fmode;
> - sspr = shfsprite + (delta<<1);
> + memset(lspr, 0, (var->height + 4) << fmode << 2);
> + shfsprite += ((var->height + 5)&-2) << fmode;
> + sspr = shfsprite + (delta << 1);
> } else {
> - if (((var->height+2)<<fmode<<2) > SPRITEMEMSIZE)
> + if (((var->height + 2) << fmode << 2) > SPRITEMEMSIZE)
> return -EINVAL;
> - memset(lspr, 0, (var->height+2)<<fmode<<2);
> + memset(lspr, 0, (var->height + 2) << fmode << 2);
> sspr = NULL;
> }
> - for (height = (short)var->height-1; height >= 0; height--) {
> + for (height = (short)var->height - 1; height >= 0; height--) {
> bits = 16; words = delta; datawords = 0;
> - for (width = (short)var->width-1; width >= 0; width--) {
> + for (width = (short)var->width - 1; width >= 0; width--) {
> unsigned long tdata = 0;
> get_user(tdata, data);
> data++;
> @@ -3454,7 +3477,7 @@ static int ami_set_var_cursorinfo(struct fb_var_cursorinfo *var, u_char __user *
> #else
> datawords = ((datawords << 1) & 0xfffefffe);
> datawords |= tdata & 1;
> - datawords |= (tdata & 2) << (16-1);
> + datawords |= (tdata & 2) << (16 - 1);
> #endif
> if (--bits == 0) {
> bits = 16; --words;
> @@ -3462,7 +3485,7 @@ static int ami_set_var_cursorinfo(struct fb_var_cursorinfo *var, u_char __user *
> asm volatile ("swap %2 ; movew %2,%0@(%3:w:2) ; swap %2 ; movew %2,%0@+"
> : "=a" (lspr) : "0" (lspr), "d" (datawords), "d" (delta));
> #else
> - *(lspr+delta) = (u_short) (datawords >> 16);
> + *(lspr + delta) = (u_short) (datawords >> 16);
> *lspr++ = (u_short) (datawords & 0xffff);
> #endif
> }
> @@ -3475,7 +3498,7 @@ static int ami_set_var_cursorinfo(struct fb_var_cursorinfo *var, u_char __user *
> "swap %2 ; lslw %4,%2 ; movew %2,%0@+"
> : "=a" (lspr) : "0" (lspr), "d" (datawords), "d" (delta), "d" (bits));
> #else
> - *(lspr+delta) = (u_short) (datawords >> (16+bits));
> + *(lspr + delta) = (u_short) (datawords >> (16 + bits));
> *lspr++ = (u_short) ((datawords & 0x0000ffff) >> bits);
> #endif
> }
> @@ -3484,7 +3507,7 @@ static int ami_set_var_cursorinfo(struct fb_var_cursorinfo *var, u_char __user *
> asm volatile ("moveql #0,%%d0 ; movew %%d0,%0@(%2:w:2) ; movew %%d0,%0@+"
> : "=a" (lspr) : "0" (lspr), "d" (delta) : "d0");
> #else
> - *(lspr+delta) = 0;
> + *(lspr + delta) = 0;
> *lspr++ = 0;
> #endif
> }
> @@ -3546,8 +3569,8 @@ static void ami_set_sprite(void)
> cops = copdisplay.list[currentcop][0];
> copl = copdisplay.list[currentcop][1];
> ps = pl = ZTWO_PADDR(dummysprite);
> - mx = par->crsr.crsr_x-par->crsr.spot_x;
> - my = par->crsr.crsr_y-par->crsr.spot_y;
> + mx = par->crsr.crsr_x - par->crsr.spot_x;
> + my = par->crsr.crsr_y - par->crsr.spot_y;
> if (!(par->vmode & FB_VMODE_YWRAP)) {
> mx -= par->xoffset;
> my -= par->yoffset;
> @@ -3556,24 +3579,24 @@ static void ami_set_sprite(void)
> mx > -(short)par->crsr.width && mx < par->xres &&
> my > -(short)par->crsr.height && my < par->yres) {
> pl = ZTWO_PADDR(lofsprite);
> - hs = par->diwstrt_h + (mx<<par->clk_shift) - 4;
> - vs = par->diwstrt_v + (my<<par->line_shift);
> - ve = vs + (par->crsr.height<<par->line_shift);
> + hs = par->diwstrt_h + (mx << par->clk_shift) - 4;
> + vs = par->diwstrt_v + (my << par->line_shift);
> + ve = vs + (par->crsr.height << par->line_shift);
> if (par->bplcon0 & BPC0_LACE) {
> ps = ZTWO_PADDR(shfsprite);
> lofsprite[0] = spr2hw_pos(vs, hs);
> - shfsprite[0] = spr2hw_pos(vs+1, hs);
> + shfsprite[0] = spr2hw_pos(vs + 1, hs);
> if (mod2(vs)) {
> - lofsprite[1<<par->crsr.fmode] = spr2hw_ctl(vs, hs, ve);
> - shfsprite[1<<par->crsr.fmode] = spr2hw_ctl(vs+1, hs, ve+1);
> + lofsprite[1 << par->crsr.fmode] = spr2hw_ctl(vs, hs, ve);
> + shfsprite[1 << par->crsr.fmode] = spr2hw_ctl(vs + 1, hs, ve + 1);
> pt = pl; pl = ps; ps = pt;
> } else {
> - lofsprite[1<<par->crsr.fmode] = spr2hw_ctl(vs, hs, ve+1);
> - shfsprite[1<<par->crsr.fmode] = spr2hw_ctl(vs+1, hs, ve);
> + lofsprite[1 << par->crsr.fmode] = spr2hw_ctl(vs, hs, ve + 1);
> + shfsprite[1 << par->crsr.fmode] = spr2hw_ctl(vs + 1, hs, ve);
> }
> } else {
> lofsprite[0] = spr2hw_pos(vs, hs) | (IS_AGA && (par->fmode & FMODE_BSCAN2) ? 0x80 : 0);
> - lofsprite[1<<par->crsr.fmode] = spr2hw_ctl(vs, hs, ve);
> + lofsprite[1 << par->crsr.fmode] = spr2hw_ctl(vs, hs, ve);
> }
> }
> copl[cop_spr0ptrh].w[1] = highw(pl);
> @@ -3624,7 +3647,7 @@ static void ami_reinit_copper(void)
> struct amifb_par *par = ¤tpar;
>
> copdisplay.init[cip_bplcon0].w[1] = ~(BPC0_BPU3 | BPC0_BPU2 | BPC0_BPU1 | BPC0_BPU0) & par->bplcon0;
> - copdisplay.wait->l = CWAIT(32, par->diwstrt_v-4);
> + copdisplay.wait->l = CWAIT(32, par->diwstrt_v - 4);
> }
>
> /*
> @@ -3654,20 +3677,20 @@ static void ami_build_copper(void)
> (cops++)->l = CMOVE(0, sprpt[0]);
> (cops++)->l = CMOVE2(0, sprpt[0]);
>
> - (copl++)->l = CMOVE(diwstrt2hw(par->diwstrt_h, par->diwstrt_v+1), diwstrt);
> - (copl++)->l = CMOVE(diwstop2hw(par->diwstop_h, par->diwstop_v+1), diwstop);
> + (copl++)->l = CMOVE(diwstrt2hw(par->diwstrt_h, par->diwstrt_v + 1), diwstrt);
> + (copl++)->l = CMOVE(diwstop2hw(par->diwstop_h, par->diwstop_v + 1), diwstop);
> (cops++)->l = CMOVE(diwstrt2hw(par->diwstrt_h, par->diwstrt_v), diwstrt);
> (cops++)->l = CMOVE(diwstop2hw(par->diwstop_h, par->diwstop_v), diwstop);
> if (!IS_OCS) {
> - (copl++)->l = CMOVE(diwhigh2hw(par->diwstrt_h, par->diwstrt_v+1,
> - par->diwstop_h, par->diwstop_v+1), diwhigh);
> + (copl++)->l = CMOVE(diwhigh2hw(par->diwstrt_h, par->diwstrt_v + 1,
> + par->diwstop_h, par->diwstop_v + 1), diwhigh);
> (cops++)->l = CMOVE(diwhigh2hw(par->diwstrt_h, par->diwstrt_v,
> - par->diwstop_h, par->diwstop_v), diwhigh);
> + par->diwstop_h, par->diwstop_v), diwhigh);
> #if 0
> if (par->beamcon0 & BMC0_VARBEAMEN) {
> (copl++)->l = CMOVE(vtotal2hw(par->vtotal), vtotal);
> - (copl++)->l = CMOVE(vbstrt2hw(par->vbstrt+1), vbstrt);
> - (copl++)->l = CMOVE(vbstop2hw(par->vbstop+1), vbstop);
> + (copl++)->l = CMOVE(vbstrt2hw(par->vbstrt + 1), vbstrt);
> + (copl++)->l = CMOVE(vbstop2hw(par->vbstop + 1), vbstop);
> (cops++)->l = CMOVE(vtotal2hw(par->vtotal), vtotal);
> (cops++)->l = CMOVE(vbstrt2hw(par->vbstrt), vbstrt);
> (cops++)->l = CMOVE(vbstop2hw(par->vbstop), vbstop);
> @@ -3686,7 +3709,7 @@ static void ami_build_copper(void)
> (copl++)->l = CMOVE(diwstop2hw(par->diwstop_h, par->diwstop_v), diwstop);
> if (!IS_OCS) {
> (copl++)->l = CMOVE(diwhigh2hw(par->diwstrt_h, par->diwstrt_v,
> - par->diwstop_h, par->diwstop_v), diwhigh);
> + par->diwstop_h, par->diwstop_v), diwhigh);
> #if 0
> if (par->beamcon0 & BMC0_VARBEAMEN) {
> (copl++)->l = CMOVE(vtotal2hw(par->vtotal), vtotal);
> @@ -3717,23 +3740,23 @@ static void ami_rebuild_copper(void)
> u_long p;
>
> if (IS_AGA && maxfmode + par->clk_shift == 0)
> - h_end1 = par->diwstrt_h-64;
> + h_end1 = par->diwstrt_h - 64;
> else
> - h_end1 = par->htotal-32;
> - h_end2 = par->ddfstop+64;
> + h_end1 = par->htotal - 32;
> + h_end2 = par->ddfstop + 64;
>
> ami_set_sprite();
>
> copl = copdisplay.rebuild[1];
> p = par->bplpt0;
> if (par->vmode & FB_VMODE_YWRAP) {
> - if ((par->vyres-par->yoffset) != 1 || !mod2(par->diwstrt_v)) {
> - if (par->yoffset > par->vyres-par->yres) {
> + if ((par->vyres - par->yoffset) != 1 || !mod2(par->diwstrt_v)) {
> + if (par->yoffset > par->vyres - par->yres) {
> for (i = 0; i < (short)par->bpp; i++, p += par->next_plane) {
> (copl++)->l = CMOVE(highw(p), bplpt[i]);
> (copl++)->l = CMOVE2(loww(p), bplpt[i]);
> }
> - line = par->diwstrt_v + ((par->vyres-par->yoffset)<<par->line_shift) - 1;
> + line = par->diwstrt_v + ((par->vyres - par->yoffset) << par->line_shift) - 1;
> while (line >= 512) {
> (copl++)->l = CWAIT(h_end1, 510);
> line -= 512;
> @@ -3744,7 +3767,8 @@ static void ami_rebuild_copper(void)
> (copl++)->l = CWAIT(h_end2, line);
> p = par->bplpt0wrap;
> }
> - } else p = par->bplpt0wrap;
> + } else
> + p = par->bplpt0wrap;
> }
> for (i = 0; i < (short)par->bpp; i++, p += par->next_plane) {
> (copl++)->l = CMOVE(highw(p), bplpt[i]);
> @@ -3760,13 +3784,13 @@ static void ami_rebuild_copper(void)
> else
> p += par->next_line;
> if (par->vmode & FB_VMODE_YWRAP) {
> - if ((par->vyres-par->yoffset) != 1 || mod2(par->diwstrt_v)) {
> - if (par->yoffset > par->vyres-par->yres+1) {
> + if ((par->vyres - par->yoffset) != 1 || mod2(par->diwstrt_v)) {
> + if (par->yoffset > par->vyres - par->yres + 1) {
> for (i = 0; i < (short)par->bpp; i++, p += par->next_plane) {
> (cops++)->l = CMOVE(highw(p), bplpt[i]);
> (cops++)->l = CMOVE2(loww(p), bplpt[i]);
> }
> - line = par->diwstrt_v + ((par->vyres-par->yoffset)<<par->line_shift) - 2;
> + line = par->diwstrt_v + ((par->vyres - par->yoffset) << par->line_shift) - 2;
> while (line >= 512) {
> (cops++)->l = CWAIT(h_end1, 510);
> line -= 512;
> @@ -3776,12 +3800,14 @@ static void ami_rebuild_copper(void)
> else
> (cops++)->l = CWAIT(h_end2, line);
> p = par->bplpt0wrap;
> - if (mod2(par->diwstrt_v+par->vyres-par->yoffset))
> + if (mod2(par->diwstrt_v + par->vyres -
> + par->yoffset))
> p -= par->next_line;
> else
> p += par->next_line;
> }
> - } else p = par->bplpt0wrap - par->next_line;
> + } else
> + p = par->bplpt0wrap - par->next_line;
> }
> for (i = 0; i < (short)par->bpp; i++, p += par->next_plane) {
> (cops++)->l = CMOVE(highw(p), bplpt[i]);
--
To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
