General indent and whitespace cleanups.

1 files changed, 126 insertions, 114 deletions

diff --git a/board/mpc8641hpcn/sys_eeprom.c b/board/mpc8641hpcn/sys_eeprom.c
index 733a57f..74e2a3d 100644
--- a/board/mpc8641hpcn/sys_eeprom.c
+++ b/board/mpc8641hpcn/sys_eeprom.c
@@ -29,16 +29,16 @@
 
 #ifdef CFG_ID_EEPROM
 typedef struct {
-	unsigned char id[4];    /* 0x0000 - 0x0003 */
-	unsigned char sn[12];   /* 0x0004 - 0x000F */
-	unsigned char errata[5];/* 0x0010 - 0x0014 */
-	unsigned char date[7];  /* 0x0015 - 0x001a */
-	unsigned char res_1[37];/* 0x001b - 0x003f */
-	unsigned char tab_size; /* 0x0040 */
-	unsigned char tab_flag; /* 0x0041 */
-	unsigned char mac[8][6];/* 0x0042 - 0x0071 */
-	unsigned char res_2[126];/* 0x0072 - 0x00ef */
-	unsigned int  crc;      /* 0x00f0 - 0x00f3 crc32 checksum */
+	unsigned char id[4];		/* 0x0000 - 0x0003 */
+	unsigned char sn[12];		/* 0x0004 - 0x000F */
+	unsigned char errata[5];	/* 0x0010 - 0x0014 */
+	unsigned char date[7];		/* 0x0015 - 0x001a */
+	unsigned char res_1[37];	/* 0x001b - 0x003f */
+	unsigned char tab_size;		/* 0x0040 */
+	unsigned char tab_flag;		/* 0x0041 */
+	unsigned char mac[8][6];	/* 0x0042 - 0x0071 */
+	unsigned char res_2[126];	/* 0x0072 - 0x00ef */
+	unsigned int crc;		/* 0x00f0 - 0x00f3 crc32 checksum */
 } EEPROM_data;
 
 static EEPROM_data mac_data;
@@ -48,30 +48,34 @@ int mac_show(void)
 	int i;
 	unsigned char ethaddr[8][18];
 
-	printf("ID %c%c%c%c\n", mac_data.id[0],\
-				mac_data.id[1],\
-				mac_data.id[2],\
-				mac_data.id[3]);
-	printf("Errata %c%c%c%c%c\n",   mac_data.errata[0],\
-				mac_data.errata[1],\
-				mac_data.errata[2],\
-				mac_data.errata[3],\
-				mac_data.errata[4]);
-	printf("Date %c%c%c%c%c%c%c\n", mac_data.date[0],\
-				mac_data.date[1],\
-				mac_data.date[2],\
-				mac_data.date[3],\
-				mac_data.date[4],\
-				mac_data.date[5],\
-				mac_data.date[6]);
+	printf("ID %c%c%c%c\n",
+	       mac_data.id[0],
+	       mac_data.id[1],
+	       mac_data.id[2],
+	       mac_data.id[3]);
+	printf("Errata %c%c%c%c%c\n",
+	       mac_data.errata[0],
+	       mac_data.errata[1],
+	       mac_data.errata[2],
+	       mac_data.errata[3],
+	       mac_data.errata[4]);
+	printf("Date %c%c%c%c%c%c%c\n",
+	       mac_data.date[0],
+	       mac_data.date[1],
+	       mac_data.date[2],
+	       mac_data.date[3],
+	       mac_data.date[4],
+	       mac_data.date[5],
+	       mac_data.date[6]);
 	for (i = 0; i < 8; i++) {
-		sprintf(ethaddr[i],"%02x:%02x:%02x:%02x:%02x:%02x",\
-					mac_data.mac[i][0],\
-					mac_data.mac[i][1],\
-					mac_data.mac[i][2],\
-					mac_data.mac[i][3],\
-					mac_data.mac[i][4],\
-					mac_data.mac[i][5]);
+		sprintf(ethaddr[i],
+			"%02x:%02x:%02x:%02x:%02x:%02x",
+			mac_data.mac[i][0],
+			mac_data.mac[i][1],
+			mac_data.mac[i][2],
+			mac_data.mac[i][3],
+			mac_data.mac[i][4],
+			mac_data.mac[i][5]);
 		printf("MAC %d %s\n", i, ethaddr[i]);
 	}
 
