dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 01:02:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

dm: scsi: Fix up code style

Browse Source 
Update the code style of this file so that it passes checkpatch.pl.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2016-05-01 11:35:58 -06:00
parent 73a9cfde78
commit f1d4d9379e
1 changed files with 226 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
cmd/scsi.c
View File

@@ -50,10 +50,6 @@ static int scsi_curr_dev; /* current device */
static struct blk_desc scsi_dev_desc[CONFIG_SYS_SCSI_MAX_DEVICE]; static struct blk_desc scsi_dev_desc[CONFIG_SYS_SCSI_MAX_DEVICE];
/****************************************************************************************
* scsi_read
*/
/* almost the maximum amount of the scsi_ext command.. */ /* almost the maximum amount of the scsi_ext command.. */
#define SCSI_MAX_READ_BLK 0xFFFF #define SCSI_MAX_READ_BLK 0xFFFF
#define SCSI_LBA48_READ 0xFFFFFFF #define SCSI_LBA48_READ 0xFFFFFFF
@@ -63,25 +59,23 @@ void scsi_setup_read16(ccb * pccb, lbaint_t start, unsigned long blocks)
{ {
pccb->cmd[0] = SCSI_READ16; pccb->cmd[0] = SCSI_READ16;
pccb->cmd[1] = pccb->lun << 5; pccb->cmd[1] = pccb->lun << 5;
pccb->cmd[2] = ((unsigned char) (start >> 56)) & 0xff; pccb->cmd[2] = (unsigned char)(start >> 56) & 0xff;
pccb->cmd[3] = ((unsigned char) (start >> 48)) & 0xff; pccb->cmd[3] = (unsigned char)(start >> 48) & 0xff;
pccb->cmd[4] = ((unsigned char) (start >> 40)) & 0xff; pccb->cmd[4] = (unsigned char)(start >> 40) & 0xff;
pccb->cmd[5] = ((unsigned char) (start >> 32)) & 0xff; pccb->cmd[5] = (unsigned char)(start >> 32) & 0xff;
pccb->cmd[6] = ((unsigned char) (start >> 24)) & 0xff; pccb->cmd[6] = (unsigned char)(start >> 24) & 0xff;
pccb->cmd[7] = ((unsigned char) (start >> 16)) & 0xff; pccb->cmd[7] = (unsigned char)(start >> 16) & 0xff;
pccb->cmd[8] = ((unsigned char) (start >> 8)) & 0xff; pccb->cmd[8] = (unsigned char)(start >> 8) & 0xff;
pccb->cmd[9] = ((unsigned char) (start)) & 0xff; pccb->cmd[9] = (unsigned char)start & 0xff;
pccb->cmd[10] = 0; pccb->cmd[10] = 0;
pccb->cmd[11] = ((unsigned char) (blocks >> 24)) & 0xff; pccb->cmd[11] = (unsigned char)(blocks >> 24) & 0xff;
pccb->cmd[12] = ((unsigned char) (blocks >> 16)) & 0xff; pccb->cmd[12] = (unsigned char)(blocks >> 16) & 0xff;
pccb->cmd[13] = ((unsigned char) (blocks >> 8)) & 0xff; pccb->cmd[13] = (unsigned char)(blocks >> 8) & 0xff;
pccb->cmd[14] = (unsigned char)blocks & 0xff; pccb->cmd[14] = (unsigned char)blocks & 0xff;
pccb->cmd[15] = 0; pccb->cmd[15] = 0;
pccb->cmdlen = 16; pccb->cmdlen = 16;
pccb->msgout[0] = SCSI_IDENTIFY; /* NOT USED */ pccb->msgout[0] = SCSI_IDENTIFY; /* NOT USED */
debug ("scsi_setup_read16: cmd: %02X %02X " debug("scsi_setup_read16: cmd: %02X %02X startblk %02X%02X%02X%02X%02X%02X%02X%02X blccnt %02X%02X%02X%02X\n",
"startblk %02X%02X%02X%02X%02X%02X%02X%02X "
"blccnt %02X%02X%02X%02X\n",
pccb->cmd[0], pccb->cmd[1], pccb->cmd[0], pccb->cmd[1],
pccb->cmd[2], pccb->cmd[3], pccb->cmd[4], pccb->cmd[5], pccb->cmd[2], pccb->cmd[3], pccb->cmd[4], pccb->cmd[5],
pccb->cmd[6], pccb->cmd[7], pccb->cmd[8], pccb->cmd[9], pccb->cmd[6], pccb->cmd[7], pccb->cmd[8], pccb->cmd[9],
@@ -93,12 +87,12 @@ void scsi_setup_read_ext(ccb * pccb, lbaint_t start, unsigned short blocks)
{ {
pccb->cmd[0] = SCSI_READ10; pccb->cmd[0] = SCSI_READ10;
pccb->cmd[1] = pccb->lun << 5; pccb->cmd[1] = pccb->lun << 5;
pccb->cmd[2]=((unsigned char) (start>>24))&0xff; pccb->cmd[2] = (unsigned char)(start >> 24) & 0xff;
pccb->cmd[3]=((unsigned char) (start>>16))&0xff; pccb->cmd[3] = (unsigned char)(start >> 16) & 0xff;
pccb->cmd[4]=((unsigned char) (start>>8))&0xff; pccb->cmd[4] = (unsigned char)(start >> 8) & 0xff;
pccb->cmd[5]=((unsigned char) (start))&0xff; pccb->cmd[5] = (unsigned char)start & 0xff;
pccb->cmd[6] = 0; pccb->cmd[6] = 0;
pccb->cmd[7]=((unsigned char) (blocks>>8))&0xff; pccb->cmd[7] = (unsigned char)(blocks >> 8) & 0xff;
pccb->cmd[8] = (unsigned char)blocks & 0xff; pccb->cmd[8] = (unsigned char)blocks & 0xff;
pccb->cmd[6] = 0; pccb->cmd[6] = 0;
pccb->cmdlen=10; pccb->cmdlen=10;
@@ -113,10 +107,10 @@ void scsi_setup_write_ext(ccb *pccb, lbaint_t start, unsigned short blocks)
{ {
pccb->cmd[0] = SCSI_WRITE10; pccb->cmd[0] = SCSI_WRITE10;
pccb->cmd[1] = pccb->lun << 5; pccb->cmd[1] = pccb->lun << 5;
pccb->cmd[2] = ((unsigned char) (start>>24)) & 0xff; pccb->cmd[2] = (unsigned char)(start >> 24) & 0xff;
pccb->cmd[3] = ((unsigned char) (start>>16)) & 0xff; pccb->cmd[3] = (unsigned char)(start >> 16) & 0xff;
pccb->cmd[4] = ((unsigned char) (start>>8)) & 0xff; pccb->cmd[4] = (unsigned char)(start >> 8) & 0xff;
pccb->cmd[5] = ((unsigned char) (start)) & 0xff; pccb->cmd[5] = (unsigned char)start & 0xff;
pccb->cmd[6] = 0; pccb->cmd[6] = 0;
pccb->cmd[7] = ((unsigned char)(blocks >> 8)) & 0xff; pccb->cmd[7] = ((unsigned char)(blocks >> 8)) & 0xff;
pccb->cmd[8] = (unsigned char)blocks & 0xff; pccb->cmd[8] = (unsigned char)blocks & 0xff;
@@ -133,9 +127,9 @@ void scsi_setup_write_ext(ccb *pccb, lbaint_t start, unsigned short blocks)
void scsi_setup_read6(ccb * pccb, lbaint_t start, unsigned short blocks) void scsi_setup_read6(ccb * pccb, lbaint_t start, unsigned short blocks)
{ {
pccb->cmd[0] = SCSI_READ6; pccb->cmd[0] = SCSI_READ6;
pccb->cmd[1]=pccb->lun<<5 | (((unsigned char)(start>>16))&0x1f); pccb->cmd[1] = pccb->lun << 5 | ((unsigned char)(start >> 16) & 0x1f);
pccb->cmd[2]=((unsigned char) (start>>8))&0xff; pccb->cmd[2] = (unsigned char)(start >> 8) & 0xff;
pccb->cmd[3]=((unsigned char) (start))&0xff; pccb->cmd[3] = (unsigned char)start & 0xff;
pccb->cmd[4] = (unsigned char)blocks & 0xff; pccb->cmd[4] = (unsigned char)blocks & 0xff;
pccb->cmd[5] = 0; pccb->cmd[5] = 0;
pccb->cmdlen=6; pccb->cmdlen=6;
@@ -170,8 +164,8 @@ static ulong scsi_read(struct blk_desc *block_dev, lbaint_t blknr,
unsigned short smallblks = 0; unsigned short smallblks = 0;
ccb* pccb=(ccb *)&tempccb; ccb* pccb=(ccb *)&tempccb;
device&=0xff; device&=0xff;
/* Setup device
*/ /* Setup device */
pccb->target = scsi_dev_desc[device].target; pccb->target = scsi_dev_desc[device].target;
pccb->lun = scsi_dev_desc[device].lun; pccb->lun = scsi_dev_desc[device].lun;
buf_addr = (unsigned long)buffer; buf_addr = (unsigned long)buffer;
@@ -193,7 +187,8 @@ static ulong scsi_read(struct blk_desc *block_dev, lbaint_t blknr,
} else } else
#endif #endif
if (blks > SCSI_MAX_READ_BLK) { if (blks > SCSI_MAX_READ_BLK) {
pccb->datalen=scsi_dev_desc[device].blksz * SCSI_MAX_READ_BLK; pccb->datalen = scsi_dev_desc[device].blksz *
SCSI_MAX_READ_BLK;
smallblks = SCSI_MAX_READ_BLK; smallblks = SCSI_MAX_READ_BLK;
scsi_setup_read_ext(pccb, start, smallblks); scsi_setup_read_ext(pccb, start, smallblks);
start += SCSI_MAX_READ_BLK; start += SCSI_MAX_READ_BLK;
@@ -218,7 +213,7 @@ static ulong scsi_read(struct blk_desc *block_dev, lbaint_t blknr,
} while (blks != 0); } while (blks != 0);
debug("scsi_read_ext: end startblk " LBAF debug("scsi_read_ext: end startblk " LBAF
", blccnt %x buffer %" PRIXPTR "\n", start, smallblks, buf_addr); ", blccnt %x buffer %" PRIXPTR "\n", start, smallblks, buf_addr);
return(blkcnt); return blkcnt;
} }
/******************************************************************************* /*******************************************************************************
@@ -382,7 +377,8 @@ int do_scsi (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return 0; return 0;
} }
if (strncmp(argv[1], "dev", 3) == 0) { if (strncmp(argv[1], "dev", 3) == 0) {
if ((scsi_curr_dev < 0) || (scsi_curr_dev >= CONFIG_SYS_SCSI_MAX_DEVICE)) { if (scsi_curr_dev < 0 ||
scsi_curr_dev >= CONFIG_SYS_SCSI_MAX_DEVICE) {
printf("\nno SCSI devices available\n"); printf("\nno SCSI devices available\n");
return 1; return 1;
} }
@@ -396,8 +392,10 @@ int do_scsi (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
} }
if (strncmp(argv[1], "part", 4) == 0) { if (strncmp(argv[1], "part", 4) == 0) {
int dev, ok; int dev, ok;
for (ok=0, dev=0; dev<CONFIG_SYS_SCSI_MAX_DEVICE; ++dev) { for (ok = 0, dev = 0;
if (scsi_dev_desc[dev].type!=DEV_TYPE_UNKNOWN) { dev < CONFIG_SYS_SCSI_MAX_DEVICE; ++dev) {
if (scsi_dev_desc[dev].type !=
DEV_TYPE_UNKNOWN) {
ok++; ok++;
if (dev) if (dev)
printf("\n"); printf("\n");
@@ -420,21 +418,18 @@ int do_scsi (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
} }
printf("\n Device %d: ", dev); printf("\n Device %d: ", dev);
dev_print(&scsi_dev_desc[dev]); dev_print(&scsi_dev_desc[dev]);
if(scsi_dev_desc[dev].type == DEV_TYPE_UNKNOWN) { if (scsi_dev_desc[dev].type == DEV_TYPE_UNKNOWN)
return 1; return 1;
}
scsi_curr_dev = dev; scsi_curr_dev = dev;
printf("... is now current device\n"); printf("... is now current device\n");
return 0; return 0;
} }
if (strncmp(argv[1], "part", 4) == 0) { if (strncmp(argv[1], "part", 4) == 0) {
int dev = (int)simple_strtoul(argv[2], NULL, 10); int dev = (int)simple_strtoul(argv[2], NULL, 10);
if(scsi_dev_desc[dev].type != DEV_TYPE_UNKNOWN) { if (scsi_dev_desc[dev].type != DEV_TYPE_UNKNOWN)
part_print(&scsi_dev_desc[dev]); part_print(&scsi_dev_desc[dev]);
} else
else {
printf("\nSCSI device %d not available\n", dev); printf("\nSCSI device %d not available\n", dev);
}
return 1; return 1;
} }
return CMD_RET_USAGE; return CMD_RET_USAGE;
@@ -449,20 +444,20 @@ int do_scsi (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
scsi_curr_dev, blk, cnt); scsi_curr_dev, blk, cnt);
n = scsi_read(&scsi_dev_desc[scsi_curr_dev], n = scsi_read(&scsi_dev_desc[scsi_curr_dev],
blk, cnt, (ulong *)addr); blk, cnt, (ulong *)addr);
printf ("%ld blocks read: %s\n",n,(n==cnt) ? "OK" : "ERROR"); printf("%ld blocks read: %s\n", n,
n == cnt ? "OK" : "ERROR");
return 0; return 0;
} else if (strcmp(argv[1], "write") == 0) { } else if (strcmp(argv[1], "write") == 0) {
ulong addr = simple_strtoul(argv[2], NULL, 16); ulong addr = simple_strtoul(argv[2], NULL, 16);
ulong blk = simple_strtoul(argv[3], NULL, 16); ulong blk = simple_strtoul(argv[3], NULL, 16);
ulong cnt = simple_strtoul(argv[4], NULL, 16); ulong cnt = simple_strtoul(argv[4], NULL, 16);
ulong n; ulong n;
printf("\nSCSI write: device %d block # %ld, " printf("\nSCSI write: device %d block # %ld, count %ld ... ",
"count %ld ... ",
scsi_curr_dev, blk, cnt); scsi_curr_dev, blk, cnt);
n = scsi_write(&scsi_dev_desc[scsi_curr_dev], n = scsi_write(&scsi_dev_desc[scsi_curr_dev],
blk, cnt, (ulong *)addr); blk, cnt, (ulong *)addr);
printf("%ld blocks written: %s\n", n, printf("%ld blocks written: %s\n", n,
(n == cnt) ? "OK" : "ERROR"); n == cnt ? "OK" : "ERROR");
return 0; return 0;
} }
} /* switch */ } /* switch */
@@ -509,9 +504,8 @@ void scsi_ident_cpy (unsigned char *dest, unsigned char *src, unsigned int len)
break; break;
end--; end--;
} }
for( ; start<=end; start++) { for (; start <= end; start++)
*dest ++= src[start]; *dest ++= src[start];
}
*dest='\0'; *dest='\0';
} }
@@ -534,7 +528,7 @@ int scsi_read_capacity(ccb *pccb, lbaint_t *capacity, unsigned long *blksz)
{ {
*capacity = 0; *capacity = 0;
memset(pccb->cmd, 0, sizeof(pccb->cmd)); memset(pccb->cmd, '\0', sizeof(pccb->cmd));
pccb->cmd[0] = SCSI_RD_CAPAC10; pccb->cmd[0] = SCSI_RD_CAPAC10;
pccb->cmd[1] = pccb->lun << 5; pccb->cmd[1] = pccb->lun << 5;
pccb->cmdlen = 10; pccb->cmdlen = 10;
@@ -559,8 +553,7 @@ int scsi_read_capacity(ccb *pccb, lbaint_t *capacity, unsigned long *blksz)
} }
/* Read capacity (10) was insufficient. Use read capacity (16). */ /* Read capacity (10) was insufficient. Use read capacity (16). */
memset(pccb->cmd, '\0', sizeof(pccb->cmd));
memset(pccb->cmd, 0, sizeof(pccb->cmd));
pccb->cmd[0] = SCSI_RD_CAPAC16; pccb->cmd[0] = SCSI_RD_CAPAC16;
pccb->cmd[1] = 0x10; pccb->cmd[1] = 0x10;
pccb->cmdlen = 16; pccb->cmdlen = 16;
@@ -618,9 +611,8 @@ void scsi_scan(int mode)
unsigned long blksz; unsigned long blksz;
ccb* pccb=(ccb *)&tempccb; ccb* pccb=(ccb *)&tempccb;
if(mode==1) { if (mode == 1)
printf("scanning bus for devices...\n"); printf("scanning bus for devices...\n");
}
for (i = 0; i < CONFIG_SYS_SCSI_MAX_DEVICE; i++) { for (i = 0; i < CONFIG_SYS_SCSI_MAX_DEVICE; i++) {
scsi_dev_desc[i].target = 0xff; scsi_dev_desc[i].target = 0xff;
scsi_dev_desc[i].lun = 0xff; scsi_dev_desc[i].lun = 0xff;
@@ -649,7 +641,8 @@ void scsi_scan(int mode)
scsi_setup_inquiry(pccb); scsi_setup_inquiry(pccb);
if (scsi_exec(pccb) != true) { if (scsi_exec(pccb) != true) {
if(pccb->contr_stat==SCSI_SEL_TIME_OUT) { if(pccb->contr_stat==SCSI_SEL_TIME_OUT) {
debug ("Selection timeout ID %d\n",pccb->target); debug("Selection timeout ID %d\n",
pccb->target);
continue; /* selection timeout => assuming no device present */ continue; /* selection timeout => assuming no device present */
} }
scsi_print_error(pccb); scsi_print_error(pccb);
@@ -657,9 +650,8 @@ void scsi_scan(int mode)
} }
perq = tempbuff[0]; perq = tempbuff[0];
modi = tempbuff[1]; modi = tempbuff[1];
if((perq & 0x1f)==0x1f) { if ((perq & 0x1f) == 0x1f)
continue; /* skip unknown devices */ continue; /* skip unknown devices */
}
if ((modi & 0x80) == 0x80) /* drive is removable */ if ((modi & 0x80) == 0x80) /* drive is removable */
scsi_dev_desc[scsi_max_devs].removable = true; scsi_dev_desc[scsi_max_devs].removable = true;
/* get info for this device */ /* get info for this device */
@@ -675,8 +667,9 @@ void scsi_scan(int mode)
pccb->datalen = 0; pccb->datalen = 0;
scsi_setup_test_unit_ready(pccb); scsi_setup_test_unit_ready(pccb);
if (scsi_exec(pccb) != true) { if (scsi_exec(pccb) != true) {
if (scsi_dev_desc[scsi_max_devs].removable == true) { if (scsi_dev_desc[scsi_max_devs].removable) {
scsi_dev_desc[scsi_max_devs].type=perq; scsi_dev_desc[scsi_max_devs].type =
perq;
goto removable; goto removable;
} }
scsi_print_error(pccb); scsi_print_error(pccb);