include/image.h: sparse fixes

[karo-tx-uboot.git] / include / scsi.h

diff --git a/include/scsi.h b/include/scsi.h
index 2be4d4014af1e44a4ac1ffa022402cf7bc6a2350..9da764bdcf31f7fd896ef0d1b8ebea59eebb356d 100644 (file)
--- a/include/scsi.h
+++ b/include/scsi.h
@@ -26,13 +26,15 @@
 
 typedef struct SCSI_cmd_block{
        unsigned char           cmd[16];                                        /* command                                 */
-       unsigned char           sense_buf[64];          /* for request sense */
+       /* for request sense */
+       unsigned char           sense_buf[64]
+               __attribute__((aligned(ARCH_DMA_MINALIGN)));
        unsigned char           status;                                         /* SCSI Status                   */
        unsigned char           target;                                         /* Target ID                             */
        unsigned char           lun;                                                    /* Target LUN        */
        unsigned char           cmdlen;                                         /* command len                          */
        unsigned long           datalen;                                        /* Total data length    */
-       unsigned char   *       pdata;                                          /* pointer to data              */
+       unsigned char   *       pdata;                                          /* pointer to data              */
        unsigned char           msgout[12];                             /* Messge out buffer (NOT USED) */
        unsigned char           msgin[12];                              /* Message in buffer    */
        unsigned char           sensecmdlen;                    /* Sense command len    */
@@ -77,7 +79,7 @@ typedef struct SCSI_cmd_block{
 #define        M_HEAD_TAG      (0x21)
 #define        M_ORDERED_TAG   (0x22)
 #define        M_IGN_RESIDUE   (0x23)
-#define        M_IDENTIFY      (0x80)
+#define        M_IDENTIFY      (0x80)
 
 #define        M_X_MODIFY_DP   (0x00)
 #define        M_X_SYNC_REQ    (0x01)
@@ -148,6 +150,8 @@ typedef struct SCSI_cmd_block{
 #define SCSI_READ6             0x08            /* Read 6-byte (MANDATORY) */
 #define SCSI_READ10            0x28            /* Read 10-byte (MANDATORY) */
 #define SCSI_RD_CAPAC  0x25            /* Read Capacity (MANDATORY) */
+#define SCSI_RD_CAPAC10        SCSI_RD_CAPAC   /* Read Capacity (10) */
+#define SCSI_RD_CAPAC16        0x9e            /* Read Capacity (16) */
 #define SCSI_RD_DEFECT 0x37            /* Read Defect Data (O) */
 #define SCSI_READ_LONG 0x3E            /* Read Long (O) */
 #define SCSI_REASS_BLK 0x07            /* Reassign Blocks (O) */
@@ -185,14 +189,17 @@ void scsi_low_level_init(int busdevfunc);
  * functions residing inside cmd_scsi.c
  */
 void scsi_init(void);
+void scsi_scan(int mode);
 
+/** @return the number of scsi disks */
+int scsi_get_disk_count(void);
 
 #define SCSI_IDENTIFY                                  0xC0  /* not used */
 
 /* Hardware errors  */
 #define SCSI_SEL_TIME_OUT                       0x00000101      /* Selection time out */
 #define SCSI_HNS_TIME_OUT                       0x00000102  /* Handshake */
-#define SCSI_MA_TIME_OUT                        0x00000103  /* Phase error */
+#define SCSI_MA_TIME_OUT                        0x00000103  /* Phase error */
 #define SCSI_UNEXP_DIS                          0x00000104  /* unexpected disconnect */
 
 #define SCSI_INT_STATE                          0x00010000  /* unknown Interrupt number is stored in 16 LSB */