diff options
| author | dduvall <none@none> | 2005-09-15 19:32:19 -0700 |
|---|---|---|
| committer | dduvall <none@none> | 2005-09-15 19:32:19 -0700 |
| commit | 8ba1bcfcc383cbdad998864b5dff1133decd99a6 (patch) | |
| tree | f2887d7ee214e65e48f187f54feae06154c416fe /usr/src/uts/common/sys/mpt | |
| parent | df1eb1ade20dc0321e431412bfe7dbe9ddc11780 (diff) | |
| download | illumos-gate-8ba1bcfcc383cbdad998864b5dff1133decd99a6.tar.gz | |
backout 6228874: causes 6322267
Diffstat (limited to 'usr/src/uts/common/sys/mpt')
| -rw-r--r-- | usr/src/uts/common/sys/mpt/mpi_cnfg.h | 12 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/mpt/mpi_ioc.h | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/usr/src/uts/common/sys/mpt/mpi_cnfg.h b/usr/src/uts/common/sys/mpt/mpi_cnfg.h index 1a554dfe5d..ae2a56a668 100644 --- a/usr/src/uts/common/sys/mpt/mpi_cnfg.h +++ b/usr/src/uts/common/sys/mpt/mpi_cnfg.h @@ -1087,8 +1087,7 @@ typedef struct config_page_raid_vol_0 { uint32_t Reserved3; uint8_t NumPhysDisks; uint8_t Reserved4; - uint8_t ResyncRate; - uint8_t Reserved5; + uint16_t Reserved5; raid_vol0_phys_disk_t PhysDisk[MPI_RAID_VOL_PAGE_0_PHYSDISK_MAX]; } config_page_raid_vol_0_t; @@ -1396,19 +1395,16 @@ typedef struct config_page_sas_expander_1 { typedef struct config_page_sas_device_0 { config_extended_page_header_t Header; - uint16_t Slot; - uint16_t EnclosureHandle; + uint32_t Reserved1; uint64_t SASAddress; - uint16_t ParentDevHandle; - uint8_t PhyNum; - uint8_t AccessStatus; + uint32_t Reserved2; uint16_t DevHandle; uint8_t TargetID; uint8_t Bus; uint32_t DeviceInfo; uint16_t Flags; uint8_t PhysicalPort; - uint8_t Reserved2; + uint8_t Reserved3; } config_page_sas_device_0_t; #define MPI_SASDEVICE0_PAGEVERSION 0x00 diff --git a/usr/src/uts/common/sys/mpt/mpi_ioc.h b/usr/src/uts/common/sys/mpt/mpi_ioc.h index f0e01b182f..89066599bc 100644 --- a/usr/src/uts/common/sys/mpt/mpi_ioc.h +++ b/usr/src/uts/common/sys/mpt/mpi_ioc.h @@ -335,8 +335,6 @@ typedef struct msg_event_ack_reply { #define MPI_EVENT_PERSISTENT_TABLE_FULL 0x00000011 #define MPI_EVENT_SAS_PHY_LINK_STATUS 0x00000012 #define MPI_EVENT_SAS_DISCOVERY_ERROR 0x00000013 -#define MPI_EVENT_IR_RESYNC_UPDATE 0x00000014 -#define MPI_EVENT_RSA_EVENT 0x00000015 /* * AckRequired field values |