board/esd/cpci405/cpci405.c: Fix GCC 4.6 warning

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>

board/esd/cpci405/cpci405.c: Fix GCC 4.6 warning
Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Matthias Fuchs · Wolfgang Denk
1 parent ce2acd371c
Showing 1 changed file with 3 additions and 5 deletions Side-by-side Diff
board/esd/cpci405/cpci405.c
@@ -656,7 +656,6 @@
 	int i;
 	unsigned char ow_id[6];
 	char str[32];
-	unsigned char ow_crc;
  
 	/*
 	 * Clear 1-wire bit (open drain with pull-up)
  
@@ -675,11 +674,10 @@
 	OWReadByte(); /* skip family code ( == 0x01) */
 	for (i = 0; i < 6; i++)
 		ow_id[i] = OWReadByte();
-	ow_crc = OWReadByte(); /* read crc */
+	OWReadByte(); /* read crc */
  
-	sprintf(str, "%08X%04X",
-		*(unsigned int *)&ow_id[0],
-		*(unsigned short *)&ow_id[4]);
+	sprintf(str, "%02X%02X%02X%02X%02X%02X",
+		ow_id[0], ow_id[1], ow_id[2], ow_id[3], ow_id[4], ow_id[5]);
 	printf("Setting environment variable 'ow_id' to %s\n", str);
 	setenv("ow_id", str);
...	...	@@ -656,7 +656,6 @@
656	656	int i;
657	657	unsigned char ow_id[6];
658	658	char str[32];
659		- unsigned char ow_crc;
660	659
661	660	/*
662	661	* Clear 1-wire bit (open drain with pull-up)
663	662
...	...	@@ -675,11 +674,10 @@
675	674	OWReadByte(); /* skip family code ( == 0x01) */
676	675	for (i = 0; i < 6; i++)
677	676	ow_id[i] = OWReadByte();
678		- ow_crc = OWReadByte(); /* read crc */
	677	+ OWReadByte(); /* read crc */
679	678
680		- sprintf(str, "%08X%04X",
681		- (unsigned int )&ow_id[0],
682		- (unsigned short )&ow_id[4]);
	679	+ sprintf(str, "%02X%02X%02X%02X%02X%02X",
	680	+ ow_id[0], ow_id[1], ow_id[2], ow_id[3], ow_id[4], ow_id[5]);
683	681	printf("Setting environment variable 'ow_id' to %s\n", str);
684	682	setenv("ow_id", str);
685	683