diff options
author | Tom Rini <trini@konsulko.com> | 2016-12-09 07:10:39 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-12-09 07:10:39 -0500 |
commit | 3edc0c252257e4afed163a3a74aba24a5509b198 (patch) | |
tree | de01174e841e19844a158569113c559993764248 /include/scsi.h | |
parent | bb135a0180c31fbd7456021fb9700b49bba7f533 (diff) | |
parent | b63cb3abbc626dc918828f302bd8ea72e7c226d2 (diff) | |
download | u-boot-3edc0c252257e4afed163a3a74aba24a5509b198.tar.gz |
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'include/scsi.h')
-rw-r--r-- | include/scsi.h | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/include/scsi.h b/include/scsi.h index c8796785a4..190dacd0f2 100644 --- a/include/scsi.h +++ b/include/scsi.h @@ -166,8 +166,11 @@ typedef struct SCSI_cmd_block{ void scsi_print_error(ccb *pccb); int scsi_exec(ccb *pccb); void scsi_bus_reset(void); +#if !defined(CONFIG_DM_SCSI) void scsi_low_level_init(int busdevfunc); - +#else +void scsi_low_level_init(int busdevfunc, struct udevice *dev); +#endif /*************************************************************************** * functions residing inside cmd_scsi.c @@ -175,6 +178,21 @@ void scsi_low_level_init(int busdevfunc); void scsi_init(void); int scsi_scan(int mode); +#if defined(CONFIG_DM_SCSI) +/** + * struct scsi_platdata - stores information about SCSI controller + * + * @base: Controller base address + * @max_lun: Maximum number of logical units + * @max_id: Maximum number of target ids + */ +struct scsi_platdata { + unsigned long base; + unsigned long max_lun; + unsigned long max_id; +}; +#endif + #define SCSI_IDENTIFY 0xC0 /* not used */ /* Hardware errors */ |