git: 9front

Info  •  Files  •  Log  •  Branches

etheriwl: fix rominit

we used use the *last* block in otp block list instead of
the block *before* the last block resulting in wrong eeprom
data (1000er series only)

--- a/sys/src/9/pc/etheriwl.c

+++ b/sys/src/9/pc/etheriwl.c

@@ -744,9 +744,9 @@

 static char*

 rominit(Ctlr *ctlr)

 {

+	uint prev, last;

 	uchar buf[2];

 	char *err;

-	uint off;

 	int i;

 	ctlr->eeprom.otp = 0;

@@ -785,18 +785,19 @@

 	 * Find the block before last block (contains the EEPROM image)

 	 * for HW without OTP shadow RAM.

 	 */

-	off = 0;

+	prev = last = 0;

 	for(i=0; i<3; i++){

-		if((err = eepromread(ctlr, buf, 2, off)) != nil)

+		if((err = eepromread(ctlr, buf, 2, last)) != nil)

 			return err;

 		if(get16(buf) == 0)

 			break;

-		off = get16(buf);

+		prev = last;

+		last = get16(buf);

 	}

 	if(i == 0 || i >= 3)

 		return "rominit: missing eeprom image";

-	ctlr->eeprom.off = off+1;

+	ctlr->eeprom.off = prev+1;

 	return nil;

 }

-- 

⑨