Skip to contentSkip to conversation

ppc4xx: More cleanup for esd's LCD code

PATCH New Matthias Fuchs 3 participants 4 messages Jan 2, 2008

lore
Share & tools
lore

Matthias Fuchs

author
#0 lore raw

PATCH 1/1 ppc4xx: More cleanup for esd's LCD code

Signed-off-by Matthias Fuchs <[email protected]>
---
 board/esd/common/lcd.c |   44 ++++++++++++++++++++------------------------
 1 files changed, 20 insertions(+), 24 deletions(-)
board/esd/common/lcd.c +20 -24
index 4116838..0120d53 100644
@@ -37,41 +37,41 @@ int lcd_depth;
 unsigned char *glob_lcd_reg;
 unsigned char *glob_lcd_mem;
 
-#ifdef CFG_LCD_ENDIAN
+#if defined(CFG_LCD_ENDIAN)
 void lcd_setup(int lcd, int config)
 {
 	if (lcd == 0) {
 		/*
 		 * Set endianess and reset lcd controller 0 (small)
 		 */
-		out32(GPIO0_OR, in32(GPIO0_OR) & ~CFG_LCD0_RST); /* set reset to low */
+		out_be32((void*)GPIO0_OR, in_be32((void*)GPIO0_OR) & ~CFG_LCD0_RST); /* set reset to low */
 		udelay(10); /* wait 10us */
 		if (config == 1)
-			out32(GPIO0_OR, in32(GPIO0_OR) | CFG_LCD_ENDIAN); /* big-endian */
+			out_be32((void*)GPIO0_OR, in_be32((void*)GPIO0_OR) | CFG_LCD_ENDIAN); /* big-endian */
 		else
-			out32(GPIO0_OR, in32(GPIO0_OR) & ~CFG_LCD_ENDIAN); /* little-endian */
+			out_be32((void*)GPIO0_OR, in_be32((void*)GPIO0_OR) & ~CFG_LCD_ENDIAN); /* little-endian */
 		udelay(10); /* wait 10us */
-		out32(GPIO0_OR, in32(GPIO0_OR) | CFG_LCD0_RST); /* set reset to high */
+		out_be32((void*)GPIO0_OR, in_be32((void*)GPIO0_OR) | CFG_LCD0_RST); /* set reset to high */
 	} else {
 		/*
 		 * Set endianess and reset lcd controller 1 (big)
 		 */
-		out32(GPIO0_OR, in32(GPIO0_OR) & ~CFG_LCD1_RST); /* set reset to low */
+		out_be32((void*)GPIO0_OR, in_be32((void*)GPIO0_OR) & ~CFG_LCD1_RST); /* set reset to low */
 		udelay(10); /* wait 10us */
 		if (config == 1)
-			out32(GPIO0_OR, in32(GPIO0_OR) | CFG_LCD_ENDIAN); /* big-endian */
+			out_be32((void*)GPIO0_OR, in_be32((void*)GPIO0_OR) | CFG_LCD_ENDIAN); /* big-endian */
 		else
-			out32(GPIO0_OR, in32(GPIO0_OR) & ~CFG_LCD_ENDIAN); /* little-endian */
+			out_be32((void*)GPIO0_OR, in_be32((void*)GPIO0_OR) & ~CFG_LCD_ENDIAN); /* little-endian */
 		udelay(10); /* wait 10us */
-		out32(GPIO0_OR, in32(GPIO0_OR) | CFG_LCD1_RST); /* set reset to high */
+		out_be32((void*)GPIO0_OR, in_be32((void*)GPIO0_OR) | CFG_LCD1_RST); /* set reset to high */
 	}
 
 	/*
 	 * CFG_LCD_ENDIAN may also be FPGA_RESET, so set inactive
 	 */
-	out32(GPIO0_OR, in32(GPIO0_OR) | CFG_LCD_ENDIAN); /* set reset high again */
+	out_be32((void*)GPIO0_OR, in_be32((void*)GPIO0_OR) | CFG_LCD_ENDIAN); /* set reset high again */
 }
-#endif /* #ifdef CFG_LCD_ENDIAN */
+#endif /* CFG_LCD_ENDIAN */
 
 
 void lcd_bmp(uchar *logo_bmp)

@@ -93,7 +93,6 @@ void lcd_bmp(uchar *logo_bmp)
 	 * Check for bmp mark 'BM'
 	 */
 	if (*(ushort *)logo_bmp != 0x424d) {
-
 		/*
 		 * Decompress bmp image
 		 */

@@ -116,12 +115,11 @@ void lcd_bmp(uchar *logo_bmp)
 			free(dst);
 			return;
 		}
-	} else {
+	} else
 		/*
 		 * Uncompressed BMP image, just use this pointer
 		 */
 		dst = (uchar *)logo_bmp;
