minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-14 22:46:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

MCC200: Fix uninitialized variable problem in LCD driver

Browse Source
This commit is contained in:
Wolfgang Denk 2006-10-20 15:51:21 +02:00
parent 6a0766ed22
commit f641471498
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -2,6 +2,8 @@
Changes since U-Boot 1.1.4: Changes since U-Boot 1.1.4:
====================================================================== ======================================================================
* MCC200: Fix uninitialized variable problem in LCD driver
* Add board/cpu specific NAND chip select function to 440 NDFC * Add board/cpu specific NAND chip select function to 440 NDFC
Based on idea and implementation from Jeff Mann Based on idea and implementation from Jeff Mann
Patch by Stefan Roese, 20 Oct 2006 Patch by Stefan Roese, 20 Oct 2006

7
common/lcd.c
View File

@ -578,7 +578,9 @@ void bitmap_plot (int x, int y)
*/ */
int lcd_display_bitmap(ulong bmp_image, int x, int y) int lcd_display_bitmap(ulong bmp_image, int x, int y)
{ {
#if !defined(CONFIG_MCC200)
ushort *cmap; ushort *cmap;
#endif
ushort i, j; ushort i, j;
uchar *fb; uchar *fb;
bmp_image_t *bmp=(bmp_image_t *)bmp_image; bmp_image_t *bmp=(bmp_image_t *)bmp_image;
@ -624,13 +626,13 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
debug ("Display-bmp: %d x %d with %d colors\n", debug ("Display-bmp: %d x %d with %d colors\n",
(int)width, (int)height, (int)colors); (int)width, (int)height, (int)colors);
#if !defined(CONFIG_MCC200)
/* MCC200 LCD doesn't need CMAP, supports 1bpp b&w only */
if (bpix==8) { if (bpix==8) {
#if defined(CONFIG_PXA250) #if defined(CONFIG_PXA250)
cmap = (ushort *)fbi->palette; cmap = (ushort *)fbi->palette;
#elif defined(CONFIG_MPC823) #elif defined(CONFIG_MPC823)
cmap = (ushort *)&(cp->lcd_cmap[255*sizeof(ushort)]); cmap = (ushort *)&(cp->lcd_cmap[255*sizeof(ushort)]);
#elif defined(CONFIG_MCC200)
/* MCC200 LCD doesn't need CMAP, supports 1bpp b&w only */
#else #else
# error "Don't know location of color map" # error "Don't know location of color map"
#endif #endif
@ -654,6 +656,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
#endif #endif
} }
} }
#endif
/* /*
* BMP format for Monochrome assumes that the state of a * BMP format for Monochrome assumes that the state of a