diff options
| author | Colin Yi <Colin.Yi@Sun.COM> | 2008-12-01 16:24:21 +0800 |
|---|---|---|
| committer | Colin Yi <Colin.Yi@Sun.COM> | 2008-12-01 16:24:21 +0800 |
| commit | d8e8ff111cafc1040a5ca27f557872cf79c36c88 (patch) | |
| tree | 1c577c0bea69653f099e6176deef1768119144bc | |
| parent | f06271be56df67ca3faa4ca4bc51457dad15c3b5 (diff) | |
| download | illumos-gate-d8e8ff111cafc1040a5ca27f557872cf79c36c88.tar.gz | |
6776690 Areca raid management util doesn't work on solaris
| -rw-r--r-- | usr/src/uts/intel/io/scsi/adapters/arcmsr/arcmsr.c | 5 | ||||
| -rw-r--r-- | usr/src/uts/intel/io/scsi/adapters/arcmsr/arcmsr.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/usr/src/uts/intel/io/scsi/adapters/arcmsr/arcmsr.c b/usr/src/uts/intel/io/scsi/adapters/arcmsr/arcmsr.c index 290ce70a89..52fda11961 100644 --- a/usr/src/uts/intel/io/scsi/adapters/arcmsr/arcmsr.c +++ b/usr/src/uts/intel/io/scsi/adapters/arcmsr/arcmsr.c @@ -2842,8 +2842,7 @@ arcmsr_cb_ioctl(dev_t dev, int ioctl_cmd, intptr_t arg, int mode, struct ACB *acb; struct CMD_MESSAGE_FIELD *pktioctlfld; int retvalue = 0; - int instance = getminor(dev); - + int instance = MINOR2INST(getminor(dev)); if (instance < 0) return (ENXIO); @@ -2879,7 +2878,7 @@ arcmsr_cb_ioctl(dev_t dev, int ioctl_cmd, intptr_t arg, int mode, goto ioctl_out; } - switch (ioctl_cmd) { + switch ((unsigned int)ioctl_cmd) { case ARCMSR_MESSAGE_READ_RQBUFFER: { unsigned long *ver_addr; diff --git a/usr/src/uts/intel/io/scsi/adapters/arcmsr/arcmsr.h b/usr/src/uts/intel/io/scsi/adapters/arcmsr/arcmsr.h index ae71c002d7..517514890f 100644 --- a/usr/src/uts/intel/io/scsi/adapters/arcmsr/arcmsr.h +++ b/usr/src/uts/intel/io/scsi/adapters/arcmsr/arcmsr.h @@ -81,7 +81,7 @@ #endif /* DEBUG */ -#define ARCMSR_DRIVER_VERSION "1.20.00.15Sun" +#define ARCMSR_DRIVER_VERSION "1.20.00.16Sun" #define ARCMSR_SCSI_INITIATOR_ID 255 #define ARCMSR_DEV_SECTOR_SIZE 512 #define ARCMSR_MAX_XFER_SECTORS 256 @@ -177,7 +177,7 @@ struct CMD_MESSAGE_FIELD { #define ARCMSR_SYS_ERROR_DEVICE_BASE 0x0009 #define ARCMSR_SYS_ERROR_PORT_VALIDATE 0x000A /* DeviceType */ -#define ARECA_SATA_RAID 0x9000000 +#define ARECA_SATA_RAID 0x90000000 /* FunctionCode */ #define FUNCTION_READ_RQBUFFER 0x0801 #define FUNCTION_WRITE_WQBUFFER 0x0802 |