From 40b37dd836e48d4868a02ec80e4b7351ecea0eaf Mon Sep 17 00:00:00 2001 From: David Gwynne Date: Thu, 29 Jun 2006 08:40:31 +0000 Subject: tweak to make this easier for me to read --- sys/dev/ic/mpireg.h | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'sys/dev') diff --git a/sys/dev/ic/mpireg.h b/sys/dev/ic/mpireg.h index 265cf6cd59b..8c9d303402a 100644 --- a/sys/dev/ic/mpireg.h +++ b/sys/dev/ic/mpireg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mpireg.h,v 1.19 2006/06/29 08:35:08 dlg Exp $ */ +/* $OpenBSD: mpireg.h,v 1.20 2006/06/29 08:40:30 dlg Exp $ */ /* * Copyright (c) 2005 David Gwynne @@ -1015,6 +1015,7 @@ struct mpi_cfg_raid_vol { u_int8_t vol_bus; u_int8_t vol_ioc; u_int8_t vol_page; + u_int8_t vol_type; #define MPI_CFG_RAID_TYPE_RAID_IS (1<<0) /* RAID 0 */ #define MPI_CFG_RAID_TYPE_RAID_IME (1<<1) /* RAID 1 */ @@ -1034,6 +1035,7 @@ struct mpi_cfg_ioc_pg2 { struct mpi_cfg_hdr config_header; u_int32_t capabilities; + u_int8_t no_active_vols; u_int8_t max_vols; u_int8_t no_active_phys_disks; @@ -1053,6 +1055,7 @@ struct mpi_cfg_ioc_pg3 { u_int8_t no_phys_disks; u_int8_t reserved[3]; + struct mpi_cfg_raid_pd phys_disks[1]; /* length stored in header */ } __packed; @@ -1060,21 +1063,34 @@ struct mpi_cfg_fc_port_pg0 { struct mpi_cfg_hdr config_header; u_int32_t flags; + u_int8_t mpi_port_nr; u_int8_t link_type; u_int8_t port_state; u_int8_t reserved1; + u_int32_t port_id; + u_int64_t wwnn; + u_int64_t wwpn; + u_int32_t supported_service_class; + u_int32_t supported_speeds; + u_int32_t current_speed; + u_int32_t max_frame_size; + u_int64_t fabric_wwnn; + u_int64_t fabric_wwpn; + u_int32_t discovered_port_count; + u_int32_t max_initiators; + u_int8_t max_aliases_supported; u_int8_t max_hard_aliases_supported; u_int8_t num_current_aliases; @@ -1085,14 +1101,19 @@ struct mpi_cfg_fc_device_pg0 { struct mpi_cfg_hdr config_header; u_int64_t wwnn; + u_int64_t wwpn; + u_int32_t port_id; + u_int8_t protocol; u_int8_t flags; u_int16_t bb_credit; + u_int16_t max_rx_frame_size; u_int8_t adisc_hard_alpa; u_int8_t port_nr; + u_int8_t fc_ph_low_version; u_int8_t fc_ph_high_version; u_int8_t current_target_id; -- cgit v1.2.3