diff for duplicates of <4869DC13.30604@renesas.com> diff --git a/a/1.txt b/N1/1.txt index 2e06b4d..6bf64c8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -20,8 +20,7 @@ index 0000000..b8bf844 +++ b/Documentation/fb/sh7760fb.txt @@ -0,0 +1,129 @@ +SH7760 integrated LCDC Framebuffer driver -+========================================= -+ ++====================+ +0. Overwiew +----------- +The SH7760/SH7763 have an integrated LCD Display controller (LCDC) which @@ -72,7 +71,7 @@ index 0000000..b8bf844 +The following code illustrates what needs to be done to +get the framebuffer working on a 640x480 TFT: + -+====================== cut here ====================================== ++=========== cut here =================== + +#include <linux/fb.h> +#include <asm/sh7760fb.h> @@ -147,7 +146,7 @@ index 0000000..b8bf844 + .num_resources = ARRAY_SIZE(sh7760_lcdc_res), +}; + -+====================== cut here ====================================== ++=========== cut here =================== diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 002b61b..f79634d 100644 --- a/drivers/video/Kconfig @@ -268,7 +267,7 @@ index 0000000..6bc4cb9 + unsigned short cntr = ioread16(par->base + LDCNTR); + int lps, ret; + -+ if (blank == FB_BLANK_UNBLANK) { ++ if (blank = FB_BLANK_UNBLANK) { + cntr = LDCNTR_DON2 | LDCNTR_DON; + lps = 3; + } else { @@ -405,7 +404,7 @@ index 0000000..6bc4cb9 + + var->bits_per_pixel = bpp; + -+ if ((var->grayscale) && (var->bits_per_pixel == 1)) ++ if ((var->grayscale) && (var->bits_per_pixel = 1)) + fix->visual = FB_VISUAL_MONO10; + else if (var->bits_per_pixel >= 15) + fix->visual = FB_VISUAL_TRUECOLOR; @@ -500,13 +499,13 @@ index 0000000..6bc4cb9 + if (!gray) + stride *= (bpp + 7) >> 3; + else { -+ if (bpp == 1) ++ if (bpp = 1) + stride >>= 3; -+ else if (bpp == 2) ++ else if (bpp = 2) + stride >>= 2; -+ else if (bpp == 4) ++ else if (bpp = 4) + stride >>= 1; -+ /* 6 bpp == 8 bpp */ ++ /* 6 bpp = 8 bpp */ + } + + /* if rotated, stride must be power of 2 */ @@ -622,11 +621,11 @@ index 0000000..6bc4cb9 + + vram = info->var.xres * info->var.yres; + if (info->var.grayscale) { -+ if (bpp == 1) ++ if (bpp = 1) + vram >>= 3; -+ else if (bpp == 2) ++ else if (bpp = 2) + vram >>= 2; -+ else if (bpp == 4) ++ else if (bpp = 4) + vram >>= 1; + } else if (bpp > 8) + vram *= 2; @@ -638,8 +637,7 @@ index 0000000..6bc4cb9 + if (vram < PAGE_SIZE) + vram = PAGE_SIZE; + -+ fbmem = -+ dma_alloc_coherent(info->dev, vram, &par->fbdma, GFP_KERNEL); ++ fbmem + dma_alloc_coherent(info->dev, vram, &par->fbdma, GFP_KERNEL); + + if (!fbmem) + return -ENOMEM; @@ -667,7 +665,7 @@ index 0000000..6bc4cb9 + + /* Get base addr */ + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -+ if (unlikely(res == NULL)) { ++ if (unlikely(res = NULL)) { + dev_err(&pdev->dev, "invalid resource\n"); + return -EINVAL; + } @@ -1013,10 +1011,3 @@ index 0000000..305a26b +#endif /* _ASM_SH_SH7760FB_H */ -- 1.5.5.1 - - -------------------------------------------------------------------------- -Check out the new SourceForge.net Marketplace. -It's the best place to buy or sell services for -just about anything Open Source. -http://sourceforge.net/services/buy/index.php diff --git a/a/content_digest b/N1/content_digest index dda6e56..ae1792b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>\0" "Subject\0[PATCH v3] video: sh7760fb: SH7760/SH7763 LCDC framebuffer driver\0" - "Date\0Tue, 01 Jul 2008 16:26:11 +0900\0" + "Date\0Tue, 01 Jul 2008 07:26:11 +0000\0" "To\0linuc-fbdev <Linux-fbdev-devel@lists.sourceforge.net>\0" "Cc\0Paul Mundt <lethal@linux-sh.org>" " Linux-sh <linux-sh@vger.kernel.org>\0" @@ -28,8 +28,7 @@ "+++ b/Documentation/fb/sh7760fb.txt\n" "@@ -0,0 +1,129 @@\n" "+SH7760 integrated LCDC Framebuffer driver\n" - "+=========================================\n" - "+\n" + "+====================+\n" "+0. Overwiew\n" "+-----------\n" "+The SH7760/SH7763 have an integrated LCD Display controller (LCDC) which\n" @@ -80,7 +79,7 @@ "+The following code illustrates what needs to be done to\n" "+get the framebuffer working on a 640x480 TFT:\n" "+\n" - "+====================== cut here ======================================\n" + "+=========== cut here ===================\n" "+\n" "+#include <linux/fb.h>\n" "+#include <asm/sh7760fb.h>\n" @@ -155,7 +154,7 @@ "+\t.num_resources\t= ARRAY_SIZE(sh7760_lcdc_res),\n" "+};\n" "+\n" - "+====================== cut here ======================================\n" + "+=========== cut here ===================\n" "diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig\n" "index 002b61b..f79634d 100644\n" "--- a/drivers/video/Kconfig\n" @@ -276,7 +275,7 @@ "+\tunsigned short cntr = ioread16(par->base + LDCNTR);\n" "+\tint lps, ret;\n" "+\n" - "+\tif (blank == FB_BLANK_UNBLANK) {\n" + "+\tif (blank = FB_BLANK_UNBLANK) {\n" "+\t\tcntr = LDCNTR_DON2 | LDCNTR_DON;\n" "+\t\tlps = 3;\n" "+\t} else {\n" @@ -413,7 +412,7 @@ "+\n" "+\tvar->bits_per_pixel = bpp;\n" "+\n" - "+\tif ((var->grayscale) && (var->bits_per_pixel == 1))\n" + "+\tif ((var->grayscale) && (var->bits_per_pixel = 1))\n" "+\t\tfix->visual = FB_VISUAL_MONO10;\n" "+\telse if (var->bits_per_pixel >= 15)\n" "+\t\tfix->visual = FB_VISUAL_TRUECOLOR;\n" @@ -508,13 +507,13 @@ "+\tif (!gray)\n" "+\t\tstride *= (bpp + 7) >> 3;\n" "+\telse {\n" - "+\t\tif (bpp == 1)\n" + "+\t\tif (bpp = 1)\n" "+\t\t\tstride >>= 3;\n" - "+\t\telse if (bpp == 2)\n" + "+\t\telse if (bpp = 2)\n" "+\t\t\tstride >>= 2;\n" - "+\t\telse if (bpp == 4)\n" + "+\t\telse if (bpp = 4)\n" "+\t\t\tstride >>= 1;\n" - "+\t\t/* 6 bpp == 8 bpp */\n" + "+\t\t/* 6 bpp = 8 bpp */\n" "+\t}\n" "+\n" "+\t/* if rotated, stride must be power of 2 */\n" @@ -630,11 +629,11 @@ "+\n" "+\tvram = info->var.xres * info->var.yres;\n" "+\tif (info->var.grayscale) {\n" - "+\t\tif (bpp == 1)\n" + "+\t\tif (bpp = 1)\n" "+\t\t\tvram >>= 3;\n" - "+\t\telse if (bpp == 2)\n" + "+\t\telse if (bpp = 2)\n" "+\t\t\tvram >>= 2;\n" - "+\t\telse if (bpp == 4)\n" + "+\t\telse if (bpp = 4)\n" "+\t\t\tvram >>= 1;\n" "+\t} else if (bpp > 8)\n" "+\t\tvram *= 2;\n" @@ -646,8 +645,7 @@ "+\tif (vram < PAGE_SIZE)\n" "+\t\tvram = PAGE_SIZE;\n" "+\n" - "+\tfbmem =\n" - "+\t dma_alloc_coherent(info->dev, vram, &par->fbdma, GFP_KERNEL);\n" + "+\tfbmem +\t dma_alloc_coherent(info->dev, vram, &par->fbdma, GFP_KERNEL);\n" "+\n" "+\tif (!fbmem)\n" "+\t\treturn -ENOMEM;\n" @@ -675,7 +673,7 @@ "+\n" "+\t/* Get base addr */\n" "+\tres = platform_get_resource(pdev, IORESOURCE_MEM, 0);\n" - "+\tif (unlikely(res == NULL)) {\n" + "+\tif (unlikely(res = NULL)) {\n" "+\t\tdev_err(&pdev->dev, \"invalid resource\\n\");\n" "+\t\treturn -EINVAL;\n" "+\t}\n" @@ -1020,13 +1018,6 @@ "+\n" "+#endif /* _ASM_SH_SH7760FB_H */\n" "-- \n" - "1.5.5.1\n" - "\n" - "\n" - "-------------------------------------------------------------------------\n" - "Check out the new SourceForge.net Marketplace.\n" - "It's the best place to buy or sell services for\n" - "just about anything Open Source.\n" - http://sourceforge.net/services/buy/index.php + 1.5.5.1 -fbbf02eb599228d9ed55b9ddf22673ddf598fe3458e441b7baf872d90dc90a7d +53b3b2ae2a82cd4e103e7c0afe08614e0045955bcedcad4739a5cae33f230528
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.