@@ -85,7 +89,7 @@ int mac_show(void)
 
 int mac_read(void)
 {
-	int ret,length;
+	int ret, length;
 	unsigned int crc = 0;
 	unsigned char dev = ID_EEPROM_ADDR, *data;
 
@@ -98,12 +102,12 @@ int mac_read(void)
 
 	data = (unsigned char *)(&mac_data);
 	printf("Check CRC on reading ...");
-	crc = crc32(crc, data, length-4);
+	crc = crc32(crc, data, length - 4);
 	if (crc != mac_data.crc) {
-		printf("CRC checksum is invalid, in EEPROM CRC is %x, calculated CRC is %x\n",mac_data.crc,crc);
+		printf("CRC checksum is invalid, in EEPROM CRC is %x, calculated CRC is %x\n",
+		     mac_data.crc, crc);
 		return -1;
-	}
-	else {
+	} else {
 		printf("CRC OK\n");
 		mac_show();
 	}
@@ -114,94 +118,97 @@ int mac_prog(void)
 {
 	int ret, i, length;
 	unsigned int crc = 0;
-	unsigned char dev = ID_EEPROM_ADDR,*ptr;
-	unsigned char * eeprom_data = (unsigned char *)(&mac_data);
+	unsigned char dev = ID_EEPROM_ADDR, *ptr;
+	unsigned char *eeprom_data = (unsigned char *)(&mac_data);
 
 	for (i = 0; i < sizeof(mac_data.res_1); i++)
 		mac_data.res_1[i] = 0;
-	for (i = 0;i < sizeof(mac_data.res_2); i++)
+	for (i = 0; i < sizeof(mac_data.res_2); i++)
 		mac_data.res_2[i] = 0;
 	length = sizeof(EEPROM_data);
-	crc = crc32 (crc, eeprom_data, length-4);
+	crc = crc32(crc, eeprom_data, length - 4);
 	mac_data.crc = crc;
 	for (i = 0, ptr = eeprom_data; i < length; i += 8, ptr += 8) {
-		ret = i2c_write(dev, i, 1, ptr, (length-i) <8 ? (length-i) : 8);
-		udelay(5000);           /* 5ms write cycle timing */
+		ret =
+		    i2c_write(dev, i, 1, ptr,
+			      (length - i) < 8 ? (length - i) : 8);
+		udelay(5000);	/* 5ms write cycle timing */
 		if (ret)
 			break;
 	}
 	if (ret) {
 		printf("Programming failed.\n");
 		return -1;
-	}
-	else {
-		printf("Programming %d bytes. Reading back ...\n",length);
+	} else {
+		printf("Programming %d bytes. Reading back ...\n", length);
 		mac_read();
 	}
 	return 0;
 }
 
-int do_mac (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_mac(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 {
 	int i;
 	char cmd = 's';
 	unsigned long long mac_val;
 
-	if(i2c_probe(ID_EEPROM_ADDR) != 0)
+	if (i2c_probe(ID_EEPROM_ADDR) != 0)
 		return -1;
 
-	if(argc>1) {
+	if (argc > 1) {
 		cmd = argv[1][0];
 		switch (cmd) {
-			case 'r':       /* display */
-				mac_read();
-				break;
-			case 's':       /* save */
-				mac_prog();
-				break;
-			case 'i':       /* id */
-				for (i=0; i<4; i++) {
-					mac_data.id[i] = argv[2][i];
-				}
-				break;
-			case 'n':       /* serial number */
-				for (i=0; i<12; i++) {
-					mac_data.sn[i] = argv[2][i];
-				}
-				break;
-			case 'e':       /* errata */
-				for (i=0; i<5; i++) {
-					mac_data.errata[i] = argv[2][i];
-				}
-				break;
-			case 'd':       /* date */
-				for (i=0; i<7; i++) {
-					mac_data.date[i] = argv[2][i];
-				}
-				break;
-			case 'p':       /* number of ports */
-				mac_data.tab_size = (unsigned char)simple_strtoul(argv[2],NULL,16);
-				break;
-			case '0':       /* mac 0 */
-			case '1':       /* mac 1 */
-			case '2':       /* mac 2 */
-			case '3':       /* mac 3 */
-			case '4':       /* mac 4 */
-			case '5':       /* mac 5 */
-			case '6':       /* mac 6 */
-			case '7':       /* mac 7 */
-				mac_val = simple_strtoull(argv[2],NULL,16);
-				for (i=0; i<6; i++) {
-					mac_data.mac[cmd-'0'][i] = *((unsigned char *)(((unsigned int)(&mac_val))+i+2));
-				}
-				break;
-			case 'h':       /* help */
-			default:
-				printf ("Usage:\n%s\n", cmdtp->usage);
-				break;
+		case 'r':	/* display */
+			mac_read();
+			break;
+		case 's':	/* save */
+			mac_prog();
+			break;
+		case 'i':	/* id */
+			for (i = 0; i < 4; i++) {
+				mac_data.id[i] = argv[2][i];
+			}
+			break;
+		case 'n':	/* serial number */
+			for (i = 0; i < 12; i++) {
+				mac_data.sn[i] = argv[2][i];
+			}
+			break;
+		case 'e':	/* errata */
+			for (i = 0; i < 5; i++) {
+				mac_data.errata[i] = argv[2][i];
+			}
+			break;
+		case 'd':	/* date */
+			for (i = 0; i < 7; i++) {
+				mac_data.date[i] = argv[2][i];
+			}
+			break;
+		case 'p':	/* number of ports */
+			mac_data.tab_size =
+			    (unsigned char)simple_strtoul(argv[2], NULL, 16);
+			break;
+		case '0':	/* mac 0 */
+		case '1':	/* mac 1 */
+		case '2':	/* mac 2 */
+		case '3':	/* mac 3 */
+		case '4':	/* mac 4 */
+		case '5':	/* mac 5 */
+		case '6':	/* mac 6 */
+		case '7':	/* mac 7 */
+			mac_val = simple_strtoull(argv[2], NULL, 16);
+			for (i = 0; i < 6; i++) {
+				mac_data.mac[cmd - '0'][i] =
+				    *((unsigned char *)
+				      (((unsigned int)(&mac_val)) + i + 2));
+			}
+			break;
+		case 'h':	/* help */
+		default:
+			printf("Usage:\n%s\n", cmdtp->usage);
+			break;
 		}
-	}
-	else {
+	} else {
 		mac_show();
 	}
 	return 0;
@@ -209,36 +216,41 @@ int do_mac (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 int mac_read_from_eeprom(void)
 {
-	int length,i;
-	unsigned char dev = ID_EEPROM_ADDR, *data, ethaddr[4][18], enetvar[32];
+	int length, i;
+	unsigned char dev = ID_EEPROM_ADDR;
+	unsigned char *data;
+	unsigned char ethaddr[4][18];
+	unsigned char enetvar[32];
 	unsigned int crc = 0;
 
 	length = sizeof(EEPROM_data);
-	if(i2c_read (dev, 0, 1, (unsigned char *)(&mac_data), length)) {
+	if (i2c_read(dev, 0, 1, (unsigned char *)(&mac_data), length)) {
 		printf("Read failed.\n");
 		return -1;
 	}
 
 	data = (unsigned char *)(&mac_data);
-	crc = crc32(crc, data, length-4);
+	crc = crc32(crc, data, length - 4);
 	if (crc != mac_data.crc) {
 		return -1;
-	}
-	else {
-		for(i=0; i<4; i++) {
-			if(memcmp(&mac_data.mac[i], "\0\0\0\0\0\0", 6)) {
-				sprintf(ethaddr[i], "%02x:%02x:%02x:%02x:%02x:%02x", \
-					mac_data.mac[i][0], \
-					mac_data.mac[i][1], \
-					mac_data.mac[i][2], \
-					mac_data.mac[i][3], \
-					mac_data.mac[i][4], \
+	} else {
+		for (i = 0; i < 4; i++) {
+			if (memcmp(&mac_data.mac[i], "\0\0\0\0\0\0", 6)) {
+				sprintf(ethaddr[i],
+					"%02x:%02x:%02x:%02x:%02x:%02x",
+					mac_data.mac[i][0],
+					mac_data.mac[i][1],
+					mac_data.mac[i][2],
+					mac_data.mac[i][3],
+					mac_data.mac[i][4],
 					mac_data.mac[i][5]);
-				sprintf(enetvar, i ? "eth%daddr" : "ethaddr", i);
+				sprintf(enetvar,
+					i ? "eth%daddr" : "ethaddr",
+					i);
 				setenv(enetvar, ethaddr[i]);
 			}
 		}
 	}
 	return 0;
 }
-#endif  /* CFG_ID_EEPROM */
+#endif /* CFG_ID_EEPROM */