minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-13 05:55:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of /home/wd/git/u-boot/work

Browse Source
This commit is contained in:
Wolfgang Denk 2007-11-17 00:38:34 +01:00
commit ee1f5e3bfe
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/purple/flash.c
View File

@ -299,7 +299,7 @@ void flash_print_info (flash_info_t *info)
int i; int i;
uchar *boottype; uchar *boottype;
uchar *bootletter; uchar *bootletter;
uchar *fmt; char *fmt;
uchar botbootletter[] = "B"; uchar botbootletter[] = "B";
uchar topbootletter[] = "T"; uchar topbootletter[] = "T";
uchar botboottype[] = "bottom boot sector"; uchar botboottype[] = "bottom boot sector";

12
common/cmd_ide.c
View File

@ -1136,9 +1136,9 @@ static void ide_ident (block_dev_desc_t *dev_desc)
input_swap_data (device, iobuf, ATA_SECTORWORDS); input_swap_data (device, iobuf, ATA_SECTORWORDS);
ident_cpy (dev_desc->revision, iop->fw_rev, sizeof(dev_desc->revision)); ident_cpy ((unsigned char*)dev_desc->revision, iop->fw_rev, sizeof(dev_desc->revision));
ident_cpy (dev_desc->vendor, iop->model, sizeof(dev_desc->vendor)); ident_cpy ((unsigned char*)dev_desc->vendor, iop->model, sizeof(dev_desc->vendor));
ident_cpy (dev_desc->product, iop->serial_no, sizeof(dev_desc->product)); ident_cpy ((unsigned char*)dev_desc->product, iop->serial_no, sizeof(dev_desc->product));
#ifdef __LITTLE_ENDIAN #ifdef __LITTLE_ENDIAN
/* /*
* firmware revision and model number have Big Endian Byte * firmware revision and model number have Big Endian Byte
@ -1953,9 +1953,9 @@ static void atapi_inquiry(block_dev_desc_t * dev_desc)
return; return;
/* copy device ident strings */ /* copy device ident strings */
ident_cpy(dev_desc->vendor,&iobuf[8],8); ident_cpy((unsigned char*)dev_desc->vendor,&iobuf[8],8);
ident_cpy(dev_desc->product,&iobuf[16],16); ident_cpy((unsigned char*)dev_desc->product,&iobuf[16],16);
ident_cpy(dev_desc->revision,&iobuf[32],5); ident_cpy((unsigned char*)dev_desc->revision,&iobuf[32],5);
dev_desc->lun=0; dev_desc->lun=0;
dev_desc->lba=0; dev_desc->lba=0;