-	}
 
 	/*
 	 * Get image info from bmp-header

@@ -160,7 +158,7 @@ void lcd_bmp(uchar *logo_bmp)
 	 */
 	if ((colors <= 256) && (lcd_depth <= 8)) {
 		ptr = (unsigned char *)(dst + 14 + 40);
-		for (i=0; i<colors; i++) {
+		for (i = 0; i < colors; i++) {
 			b = *ptr++;
 			g = *ptr++;
 			r = *ptr++;

@@ -175,11 +173,11 @@ void lcd_bmp(uchar *logo_bmp)
 	ptr = glob_lcd_mem;
 	ptr2 = (ushort *)glob_lcd_mem;
 	header_size = 14 + 40 + 4*colors;          /* skip bmp header */
-	for (y=0; y<height; y++) {
+	for (y = 0; y < height; y++) {
 		bmp = &dst[(height-1-y)*line_size + header_size];
 		if (lcd_depth == 16) {
 			if (bpp == 24) {
-				for (x=0; x<width; x++) {
+				for (x = 0; x < width; x++) {
 					/*
 					 * Generate epson 16bpp fb-format from 24bpp image
 					 */

@@ -190,7 +188,7 @@ void lcd_bmp(uchar *logo_bmp)
 					*ptr2++ = val;
 				}
 			} else if (bpp == 8) {
-				for (x=0; x<line_size; x++) {
+				for (x = 0; x < line_size; x++) {
 					/* query rgb value from palette */
 					ptr = (unsigned char *)(dst + 14 + 40) ;
 					ptr += (*bmp++) << 2;

@@ -201,11 +199,9 @@ void lcd_bmp(uchar *logo_bmp)
 					*ptr2++ = val;
 				}
 			}
-		} else {
-			for (x=0; x<line_size; x++) {
+		} else
+			for (x = 0; x < line_size; x++)
 				*ptr++ = *bmp++;
-			}
-		}
 	}
 
 	if ((dst != NULL) && (dst != (uchar *)logo_bmp))

@@ -254,7 +250,7 @@ void lcd_init(uchar *lcd_reg, uchar *lcd_mem, S1D_REGS *regs, int reg_count,
 		palette_value = 0x17;
 		lcd_depth = 8;
 		puts("LCD:   S1D13704");
-	      } else if (in_8(&lcd_reg[0x10000]) == 0x24) {
+	} else if (in_8(&lcd_reg[0x10000]) == 0x24) {
 		/*
 		 * Small epson detected (705)
 		 */

@@ -296,7 +292,7 @@ void lcd_init(uchar *lcd_reg, uchar *lcd_mem, S1D_REGS *regs, int reg_count,
 	lcd_bmp(logo_bmp);
 }
 
-#ifdef CONFIG_VIDEO_SM501
+#if defined(CONFIG_VIDEO_SM501)
 int do_esdbmp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
 	ulong addr;
Signature · 1 line
1.5.3
#1 lore raw

PATCH 1/1 ppc4xx: More cleanup for esd's LCD code

board/esd/common/lcd.c void lcd_bmp(uchar *logo_bmp) · line 124

Quoted 8 lines · In message <[email protected]> you wrote:
board/esd/common/lcd.c +1 -2
-	} else {
+	} else
 		/*
 		 * Uncompressed BMP image, just use this pointer
 		 */
 		dst = (uchar *)logo_bmp;
-	}

I object against this change. The "else" without curly braces is good only if a simple one-liner is following.

Here you have 4 lines, and I definitely want to see braces here.

Thanks.

Best regards,

Wolfgang Denk

Signature · 7 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Yes, it's a technical challenge, and  you  have  to  kind  of  admire
people  who go to the lengths of actually implementing it, but at the
same time you wonder about their IQ...
         --  Linus Torvalds in <[email protected]>
#2 lore raw

PATCH 1/1 ppc4xx: More cleanup for esd's LCD code

Quoted 1 line · Wolfgang Denk

In message <[email protected]> you

Quoted 11 lines · wrote:

board/esd/common/lcd.c void lcd_bmp(uchar *logo_bmp) · line 124

Quoted 7 lines
board/esd/common/lcd.c +1 -2
-	} else {
+	} else
 		/*
 		 * Uncompressed BMP image, just use this pointer
 		 */
 		dst = (uchar *)logo_bmp;
-	}

I object against this change. The "else" without curly braces is good only if a simple one-liner is following.

Quoted 1 line

Here you have 4 lines, and I definitely want to see braces here.

Right. Please only remove the curly braces if only one line follows. Comments and multi-line statements should also be put into the braces.

Thanks.

Best regards,
Stefan

=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================

author
#3 lore raw

PATCH 1/1 ppc4xx: More cleanup for esd's LCD code

Well, I even like braces around single lines:-) I only removed them in this case as a new years offering.

Updated patch follows.

Matthias

Quoted 31 lines · Stefan Roese
Quoted 1 line · Wolfgang Denk

In message <[email protected]> you

Quoted 11 lines · wrote:

board/esd/common/lcd.c void lcd_bmp(uchar *logo_bmp) · line 124

Quoted 7 lines
board/esd/common/lcd.c +1 -2
-	} else {
+	} else
 		/*
 		 * Uncompressed BMP image, just use this pointer
 		 */
 		dst = (uchar *)logo_bmp;
-	}

I object against this change. The "else" without curly braces is good only if a simple one-liner is following.

Quoted 1 line

Here you have 4 lines, and I definitely want to see braces here.

Right. Please only remove the curly braces if only one line follows. Comments and multi-line statements should also be put into the braces.

Thanks.

Best regards,
Stefan

=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================

Signature · 5 lines
-----------------------------------------------------------------------
Dipl.-Ing. Matthias Fuchs             esd electronic system design gmbh
http://www.esd-electronics.com                    Vahrenwalder Str. 207
phone: +49-511-37298-0, fax: -68                30165 Hannover, Germany
-----------------------------------------------------------------------