KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix the CF serial number byteswapping (#3133)

Browse source 
SVN-Revision: 11837
This commit is contained in:
Florian Fainelli 2008-07-15 10:22:28 +00:00
parent 4c6a666b90
commit cd21dd1a1d
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
target/linux/rb532/files/drivers/block/rb500/ata.c
View file

@ -358,6 +358,8 @@ static int do_identify(struct cf_mips_dev *dev)
u16 sbuf[CF_SECT_SIZE >> 1]; u16 sbuf[CF_SECT_SIZE >> 1];
int res; int res;
char tstr[17]; //serial char tstr[17]; //serial
char tmp;
int i;
BUG_ON(dev->tstate!=TS_IDLE); BUG_ON(dev->tstate!=TS_IDLE);
dev->tbuf = (char *) sbuf; dev->tbuf = (char *) sbuf;
dev->tbuf_size = CF_SECT_SIZE; dev->tbuf_size = CF_SECT_SIZE;
@ -381,8 +383,16 @@ static int do_identify(struct cf_mips_dev *dev)
dev->spt = sbuf[6]; dev->spt = sbuf[6];
dev->sectors = ((unsigned long) sbuf[7] << 16) | sbuf[8]; dev->sectors = ((unsigned long) sbuf[7] << 16) | sbuf[8];
dev->dtype=sbuf[0]; dev->dtype=sbuf[0];
memcpy(tstr,&sbuf[12],16); memcpy(tstr, &sbuf[12], 16);
tstr[16]=0; tstr[16] = '\0';
/* Byte-swap the serial number */
for (i = 0; i<8; i++) {
tmp = tstr[i * 2];
tstr[i * 2] = tstr[i * 2 +1];
tstr[i * 2 + 1] = tmp;
}
printk(KERN_INFO "cf-mips: %s detected, C/H/S=%d/%d/%d sectors=%u (%uMB) Serial=%s\n", printk(KERN_INFO "cf-mips: %s detected, C/H/S=%d/%d/%d sectors=%u (%uMB) Serial=%s\n",
(sbuf[0] == 0x848A ? "CF card" : "ATA drive"), dev->cyl, dev->head, (sbuf[0] == 0x848A ? "CF card" : "ATA drive"), dev->cyl, dev->head,
dev->spt, dev->sectors, dev->sectors >> 11, tstr); dev->spt, dev->sectors, dev->sectors >> 11, tstr);