diff for duplicates of <4EDAC042.7000005@gmx.de> diff --git a/a/1.txt b/N1/1.txt index 359c93a..7e570f3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -179,7 +179,7 @@ On 11/21/2011 08:53 PM, Geert Uytterhoeven wrote: > @@ -326,33 +326,34 @@ > ----------- > -> - a scanline is 64 µs long, of which 52.48 µs are visible. This is about +> - 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 @@ -189,7 +189,7 @@ On 11/21/2011 08:53 PM, Geert Uytterhoeven wrote: > RETMA -> NTSC > ------------- > -> - a scanline is 63.5 µs long, of which 53.5 µs are visible. This is about +> - 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 @@ -1274,7 +1274,7 @@ On 11/21/2011 08:53 PM, Geert Uytterhoeven wrote: > > @@ -2145,17 +2157,17 @@ static void amifb_imageblit(struct fb_info *info, const struct fb_image *image) > -> if (image->depth = 1) { +> 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; @@ -1381,7 +1381,7 @@ On 11/21/2011 08:53 PM, Geert Uytterhoeven wrote: > - maxdepth[TAG_HIRES] = 4; > - maxdepth[TAG_LORES] = 6; > - maxfmode = TAG_FMODE_1; -> - defmode = amiga_vblank = 50 ? DEFMODE_PAL +> - defmode = amiga_vblank == 50 ? DEFMODE_PAL > - : DEFMODE_NTSC; > - fb_info.fix.smem_len = VIDEOMEMSIZE_OCS; > - break; @@ -1390,7 +1390,7 @@ On 11/21/2011 08:53 PM, Geert Uytterhoeven wrote: > + maxdepth[TAG_HIRES] = 4; > + maxdepth[TAG_LORES] = 6; > + maxfmode = TAG_FMODE_1; -> + defmode = amiga_vblank = 50 ? DEFMODE_PAL : DEFMODE_NTSC; +> + defmode = amiga_vblank == 50 ? DEFMODE_PAL : DEFMODE_NTSC; > + fb_info.fix.smem_len = VIDEOMEMSIZE_OCS; > + break; > #endif /* CONFIG_FB_AMIGA_OCS */ @@ -1404,10 +1404,10 @@ On 11/21/2011 08:53 PM, Geert Uytterhoeven wrote: > - maxdepth[TAG_LORES] = 6; > - maxfmode = TAG_FMODE_1; > - if (AMIGAHW_PRESENT(AMBER_FF)) -> - defmode = amiga_vblank = 50 ? DEFMODE_AMBER_PAL +> - defmode = amiga_vblank == 50 ? DEFMODE_AMBER_PAL > - : DEFMODE_AMBER_NTSC; > - else -> - defmode = amiga_vblank = 50 ? DEFMODE_PAL +> - defmode = amiga_vblank == 50 ? DEFMODE_PAL > - : DEFMODE_NTSC; > - if (amiga_chip_avail()-CHIPRAM_SAFETY_LIMIT > > - VIDEOMEMSIZE_ECS_2M) @@ -1423,10 +1423,10 @@ On 11/21/2011 08:53 PM, Geert Uytterhoeven wrote: > + maxdepth[TAG_LORES] = 6; > + maxfmode = TAG_FMODE_1; > + if (AMIGAHW_PRESENT(AMBER_FF)) -> + defmode = amiga_vblank = 50 ? DEFMODE_AMBER_PAL +> + defmode = amiga_vblank == 50 ? DEFMODE_AMBER_PAL > + : DEFMODE_AMBER_NTSC; > + else -> + defmode = amiga_vblank = 50 ? DEFMODE_PAL +> + defmode = amiga_vblank == 50 ? DEFMODE_PAL > + : DEFMODE_NTSC; > + if (amiga_chip_avail() - CHIPRAM_SAFETY_LIMIT > > + VIDEOMEMSIZE_ECS_2M) @@ -1490,7 +1490,7 @@ On 11/21/2011 08:53 PM, Geert Uytterhoeven wrote: > @@ -2360,10 +2370,10 @@ default_chipset: > * These monitor specs are for a typical Amiga monitor (e.g. A1960) > */ -> if (fb_info.monspecs.hfmin = 0) { +> if (fb_info.monspecs.hfmin == 0) { > - fb_info.monspecs.hfmin = 15000; > - fb_info.monspecs.hfmax = 38000; > - fb_info.monspecs.vfmin = 49; @@ -1611,7 +1611,8 @@ On 11/21/2011 08:53 PM, Geert Uytterhoeven wrote: > + 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 + +> + par->vtotal = +> + down2(((var->upper_margin + par->yres + var->lower_margin + > + var->vsync_len) << line_shift) + 1); > > if (IS_AGA) @@ -1684,7 +1685,7 @@ On 11/21/2011 08:53 PM, Geert Uytterhoeven wrote: > + 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) +> 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, > } @@ -1767,12 +1768,12 @@ On 11/21/2011 08:53 PM, Geert Uytterhoeven wrote: > 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) +> 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) +> 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, @@ -2033,7 +2034,7 @@ On 11/21/2011 08:53 PM, Geert Uytterhoeven wrote: > 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) { +> if (bits == 0) { > bits = 16; --words; > #ifdef __mc68000__ > asm volatile ("movew %1@(%3:w:2),%0 ; swap %0 ; movew %1@+,%0" @@ -2089,7 +2090,7 @@ On 11/21/2011 08:53 PM, Geert Uytterhoeven wrote: > - datawords |= (tdata & 2) << (16-1); > + datawords |= (tdata & 2) << (16 - 1); > #endif -> if (--bits = 0) { +> 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@+" @@ -2212,7 +2213,7 @@ On 11/21/2011 08:53 PM, Geert Uytterhoeven wrote: > @@ -3717,23 +3740,23 @@ static void ami_rebuild_copper(void) > u_long p; > -> if (IS_AGA && maxfmode + par->clk_shift = 0) +> if (IS_AGA && maxfmode + par->clk_shift == 0) > - h_end1 = par->diwstrt_h-64; > + h_end1 = par->diwstrt_h - 64; > else diff --git a/a/content_digest b/N1/content_digest index f022838..cc6f794 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -189,7 +189,7 @@ "> @@ -326,33 +326,34 @@\n" "> -----------\n" "> \n" - "> - a scanline is 64 \302\265s long, of which 52.48 \302\265s are visible. This is about\n" + "> - a scanline is 64 \303\202\302\265s long, of which 52.48 \303\202\302\265s are visible. This is about\n" "> - 736 visible 70 ns pixels per line.\n" "> +\t736 visible 70 ns pixels per line.\n" "> - we have 625 scanlines, of which 575 are visible (interlaced); after\n" @@ -199,7 +199,7 @@ "> RETMA -> NTSC\n" "> -------------\n" "> \n" - "> - a scanline is 63.5 \302\265s long, of which 53.5 \302\265s are visible. This is about\n" + "> - a scanline is 63.5 \303\202\302\265s long, of which 53.5 \303\202\302\265s are visible. This is about\n" "> - 736 visible 70 ns pixels per line.\n" "> +\t736 visible 70 ns pixels per line.\n" "> - we have 525 scanlines, of which 485 are visible (interlaced); after\n" @@ -1284,7 +1284,7 @@ "> \n" "> @@ -2145,17 +2157,17 @@ static void amifb_imageblit(struct fb_info *info, const struct fb_image *image)\n" "> \n" - "> \tif (image->depth = 1) {\n" + "> \tif (image->depth == 1) {\n" "> \t\tdst = (unsigned long *)\n" "> -\t\t\t((unsigned long)info->screen_base & ~(BYTES_PER_LONG-1));\n" "> -\t\tdst_idx = ((unsigned long)info->screen_base & (BYTES_PER_LONG-1))*8;\n" @@ -1391,7 +1391,7 @@ "> -\t\t\tmaxdepth[TAG_HIRES] = 4;\n" "> -\t\t\tmaxdepth[TAG_LORES] = 6;\n" "> -\t\t\tmaxfmode = TAG_FMODE_1;\n" - "> -\t\t\tdefmode = amiga_vblank = 50 ? DEFMODE_PAL\n" + "> -\t\t\tdefmode = amiga_vblank == 50 ? DEFMODE_PAL\n" "> -\t\t\t\t\t\t : DEFMODE_NTSC;\n" "> -\t\t\tfb_info.fix.smem_len = VIDEOMEMSIZE_OCS;\n" "> -\t\t\tbreak;\n" @@ -1400,7 +1400,7 @@ "> +\t\tmaxdepth[TAG_HIRES] = 4;\n" "> +\t\tmaxdepth[TAG_LORES] = 6;\n" "> +\t\tmaxfmode = TAG_FMODE_1;\n" - "> +\t\tdefmode = amiga_vblank = 50 ? DEFMODE_PAL : DEFMODE_NTSC;\n" + "> +\t\tdefmode = amiga_vblank == 50 ? DEFMODE_PAL : DEFMODE_NTSC;\n" "> +\t\tfb_info.fix.smem_len = VIDEOMEMSIZE_OCS;\n" "> +\t\tbreak;\n" "> #endif /* CONFIG_FB_AMIGA_OCS */\n" @@ -1414,10 +1414,10 @@ "> -\t\t\tmaxdepth[TAG_LORES] = 6;\n" "> -\t\t\tmaxfmode = TAG_FMODE_1;\n" "> -\t\t\tif (AMIGAHW_PRESENT(AMBER_FF))\n" - "> -\t\t\t defmode = amiga_vblank = 50 ? DEFMODE_AMBER_PAL\n" + "> -\t\t\t defmode = amiga_vblank == 50 ? DEFMODE_AMBER_PAL\n" "> -\t\t\t\t\t\t\t : DEFMODE_AMBER_NTSC;\n" "> -\t\t\telse\n" - "> -\t\t\t defmode = amiga_vblank = 50 ? DEFMODE_PAL\n" + "> -\t\t\t defmode = amiga_vblank == 50 ? DEFMODE_PAL\n" "> -\t\t\t\t\t\t\t : DEFMODE_NTSC;\n" "> -\t\t\tif (amiga_chip_avail()-CHIPRAM_SAFETY_LIMIT >\n" "> -\t\t\t VIDEOMEMSIZE_ECS_2M)\n" @@ -1433,10 +1433,10 @@ "> +\t\tmaxdepth[TAG_LORES] = 6;\n" "> +\t\tmaxfmode = TAG_FMODE_1;\n" "> +\t\tif (AMIGAHW_PRESENT(AMBER_FF))\n" - "> +\t\t\tdefmode = amiga_vblank = 50 ? DEFMODE_AMBER_PAL\n" + "> +\t\t\tdefmode = amiga_vblank == 50 ? DEFMODE_AMBER_PAL\n" "> +\t\t\t\t\t\t : DEFMODE_AMBER_NTSC;\n" "> +\t\telse\n" - "> +\t\t\tdefmode = amiga_vblank = 50 ? DEFMODE_PAL\n" + "> +\t\t\tdefmode = amiga_vblank == 50 ? DEFMODE_PAL\n" "> +\t\t\t\t\t\t : DEFMODE_NTSC;\n" "> +\t\tif (amiga_chip_avail() - CHIPRAM_SAFETY_LIMIT >\n" "> +\t\t VIDEOMEMSIZE_ECS_2M)\n" @@ -1500,7 +1500,7 @@ "> @@ -2360,10 +2370,10 @@ default_chipset:\n" "> \t * These monitor specs are for a typical Amiga monitor (e.g. A1960)\n" "> \t */\n" - "> \tif (fb_info.monspecs.hfmin = 0) {\n" + "> \tif (fb_info.monspecs.hfmin == 0) {\n" "> -\t fb_info.monspecs.hfmin = 15000;\n" "> -\t fb_info.monspecs.hfmax = 38000;\n" "> -\t fb_info.monspecs.vfmin = 49;\n" @@ -1621,7 +1621,8 @@ "> +\tyres_n = par->yres << line_shift;\n" "> +\tpar->htotal = down8((var->left_margin + par->xres + var->right_margin +\n" "> +\t\t\t var->hsync_len) << clk_shift);\n" - "> +\tpar->vtotal > +\t\tdown2(((var->upper_margin + par->yres + var->lower_margin +\n" + "> +\tpar->vtotal =\n" + "> +\t\tdown2(((var->upper_margin + par->yres + var->lower_margin +\n" "> +\t\t\tvar->vsync_len) << line_shift) + 1);\n" "> \n" "> \tif (IS_AGA)\n" @@ -1694,7 +1695,7 @@ "> +\t\tpar->vsstrt = var->lower_margin << line_shift;\n" "> +\t\tpar->vsstop = (var->lower_margin + var->vsync_len) << line_shift;\n" "> \t\tpar->diwstop_v = par->vtotal;\n" - "> \t\tif ((par->vmode & FB_VMODE_MASK) = FB_VMODE_INTERLACED)\n" + "> \t\tif ((par->vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED)\n" "> \t\t\tpar->diwstop_v -= 2;\n" "> @@ -2766,8 +2779,8 @@ static int ami_decode_var(struct fb_var_screeninfo *var,\n" "> \t\t}\n" @@ -1777,12 +1778,12 @@ "> \t\t\tDPRINTK(\"too few video mem\\n\");\n" "> \t\t\treturn -EINVAL;\n" "> @@ -2873,7 +2888,7 @@ static int ami_decode_var(struct fb_var_screeninfo *var,\n" - "> \tif (par->bpp = 8)\n" + "> \tif (par->bpp == 8)\n" "> \t\tpar->bplcon0 |= BPC0_BPU3;\n" "> \telse\n" "> -\t\tpar->bplcon0 |= par->bpp<<12;\n" "> +\t\tpar->bplcon0 |= par->bpp << 12;\n" - "> \tif (var->nonstd = FB_NONSTD_HAM)\n" + "> \tif (var->nonstd == FB_NONSTD_HAM)\n" "> \t\tpar->bplcon0 |= BPC0_HAM;\n" "> \tif (var->sync & FB_SYNC_EXT)\n" "> @@ -2883,24 +2898,26 @@ static int ami_decode_var(struct fb_var_screeninfo *var,\n" @@ -2043,7 +2044,7 @@ "> \t\tbits = 0; words = delta; datawords = 0;\n" "> -\t\tfor (width = (short)var->width-1; width >= 0; width--) {\n" "> +\t\tfor (width = (short)var->width - 1; width >= 0; width--) {\n" - "> \t\t\tif (bits = 0) {\n" + "> \t\t\tif (bits == 0) {\n" "> \t\t\t\tbits = 16; --words;\n" "> #ifdef __mc68000__\n" "> \t\t\t\tasm volatile (\"movew %1@(%3:w:2),%0 ; swap %0 ; movew %1@+,%0\"\n" @@ -2099,7 +2100,7 @@ "> -\t\t\tdatawords |= (tdata & 2) << (16-1);\n" "> +\t\t\tdatawords |= (tdata & 2) << (16 - 1);\n" "> #endif\n" - "> \t\t\tif (--bits = 0) {\n" + "> \t\t\tif (--bits == 0) {\n" "> \t\t\t\tbits = 16; --words;\n" "> @@ -3462,7 +3485,7 @@ static int ami_set_var_cursorinfo(struct fb_var_cursorinfo *var, u_char __user *\n" "> \t\t\t\tasm volatile (\"swap %2 ; movew %2,%0@(%3:w:2) ; swap %2 ; movew %2,%0@+\"\n" @@ -2222,7 +2223,7 @@ "> @@ -3717,23 +3740,23 @@ static void ami_rebuild_copper(void)\n" "> \tu_long p;\n" "> \n" - "> \tif (IS_AGA && maxfmode + par->clk_shift = 0)\n" + "> \tif (IS_AGA && maxfmode + par->clk_shift == 0)\n" "> -\t\th_end1 = par->diwstrt_h-64;\n" "> +\t\th_end1 = par->diwstrt_h - 64;\n" "> \telse\n" @@ -2294,4 +2295,4 @@ "> \t\tfor (i = 0; i < (short)par->bpp; i++, p += par->next_plane) {\n" "> \t\t\t(cops++)->l = CMOVE(highw(p), bplpt[i]);" -7435ac6e196792d028796329dc004115eb6b452ad9a15d21162b41e543834765 +2f1ed69189af0e0d74dde5c059e264bb999da9022c66b169750689c32dacea16
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.