From owner-svn-src-all@freebsd.org Tue Sep 1 22:07:14 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 70C6637E7BB; Tue, 1 Sep 2020 22:07:14 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1QB24gYz4fQx; Tue, 1 Sep 2020 22:07:14 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 520CC2070C; Tue, 1 Sep 2020 22:07:13 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M7DTo055858; Tue, 1 Sep 2020 22:07:13 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M7Dkl055855; Tue, 1 Sep 2020 22:07:13 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012207.081M7Dkl055855@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:07:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365204 - in head/sys/dev/mpr: . mpi X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/dev/mpr: . mpi X-SVN-Commit-Revision: 365204 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:07:14 -0000 Author: mjg Date: Tue Sep 1 22:07:12 2020 New Revision: 365204 URL: https://svnweb.freebsd.org/changeset/base/365204 Log: mpr: clean up empty lines in .c and .h files Modified: head/sys/dev/mpr/mpi/mpi2.h head/sys/dev/mpr/mpi/mpi2_cnfg.h head/sys/dev/mpr/mpi/mpi2_hbd.h head/sys/dev/mpr/mpi/mpi2_init.h head/sys/dev/mpr/mpi/mpi2_ioc.h head/sys/dev/mpr/mpi/mpi2_pci.h head/sys/dev/mpr/mpi/mpi2_ra.h head/sys/dev/mpr/mpi/mpi2_raid.h head/sys/dev/mpr/mpi/mpi2_sas.h head/sys/dev/mpr/mpi/mpi2_targ.h head/sys/dev/mpr/mpi/mpi2_tool.h head/sys/dev/mpr/mpi/mpi2_type.h head/sys/dev/mpr/mpr.c head/sys/dev/mpr/mpr_config.c head/sys/dev/mpr/mpr_ioctl.h head/sys/dev/mpr/mpr_mapping.c head/sys/dev/mpr/mpr_pci.c head/sys/dev/mpr/mpr_sas.c head/sys/dev/mpr/mpr_sas_lsi.c head/sys/dev/mpr/mpr_table.c head/sys/dev/mpr/mpr_user.c head/sys/dev/mpr/mprvar.h Modified: head/sys/dev/mpr/mpi/mpi2.h ============================================================================== --- head/sys/dev/mpr/mpi/mpi2.h Tue Sep 1 22:07:00 2020 (r365203) +++ head/sys/dev/mpr/mpi/mpi2.h Tue Sep 1 22:07:12 2020 (r365204) @@ -160,7 +160,6 @@ #ifndef MPI2_H #define MPI2_H - /***************************************************************************** * * MPI Version Definitions @@ -181,21 +180,18 @@ MPI2_VERSION_MINOR) #define MPI2_VERSION_02_00 (0x0200) - /* minor version for MPI v2.5 compatible products */ #define MPI25_VERSION_MINOR (0x05) #define MPI25_VERSION ((MPI2_VERSION_MAJOR << MPI2_VERSION_MAJOR_SHIFT) | \ MPI25_VERSION_MINOR) #define MPI2_VERSION_02_05 (0x0205) - /* minor version for MPI v2.6 compatible products */ #define MPI26_VERSION_MINOR (0x06) #define MPI26_VERSION ((MPI2_VERSION_MAJOR << MPI2_VERSION_MAJOR_SHIFT) | \ MPI26_VERSION_MINOR) #define MPI2_VERSION_02_06 (0x0206) - /* Unit and Dev versioning for this MPI header set */ #define MPI2_HEADER_VERSION_UNIT (0x34) #define MPI2_HEADER_VERSION_DEV (0x00) @@ -205,7 +201,6 @@ #define MPI2_HEADER_VERSION_DEV_SHIFT (0) #define MPI2_HEADER_VERSION ((MPI2_HEADER_VERSION_UNIT << 8) | MPI2_HEADER_VERSION_DEV) - /***************************************************************************** * * IOC State Definitions @@ -224,7 +219,6 @@ #define MPI2_FAULT_PRODUCT_SPECIFIC_MIN (0x0000) #define MPI2_FAULT_PRODUCT_SPECIFIC_MAX (0xEFFF) - /***************************************************************************** * * System Interface Register Definitions @@ -280,7 +274,6 @@ typedef volatile struct _MPI2_SYSTEM_INTERFACE_REGS #define MPI2_DOORBELL_ADD_DWORDS_MASK (0x00FF0000) #define MPI2_DOORBELL_ADD_DWORDS_SHIFT (16) - /* * Defines for the WriteSequence register */ @@ -371,7 +364,6 @@ typedef volatile struct _MPI2_SYSTEM_INTERFACE_REGS #define MPI2_RPHI_MSIX_INDEX_SHIFT (24) #define MPI25_SUP_REPLY_POST_HOST_INDEX_OFFSET (0x0000030C) /* MPI v2.5 only */ - /* * Defines for the HCBSize and address */ @@ -397,7 +389,6 @@ typedef volatile struct _MPI2_SYSTEM_INTERFACE_REGS #define MPI2_REQUEST_DESCRIPTOR_POST_HIGH_OFFSET (0x000000C4) #define MPI26_ATOMIC_REQUEST_DESCRIPTOR_POST_OFFSET (0x000000C8) - /* Hard Reset delay timings */ #define MPI2_HARD_RESET_PCIE_FIRST_READ_DELAY_MICRO_SEC (50000) #define MPI2_HARD_RESET_PCIE_RESET_READ_WINDOW_MICRO_SEC (255000) @@ -436,7 +427,6 @@ typedef struct _MPI2_DEFAULT_REQUEST_DESCRIPTOR #define MPI2_REQ_DESCRIPT_FLAGS_IOC_FIFO_MARKER (0x01) - /* High Priority Request Descriptor */ typedef struct _MPI2_HIGH_PRIORITY_REQUEST_DESCRIPTOR { @@ -450,7 +440,6 @@ typedef struct _MPI2_HIGH_PRIORITY_REQUEST_DESCRIPTOR Mpi2HighPriorityRequestDescriptor_t, MPI2_POINTER pMpi2HighPriorityRequestDescriptor_t; - /* SCSI IO Request Descriptor */ typedef struct _MPI2_SCSI_IO_REQUEST_DESCRIPTOR { @@ -463,7 +452,6 @@ typedef struct _MPI2_SCSI_IO_REQUEST_DESCRIPTOR MPI2_POINTER PTR_MPI2_SCSI_IO_REQUEST_DESCRIPTOR, Mpi2SCSIIORequestDescriptor_t, MPI2_POINTER pMpi2SCSIIORequestDescriptor_t; - /* SCSI Target Request Descriptor */ typedef struct _MPI2_SCSI_TARGET_REQUEST_DESCRIPTOR { @@ -477,7 +465,6 @@ typedef struct _MPI2_SCSI_TARGET_REQUEST_DESCRIPTOR Mpi2SCSITargetRequestDescriptor_t, MPI2_POINTER pMpi2SCSITargetRequestDescriptor_t; - /* RAID Accelerator Request Descriptor */ typedef struct _MPI2_RAID_ACCEL_REQUEST_DESCRIPTOR { @@ -491,7 +478,6 @@ typedef struct _MPI2_RAID_ACCEL_REQUEST_DESCRIPTOR Mpi2RAIDAcceleratorRequestDescriptor_t, MPI2_POINTER pMpi2RAIDAcceleratorRequestDescriptor_t; - /* Fast Path SCSI IO Request Descriptor */ typedef MPI2_SCSI_IO_REQUEST_DESCRIPTOR MPI25_FP_SCSI_IO_REQUEST_DESCRIPTOR, @@ -499,7 +485,6 @@ typedef MPI2_SCSI_IO_REQUEST_DESCRIPTOR Mpi25FastPathSCSIIORequestDescriptor_t, MPI2_POINTER pMpi25FastPathSCSIIORequestDescriptor_t; - /* PCIe Encapsulated Request Descriptor */ typedef MPI2_SCSI_IO_REQUEST_DESCRIPTOR MPI26_PCIE_ENCAPSULATED_REQUEST_DESCRIPTOR, @@ -507,7 +492,6 @@ typedef MPI2_SCSI_IO_REQUEST_DESCRIPTOR Mpi26PCIeEncapsulatedRequestDescriptor_t, MPI2_POINTER pMpi26PCIeEncapsulatedRequestDescriptor_t; - /* union of Request Descriptors */ typedef union _MPI2_REQUEST_DESCRIPTOR_UNION { @@ -522,7 +506,6 @@ typedef union _MPI2_REQUEST_DESCRIPTOR_UNION } MPI2_REQUEST_DESCRIPTOR_UNION, MPI2_POINTER PTR_MPI2_REQUEST_DESCRIPTOR_UNION, Mpi2RequestDescriptorUnion_t, MPI2_POINTER pMpi2RequestDescriptorUnion_t; - /* Atomic Request Descriptors */ /* @@ -549,7 +532,6 @@ typedef struct _MPI26_ATOMIC_REQUEST_DESCRIPTOR /* for the RequestFlags field, use the same defines as MPI2_DEFAULT_REQUEST_DESCRIPTOR */ - /* Reply Descriptors */ /* Default Reply Descriptor */ @@ -589,7 +571,6 @@ typedef struct _MPI2_ADDRESS_REPLY_DESCRIPTOR #define MPI2_ADDRESS_REPLY_SMID_INVALID (0x00) - /* SCSI IO Success Reply Descriptor */ typedef struct _MPI2_SCSI_IO_SUCCESS_REPLY_DESCRIPTOR { @@ -603,7 +584,6 @@ typedef struct _MPI2_SCSI_IO_SUCCESS_REPLY_DESCRIPTOR Mpi2SCSIIOSuccessReplyDescriptor_t, MPI2_POINTER pMpi2SCSIIOSuccessReplyDescriptor_t; - /* TargetAssist Success Reply Descriptor */ typedef struct _MPI2_TARGETASSIST_SUCCESS_REPLY_DESCRIPTOR { @@ -618,7 +598,6 @@ typedef struct _MPI2_TARGETASSIST_SUCCESS_REPLY_DESCRI Mpi2TargetAssistSuccessReplyDescriptor_t, MPI2_POINTER pMpi2TargetAssistSuccessReplyDescriptor_t; - /* Target Command Buffer Reply Descriptor */ typedef struct _MPI2_TARGET_COMMAND_BUFFER_REPLY_DESCRIPTOR { @@ -636,7 +615,6 @@ typedef struct _MPI2_TARGET_COMMAND_BUFFER_REPLY_DESCR /* defines for Flags field */ #define MPI2_RPY_DESCRIPT_TCB_FLAGS_PHYNUM_MASK (0x3F) - /* RAID Accelerator Success Reply Descriptor */ typedef struct _MPI2_RAID_ACCELERATOR_SUCCESS_REPLY_DESCRIPTOR { @@ -649,7 +627,6 @@ typedef struct _MPI2_RAID_ACCELERATOR_SUCCESS_REPLY_DE Mpi2RAIDAcceleratorSuccessReplyDescriptor_t, MPI2_POINTER pMpi2RAIDAcceleratorSuccessReplyDescriptor_t; - /* Fast Path SCSI IO Success Reply Descriptor */ typedef MPI2_SCSI_IO_SUCCESS_REPLY_DESCRIPTOR MPI25_FP_SCSI_IO_SUCCESS_REPLY_DESCRIPTOR, @@ -657,7 +634,6 @@ typedef MPI2_SCSI_IO_SUCCESS_REPLY_DESCRIPTOR Mpi25FastPathSCSIIOSuccessReplyDescriptor_t, MPI2_POINTER pMpi25FastPathSCSIIOSuccessReplyDescriptor_t; - /* PCIe Encapsulated Success Reply Descriptor */ typedef MPI2_RAID_ACCELERATOR_SUCCESS_REPLY_DESCRIPTOR MPI26_PCIE_ENCAPSULATED_SUCCESS_REPLY_DESCRIPTOR, @@ -665,7 +641,6 @@ typedef MPI2_RAID_ACCELERATOR_SUCCESS_REPLY_DESCRIPTOR Mpi26PCIeEncapsulatedSuccessReplyDescriptor_t, MPI2_POINTER pMpi26PCIeEncapsulatedSuccessReplyDescriptor_t; - /* union of Reply Descriptors */ typedef union _MPI2_REPLY_DESCRIPTORS_UNION { @@ -681,8 +656,6 @@ typedef union _MPI2_REPLY_DESCRIPTORS_UNION } MPI2_REPLY_DESCRIPTORS_UNION, MPI2_POINTER PTR_MPI2_REPLY_DESCRIPTORS_UNION, Mpi2ReplyDescriptorsUnion_t, MPI2_POINTER pMpi2ReplyDescriptorsUnion_t; - - /***************************************************************************** * * Message Functions @@ -723,13 +696,10 @@ typedef union _MPI2_REPLY_DESCRIPTORS_UNION #define MPI2_FUNCTION_MIN_PRODUCT_SPECIFIC (0xF0) /* beginning of product-specific range */ #define MPI2_FUNCTION_MAX_PRODUCT_SPECIFIC (0xFF) /* end of product-specific range */ - - /* Doorbell functions */ #define MPI2_FUNCTION_IOC_MESSAGE_UNIT_RESET (0x40) #define MPI2_FUNCTION_HANDSHAKE (0x42) - /***************************************************************************** * * IOC Status Values @@ -844,7 +814,6 @@ typedef union _MPI2_REPLY_DESCRIPTORS_UNION #define MPI2_IOCLOGINFO_TYPE_ISCSI (0x4) #define MPI2_IOCLOGINFO_LOG_DATA_MASK (0x0FFFFFFF) - /***************************************************************************** * * Standard Message Structures @@ -869,7 +838,6 @@ typedef struct _MPI2_REQUEST_HEADER } MPI2_REQUEST_HEADER, MPI2_POINTER PTR_MPI2_REQUEST_HEADER, MPI2RequestHeader_t, MPI2_POINTER pMPI2RequestHeader_t; - /**************************************************************************** * Default Reply ****************************************************************************/ @@ -891,7 +859,6 @@ typedef struct _MPI2_DEFAULT_REPLY } MPI2_DEFAULT_REPLY, MPI2_POINTER PTR_MPI2_DEFAULT_REPLY, MPI2DefaultReply_t, MPI2_POINTER pMPI2DefaultReply_t; - /* common version structure/union used in messages and configuration pages */ typedef struct _MPI2_VERSION_STRUCT @@ -908,7 +875,6 @@ typedef union _MPI2_VERSION_UNION U32 Word; } MPI2_VERSION_UNION; - /* LUN field defines, common to many structures */ #define MPI2_LUN_FIRST_LEVEL_ADDRESSING (0x0000FFFF) #define MPI2_LUN_SECOND_LEVEL_ADDRESSING (0xFFFF0000) @@ -917,7 +883,6 @@ typedef union _MPI2_VERSION_UNION #define MPI2_LUN_LEVEL_1_WORD (0xFF00) #define MPI2_LUN_LEVEL_1_DWORD (0x0000FF00) - /***************************************************************************** * * Fusion-MPT MPI Scatter Gather Elements @@ -953,7 +918,6 @@ typedef struct _MPI2_SGE_SIMPLE_UNION } MPI2_SGE_SIMPLE_UNION, MPI2_POINTER PTR_MPI2_SGE_SIMPLE_UNION, Mpi2SGESimpleUnion_t, MPI2_POINTER pMpi2SGESimpleUnion_t; - /**************************************************************************** * MPI Chain Element structures - for MPI v2.0 products only ****************************************************************************/ @@ -989,7 +953,6 @@ typedef struct _MPI2_SGE_CHAIN_UNION } MPI2_SGE_CHAIN_UNION, MPI2_POINTER PTR_MPI2_SGE_CHAIN_UNION, Mpi2SGEChainUnion_t, MPI2_POINTER pMpi2SGEChainUnion_t; - /**************************************************************************** * MPI Transaction Context Element structures - for MPI v2.0 products only ****************************************************************************/ @@ -1055,7 +1018,6 @@ typedef struct _MPI2_SGE_TRANSACTION_UNION } MPI2_SGE_TRANSACTION_UNION, MPI2_POINTER PTR_MPI2_SGE_TRANSACTION_UNION, Mpi2SGETransactionUnion_t, MPI2_POINTER pMpi2SGETransactionUnion_t; - /**************************************************************************** * MPI SGE union for IO SGL's - for MPI v2.0 products only ****************************************************************************/ @@ -1070,7 +1032,6 @@ typedef struct _MPI2_MPI_SGE_IO_UNION } MPI2_MPI_SGE_IO_UNION, MPI2_POINTER PTR_MPI2_MPI_SGE_IO_UNION, Mpi2MpiSGEIOUnion_t, MPI2_POINTER pMpi2MpiSGEIOUnion_t; - /**************************************************************************** * MPI SGE union for SGL's with Simple and Transaction elements - for MPI v2.0 products only ****************************************************************************/ @@ -1085,7 +1046,6 @@ typedef struct _MPI2_SGE_TRANS_SIMPLE_UNION } MPI2_SGE_TRANS_SIMPLE_UNION, MPI2_POINTER PTR_MPI2_SGE_TRANS_SIMPLE_UNION, Mpi2SGETransSimpleUnion_t, MPI2_POINTER pMpi2SGETransSimpleUnion_t; - /**************************************************************************** * All MPI SGE types union ****************************************************************************/ @@ -1101,7 +1061,6 @@ typedef struct _MPI2_MPI_SGE_UNION } MPI2_MPI_SGE_UNION, MPI2_POINTER PTR_MPI2_MPI_SGE_UNION, Mpi2MpiSgeUnion_t, MPI2_POINTER pMpi2MpiSgeUnion_t; - /**************************************************************************** * MPI SGE field definition and masks ****************************************************************************/ @@ -1177,7 +1136,6 @@ typedef struct _MPI2_MPI_SGE_UNION #define MPI2_GET_CHAIN_OFFSET(x) ((x & MPI2_SGE_CHAIN_OFFSET_MASK) >> MPI2_SGE_CHAIN_OFFSET_SHIFT) - /***************************************************************************** * * Fusion-MPT IEEE Scatter Gather Elements @@ -1213,7 +1171,6 @@ typedef union _MPI2_IEEE_SGE_SIMPLE_UNION } MPI2_IEEE_SGE_SIMPLE_UNION, MPI2_POINTER PTR_MPI2_IEEE_SGE_SIMPLE_UNION, Mpi2IeeeSgeSimpleUnion_t, MPI2_POINTER pMpi2IeeeSgeSimpleUnion_t; - /**************************************************************************** * IEEE Chain Element structures ****************************************************************************/ @@ -1242,7 +1199,6 @@ typedef struct _MPI25_IEEE_SGE_CHAIN64 } MPI25_IEEE_SGE_CHAIN64, MPI2_POINTER PTR_MPI25_IEEE_SGE_CHAIN64, Mpi25IeeeSgeChain64_t, MPI2_POINTER pMpi25IeeeSgeChain64_t; - /**************************************************************************** * All IEEE SGE types union ****************************************************************************/ @@ -1258,7 +1214,6 @@ typedef struct _MPI2_IEEE_SGE_UNION } MPI2_IEEE_SGE_UNION, MPI2_POINTER PTR_MPI2_IEEE_SGE_UNION, Mpi2IeeeSgeUnion_t, MPI2_POINTER pMpi2IeeeSgeUnion_t; - /**************************************************************************** * IEEE SGE union for IO SGL's ****************************************************************************/ @@ -1270,7 +1225,6 @@ typedef union _MPI25_SGE_IO_UNION } MPI25_SGE_IO_UNION, MPI2_POINTER PTR_MPI25_SGE_IO_UNION, Mpi25SGEIOUnion_t, MPI2_POINTER pMpi25SGEIOUnion_t; - /**************************************************************************** * IEEE SGE field definitions and masks ****************************************************************************/ @@ -1327,8 +1281,6 @@ typedef union _MPI25_SGE_IO_UNION #define MPI2_IEEE32_pSGE_SET_FLAGS(psg,f) (psg)->FlagsLength |= MPI2_IEEE32_SGE_SET_FLAGS(f) #define MPI2_IEEE32_pSGE_SET_LENGTH(psg,l) (psg)->FlagsLength |= MPI2_IEEE32_SGE_LENGTH(l) - - /***************************************************************************** * * Fusion-MPT MPI/IEEE Scatter Gather Unions @@ -1342,7 +1294,6 @@ typedef union _MPI2_SIMPLE_SGE_UNION } MPI2_SIMPLE_SGE_UNION, MPI2_POINTER PTR_MPI2_SIMPLE_SGE_UNION, Mpi2SimpleSgeUntion_t, MPI2_POINTER pMpi2SimpleSgeUntion_t; - typedef union _MPI2_SGE_IO_UNION { MPI2_SGE_SIMPLE_UNION MpiSimple; @@ -1352,7 +1303,6 @@ typedef union _MPI2_SGE_IO_UNION } MPI2_SGE_IO_UNION, MPI2_POINTER PTR_MPI2_SGE_IO_UNION, Mpi2SGEIOUnion_t, MPI2_POINTER pMpi2SGEIOUnion_t; - /**************************************************************************** * * Values for SGLFlags field, used in many request messages with an SGL @@ -1372,6 +1322,4 @@ typedef union _MPI2_SGE_IO_UNION #define MPI2_SGLFLAGS_SGL_TYPE_IEEE32 (0x01) /* MPI v2.0 products only */ #define MPI2_SGLFLAGS_SGL_TYPE_IEEE64 (0x02) - #endif - Modified: head/sys/dev/mpr/mpi/mpi2_cnfg.h ============================================================================== --- head/sys/dev/mpr/mpi/mpi2_cnfg.h Tue Sep 1 22:07:00 2020 (r365203) +++ head/sys/dev/mpr/mpi/mpi2_cnfg.h Tue Sep 1 22:07:12 2020 (r365204) @@ -329,7 +329,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION } MPI2_CONFIG_EXT_PAGE_HEADER_UNION, MPI2_POINTER PTR_MPI2_CONFIG_EXT_PAGE_HEADER_UNION, Mpi2ConfigPageExtendedHeaderUnion, MPI2_POINTER pMpi2ConfigPageExtendedHeaderUnion; - /* PageType field values */ #define MPI2_CONFIG_PAGEATTR_READ_ONLY (0x00) #define MPI2_CONFIG_PAGEATTR_CHANGEABLE (0x10) @@ -347,7 +346,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_CONFIG_TYPENUM_MASK (0x0FFF) - /* ExtPageType field values */ #define MPI2_CONFIG_EXTPAGETYPE_SAS_IO_UNIT (0x10) #define MPI2_CONFIG_EXTPAGETYPE_SAS_EXPANDER (0x11) @@ -367,7 +365,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION /* Product specific reserved values 0xE0 - 0xEF */ /* Vendor specific reserved values 0xF0 - 0xFF */ - /***************************************************************************** * PageAddress defines *****************************************************************************/ @@ -379,7 +376,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_RAID_VOLUME_PGAD_HANDLE_MASK (0x0000FFFF) - /* RAID Physical Disk PageAddress format */ #define MPI2_PHYSDISK_PGAD_FORM_MASK (0xF0000000) #define MPI2_PHYSDISK_PGAD_FORM_GET_NEXT_PHYSDISKNUM (0x00000000) @@ -389,7 +385,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_PHYSDISK_PGAD_PHYSDISKNUM_MASK (0x000000FF) #define MPI2_PHYSDISK_PGAD_DEVHANDLE_MASK (0x0000FFFF) - /* SAS Expander PageAddress format */ #define MPI2_SAS_EXPAND_PGAD_FORM_MASK (0xF0000000) #define MPI2_SAS_EXPAND_PGAD_FORM_GET_NEXT_HNDL (0x00000000) @@ -400,7 +395,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_SAS_EXPAND_PGAD_PHYNUM_MASK (0x00FF0000) #define MPI2_SAS_EXPAND_PGAD_PHYNUM_SHIFT (16) - /* SAS Device PageAddress format */ #define MPI2_SAS_DEVICE_PGAD_FORM_MASK (0xF0000000) #define MPI2_SAS_DEVICE_PGAD_FORM_GET_NEXT_HANDLE (0x00000000) @@ -408,7 +402,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_SAS_DEVICE_PGAD_HANDLE_MASK (0x0000FFFF) - /* SAS PHY PageAddress format */ #define MPI2_SAS_PHY_PGAD_FORM_MASK (0xF0000000) #define MPI2_SAS_PHY_PGAD_FORM_PHY_NUMBER (0x00000000) @@ -417,7 +410,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_SAS_PHY_PGAD_PHY_NUMBER_MASK (0x000000FF) #define MPI2_SAS_PHY_PGAD_PHY_TBL_INDEX_MASK (0x0000FFFF) - /* SAS Port PageAddress format */ #define MPI2_SASPORT_PGAD_FORM_MASK (0xF0000000) #define MPI2_SASPORT_PGAD_FORM_GET_NEXT_PORT (0x00000000) @@ -425,7 +417,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_SASPORT_PGAD_PORTNUMBER_MASK (0x00000FFF) - /* SAS Enclosure PageAddress format */ #define MPI2_SAS_ENCLOS_PGAD_FORM_MASK (0xF0000000) #define MPI2_SAS_ENCLOS_PGAD_FORM_GET_NEXT_HANDLE (0x00000000) @@ -448,7 +439,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_RAID_PGAD_CONFIGNUM_MASK (0x000000FF) - /* Driver Persistent Mapping PageAddress format */ #define MPI2_DPM_PGAD_FORM_MASK (0xF0000000) #define MPI2_DPM_PGAD_FORM_ENTRY_RANGE (0x00000000) @@ -457,14 +447,12 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_DPM_PGAD_ENTRY_COUNT_SHIFT (16) #define MPI2_DPM_PGAD_START_ENTRY_MASK (0x0000FFFF) - /* Ethernet PageAddress format */ #define MPI2_ETHERNET_PGAD_FORM_MASK (0xF0000000) #define MPI2_ETHERNET_PGAD_FORM_IF_NUM (0x00000000) #define MPI2_ETHERNET_PGAD_IF_NUMBER_MASK (0x000000FF) - /* PCIe Switch PageAddress format */ #define MPI26_PCIE_SWITCH_PGAD_FORM_MASK (0xF0000000) #define MPI26_PCIE_SWITCH_PGAD_FORM_GET_NEXT_HNDL (0x00000000) @@ -475,7 +463,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI26_PCIE_SWITCH_PGAD_PORTNUM_MASK (0x00FF0000) #define MPI26_PCIE_SWITCH_PGAD_PORTNUM_SHIFT (16) - /* PCIe Device PageAddress format */ #define MPI26_PCIE_DEVICE_PGAD_FORM_MASK (0xF0000000) #define MPI26_PCIE_DEVICE_PGAD_FORM_GET_NEXT_HANDLE (0x00000000) @@ -490,8 +477,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI26_PCIE_DEVICE_PGAD_LINKNUM_MASK (0x000000FF) - - /**************************************************************************** * Configuration messages ****************************************************************************/ @@ -531,7 +516,6 @@ typedef struct _MPI2_CONFIG_REQUEST /* use MPI2_SGLFLAGS_ defines from mpi2.h for the SGLFlags field */ - /* Config Reply Message */ typedef struct _MPI2_CONFIG_REPLY { @@ -552,8 +536,6 @@ typedef struct _MPI2_CONFIG_REPLY } MPI2_CONFIG_REPLY, MPI2_POINTER PTR_MPI2_CONFIG_REPLY, Mpi2ConfigReply_t, MPI2_POINTER pMpi2ConfigReply_t; - - /***************************************************************************** * * C o n f i g u r a t i o n P a g e s @@ -630,7 +612,6 @@ typedef struct _MPI2_CONFIG_REPLY #define MPI26_MFGPAGE_DEVID_HARD_SEC_SAS3816 (0x00E6) #define MPI26_MFGPAGE_DEVID_INVALID1_SAS3816 (0x00E7) - /* Manufacturing Page 0 */ typedef struct _MPI2_CONFIG_PAGE_MAN_0 @@ -647,7 +628,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_0 #define MPI2_MANUFACTURING0_PAGEVERSION (0x00) - /* Manufacturing Page 1 */ typedef struct _MPI2_CONFIG_PAGE_MAN_1 @@ -660,7 +640,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_1 #define MPI2_MANUFACTURING1_PAGEVERSION (0x00) - typedef struct _MPI2_CHIP_REVISION_ID { U16 DeviceID; /* 0x00 */ @@ -669,7 +648,6 @@ typedef struct _MPI2_CHIP_REVISION_ID } MPI2_CHIP_REVISION_ID, MPI2_POINTER PTR_MPI2_CHIP_REVISION_ID, Mpi2ChipRevisionId_t, MPI2_POINTER pMpi2ChipRevisionId_t; - /* Manufacturing Page 2 */ /* @@ -691,7 +669,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_2 #define MPI2_MANUFACTURING2_PAGEVERSION (0x00) - /* Manufacturing Page 3 */ /* @@ -713,7 +690,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_3 #define MPI2_MANUFACTURING3_PAGEVERSION (0x00) - /* Manufacturing Page 4 */ typedef struct _MPI2_MANPAGE4_PWR_SAVE_SETTINGS @@ -789,7 +765,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_4 #define MPI2_MANPAGE4_IM_RESYNC_CACHE_ENABLE (0x00000002) #define MPI2_MANPAGE4_IR_NO_MIX_SAS_SATA (0x00000001) - /* Manufacturing Page 5 */ /* @@ -822,7 +797,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_5 #define MPI2_MANUFACTURING5_PAGEVERSION (0x03) - /* Manufacturing Page 6 */ typedef struct _MPI2_CONFIG_PAGE_MAN_6 @@ -835,7 +809,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_6 #define MPI2_MANUFACTURING6_PAGEVERSION (0x00) - /* Manufacturing Page 7 */ typedef struct _MPI2_MANPAGE7_CONNECTOR_INFO @@ -918,7 +891,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_7 #define MPI2_MANPAGE7_FLAG_EVENTREPLAY_SLOT_ORDER (0x00000002) #define MPI2_MANPAGE7_FLAG_USE_SLOT_INFO (0x00000001) - /* * Generic structure to use for product-specific manufacturing pages * (currently Manufacturing Page 8 through Manufacturing Page 31). @@ -957,7 +929,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_PS #define MPI2_MANUFACTURING30_PAGEVERSION (0x00) #define MPI2_MANUFACTURING31_PAGEVERSION (0x00) - /**************************************************************************** * IO Unit Config Pages ****************************************************************************/ @@ -975,7 +946,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_0 #define MPI2_IOUNITPAGE0_PAGEVERSION (0x02) - /* IO Unit Page 1 */ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_1 @@ -1006,7 +976,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_1 #define MPI2_IOUNITPAGE1_DISABLE_TASK_SET_FULL_HANDLING (0x00000020) #define MPI2_IOUNITPAGE1_IR_USE_STATIC_VOLUME_ID (0x00000004) - /* IO Unit Page 3 */ /* @@ -1035,7 +1004,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_3 #define MPI2_IOUNITPAGE3_GPIO_SETTING_OFF (0x0000) #define MPI2_IOUNITPAGE3_GPIO_SETTING_ON (0x0001) - /* IO Unit Page 5 */ /* @@ -1074,7 +1042,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_5 #define MPI2_IOUNITPAGE5_DMA_CAP_HASHING (0x0002) #define MPI2_IOUNITPAGE5_DMA_CAP_ENCRYPTION (0x0001) - /* IO Unit Page 6 */ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_6 @@ -1095,7 +1062,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_6 /* defines for IO Unit Page 6 Flags field */ #define MPI2_IOUNITPAGE6_FLAGS_ENABLE_RAID_ACCELERATOR (0x0001) - /* IO Unit Page 7 */ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_7 @@ -1138,7 +1104,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_7 #define MPI25_IOUNITPAGE7_PM_MODE_REDUCED_POWER (0x05) #define MPI25_IOUNITPAGE7_PM_MODE_STANDBY (0x06) - /* defines for IO Unit Page 7 PCIeWidth field */ #define MPI2_IOUNITPAGE7_PCIE_WIDTH_X1 (0x01) #define MPI2_IOUNITPAGE7_PCIE_WIDTH_X2 (0x02) @@ -1188,7 +1153,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_7 #define MPI2_IOUNITPAGE7_PMCAP_PCIE_WIDTH_CHANGE (0x00000008) /* obsolete */ #define MPI2_IOUNITPAGE7_PMCAP_PCIE_SPEED_CHANGE (0x00000004) /* obsolete */ - /* defines for IO Unit Page 7 IOCTemperatureUnits field */ #define MPI2_IOUNITPAGE7_IOC_TEMP_NOT_PRESENT (0x00) #define MPI2_IOUNITPAGE7_IOC_TEMP_FAHRENHEIT (0x01) @@ -1208,7 +1172,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_7 /* defines for IO Unit Page 7 Flags field */ #define MPI2_IOUNITPAGE7_FLAG_CABLE_POWER_EXC (0x01) - /* IO Unit Page 8 */ #define MPI2_IOUNIT8_NUM_THRESHOLDS (4) @@ -1252,7 +1215,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_8 #define MPI2_IOUNITPAGE8_PAGEVERSION (0x00) - /* IO Unit Page 9 */ typedef struct _MPI2_IOUNIT9_SENSOR @@ -1292,7 +1254,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_9 #define MPI2_IOUNITPAGE9_PAGEVERSION (0x00) - /* IO Unit Page 10 */ typedef struct _MPI2_IOUNIT10_FUNCTION @@ -1325,7 +1286,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_10 #define MPI2_IOUNITPAGE10_PAGEVERSION (0x01) - /* IO Unit Page 11 (for MPI v2.6 and later) */ typedef struct _MPI26_IOUNIT11_SPINUP_GROUP @@ -1340,7 +1300,6 @@ typedef struct _MPI26_IOUNIT11_SPINUP_GROUP /* defines for IO Unit Page 11 SpinupFlags */ #define MPI26_IOUNITPAGE11_SPINUP_DISABLE_FLAG (0x01) - /* * Host code (drivers, BIOS, utilities, etc.) should leave this define set to * four and check the value returned for NumPhys at runtime. @@ -1377,8 +1336,6 @@ typedef struct _MPI26_CONFIG_PAGE_IO_UNIT_11 /* defines for PHY field */ #define MPI26_IOUNITPAGE11_PHY_SPINUP_GROUP_MASK (0x03) - - /**************************************************************************** * IOC Config Pages ****************************************************************************/ @@ -1403,7 +1360,6 @@ typedef struct _MPI2_CONFIG_PAGE_IOC_0 #define MPI2_IOCPAGE0_PAGEVERSION (0x02) - /* IOC Page 1 */ typedef struct _MPI2_CONFIG_PAGE_IOC_1 @@ -1474,7 +1430,6 @@ typedef struct _MPI2_CONFIG_PAGE_IOC_6 #define MPI2_IOCPAGE6_CAP_FLAGS_RAID0_SUPPORT (0x00000002) #define MPI2_IOCPAGE6_CAP_FLAGS_GLOBAL_HOT_SPARE (0x00000001) - /* IOC Page 7 */ #define MPI2_IOCPAGE7_EVENTMASK_WORDS (4) @@ -1492,7 +1447,6 @@ typedef struct _MPI2_CONFIG_PAGE_IOC_7 #define MPI2_IOCPAGE7_PAGEVERSION (0x02) - /* IOC Page 8 */ typedef struct _MPI2_CONFIG_PAGE_IOC_8 @@ -1529,7 +1483,6 @@ typedef struct _MPI2_CONFIG_PAGE_IOC_8 #define MPI2_IOCPAGE8_IRFLAGS_LOW_VOLUME_MAPPING (0x00000000) #define MPI2_IOCPAGE8_IRFLAGS_HIGH_VOLUME_MAPPING (0x00000001) - /**************************************************************************** * BIOS Config Pages ****************************************************************************/ @@ -1616,8 +1569,6 @@ typedef struct _MPI2_CONFIG_PAGE_BIOS_1 #define MPI2_BIOSPAGE1_UEFI_VER_MINOR_MASK (0x00FF) #define MPI2_BIOSPAGE1_UEFI_VER_MINOR_SHIFT (0) - - /* BIOS Page 2 */ typedef struct _MPI2_BOOT_DEVICE_ADAPTER_ORDER @@ -1704,7 +1655,6 @@ typedef struct _MPI2_CONFIG_PAGE_BIOS_2 #define MPI2_BIOSPAGE2_FORM_ENCLOSURE_SLOT (0x06) #define MPI2_BIOSPAGE2_FORM_DEVICE_NAME (0x07) - /* BIOS Page 3 */ #define MPI2_BIOSPAGE3_NUM_ADAPTER (4) @@ -1751,7 +1701,6 @@ typedef struct _MPI2_CONFIG_PAGE_BIOS_3 #define MPI2_BIOSPAGE3_FLAGS_ADAPTER_DISPLAY (0x00000020) #define MPI2_BIOSPAGE3_FLAGS_ADAPTER_DEV_DISPLAY (0x00000040) - /* BIOS Page 4 */ /* @@ -1781,7 +1730,6 @@ typedef struct _MPI2_CONFIG_PAGE_BIOS_4 #define MPI2_BIOSPAGE4_PAGEVERSION (0x01) - /**************************************************************************** * RAID Volume Config Pages ****************************************************************************/ @@ -1912,7 +1860,6 @@ typedef struct _MPI2_CONFIG_PAGE_RAID_VOL_0 #define MPI2_RAIDVOLPAGE0_INSUFFICIENT_METADATA_INACTIVE (0x05) #define MPI2_RAIDVOLPAGE0_PREVIOUSLY_DELETED (0x06) - /* RAID Volume Page 1 */ typedef struct _MPI2_CONFIG_PAGE_RAID_VOL_1 @@ -1930,7 +1877,6 @@ typedef struct _MPI2_CONFIG_PAGE_RAID_VOL_1 #define MPI2_RAIDVOLPAGE1_PAGEVERSION (0x03) - /**************************************************************************** * RAID Physical Disk Config Pages ****************************************************************************/ @@ -2032,7 +1978,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_0 #define MPI2_PHYSDISK0_STATUS_FLAG_QUIESCED (0x00000002) #define MPI2_PHYSDISK0_STATUS_FLAG_OUT_OF_SYNC (0x00000001) - /* RAID Physical Disk Page 1 */ /* @@ -2074,7 +2019,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1 #define MPI2_RAIDPHYSDISKPAGE1_PAGEVERSION (0x02) - /**************************************************************************** * values for fields used by several types of SAS Config Pages ****************************************************************************/ @@ -2097,7 +2041,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1 #define MPI25_SAS_NEG_LINK_RATE_12_0 (0x0B) #define MPI26_SAS_NEG_LINK_RATE_22_5 (0x0C) - /* values for AttachedPhyInfo fields */ #define MPI2_SAS_APHYINFO_INSIDE_ZPSDS_PERSISTENT (0x00000040) #define MPI2_SAS_APHYINFO_REQUESTED_INSIDE_ZPSDS (0x00000020) @@ -2114,7 +2057,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1 #define MPI2_SAS_APHYINFO_REASON_BREAK_TIMEOUT (0x00000007) #define MPI2_SAS_APHYINFO_REASON_PHY_TEST_STOPPED (0x00000008) - /* values for PhyInfo fields */ #define MPI2_SAS_PHYINFO_PHY_VACANT (0x80000000) @@ -2155,7 +2097,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1 #define MPI2_SAS_PHYINFO_SUBTRACTIVE_ROUTING (0x00000010) #define MPI2_SAS_PHYINFO_TABLE_ROUTING (0x00000020) - /* values for SAS ProgrammedLinkRate fields */ #define MPI2_SAS_PRATE_MAX_RATE_MASK (0xF0) #define MPI2_SAS_PRATE_MAX_RATE_NOT_PROGRAMMABLE (0x00) @@ -2172,7 +2113,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1 #define MPI25_SAS_PRATE_MIN_RATE_12_0 (0x0B) #define MPI26_SAS_PRATE_MIN_RATE_22_5 (0x0C) - /* values for SAS HwLinkRate fields */ #define MPI2_SAS_HWRATE_MAX_RATE_MASK (0xF0) #define MPI2_SAS_HWRATE_MAX_RATE_1_5 (0x80) @@ -2187,8 +2127,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1 #define MPI25_SAS_HWRATE_MIN_RATE_12_0 (0x0B) #define MPI26_SAS_HWRATE_MIN_RATE_22_5 (0x0C) - - /**************************************************************************** * SAS IO Unit Config Pages ****************************************************************************/ @@ -2267,7 +2205,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_0 #define MPI2_SASIOUNIT0_DS_UNADDRESSABLE_DEVICE (0x00000002) #define MPI2_SASIOUNIT0_DS_LOOP_DETECTED (0x00000001) - /* SAS IO Unit Page 1 */ typedef struct _MPI2_SAS_IO_UNIT1_PHY_DATA @@ -2369,7 +2306,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_1 /* see mpi2_sas.h for values for SAS IO Unit Page 1 ControllerPhyDeviceInfo values */ - /* SAS IO Unit Page 4 (for MPI v2.5 and earlier) */ typedef struct _MPI2_SAS_IOUNIT4_SPINUP_GROUP @@ -2384,7 +2320,6 @@ typedef struct _MPI2_SAS_IOUNIT4_SPINUP_GROUP /* defines for SAS IO Unit Page 4 SpinupFlags */ #define MPI2_SASIOUNIT4_SPINUP_DISABLE_FLAG (0x01) - /* * Host code (drivers, BIOS, utilities, etc.) should leave this define set to * one and check the value returned for NumPhys at runtime. @@ -2420,7 +2355,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_4 /* defines for PHY field */ #define MPI2_SASIOUNIT4_PHY_SPINUP_GROUP_MASK (0x03) - /* SAS IO Unit Page 5 */ typedef struct _MPI2_SAS_IO_UNIT5_PHY_PM_SETTINGS @@ -2490,7 +2424,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_5 #define MPI2_SASIOUNITPAGE5_PAGEVERSION (0x01) - /* SAS IO Unit Page 6 */ typedef struct _MPI2_SAS_IO_UNIT6_PORT_WIDTH_MOD_GROUP_STATUS @@ -2545,7 +2478,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_6 #define MPI2_SASIOUNITPAGE6_PAGEVERSION (0x00) - /* SAS IO Unit Page 7 */ typedef struct _MPI2_SAS_IO_UNIT7_PORT_WIDTH_MOD_GROUP_SETTINGS @@ -2565,7 +2497,6 @@ typedef struct _MPI2_SAS_IO_UNIT7_PORT_WIDTH_MOD_GROUP /* defines for Flags field */ #define MPI2_SASIOUNIT7_FLAGS_ENABLE_PORT_WIDTH_MODULATION (0x01) - /* * Host code (drivers, BIOS, utilities, etc.) should leave this define set to * one and check the value returned for NumGroups at runtime. @@ -2593,7 +2524,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_7 #define MPI2_SASIOUNITPAGE7_PAGEVERSION (0x00) - /* SAS IO Unit Page 8 */ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_8 @@ -2628,8 +2558,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_8 #define MPI25_SASIOUNIT8_TXRXSLEEP_ACTIVE (0x02) #define MPI25_SASIOUNIT8_TXRXSLEEP_SHUTDOWN (0x03) - - /* SAS IO Unit Page 16 */ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT16 @@ -2652,7 +2580,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT16 #define MPI2_SASIOUNITPAGE16_PAGEVERSION (0x00) - /**************************************************************************** * SAS Expander Config Pages ****************************************************************************/ @@ -2725,7 +2652,6 @@ typedef struct _MPI2_CONFIG_PAGE_EXPANDER_0 #define MPI2_SAS_EXPANDER0_FLAGS_CONFIG_IN_PROGRESS (0x0002) #define MPI2_SAS_EXPANDER0_FLAGS_ROUTE_TABLE_CONFIG (0x0001) - /* SAS Expander Page 1 */ typedef struct _MPI2_CONFIG_PAGE_EXPANDER_1 @@ -2775,7 +2701,6 @@ typedef struct _MPI2_CONFIG_PAGE_EXPANDER_1 /* use MPI2_SAS_APHYINFO_ defines for AttachedPhyInfo field */ - /**************************************************************************** * SAS Device Config Pages ****************************************************************************/ @@ -2868,7 +2793,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_DEV_1 #define MPI2_SASDEVICE1_PAGEVERSION (0x01) - /**************************************************************************** * SAS PHY Config Pages ****************************************************************************/ @@ -2910,7 +2834,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_0 /* use MPI2_SAS_NEG_LINK_RATE_ defines for the NegotiatedLinkRate field */ - /* SAS PHY Page 1 */ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_1 @@ -2926,7 +2849,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_1 #define MPI2_SASPHY1_PAGEVERSION (0x01) - /* SAS PHY Page 2 */ typedef struct _MPI2_SASPHY2_PHY_EVENT @@ -2940,7 +2862,6 @@ typedef struct _MPI2_SASPHY2_PHY_EVENT /* use MPI2_SASPHY3_EVENT_CODE_ for the PhyEventCode field */ - /* * Host code (drivers, BIOS, utilities, etc.) should leave this define set to * one and check the value returned for NumPhyEvents at runtime. @@ -2962,7 +2883,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_2 #define MPI2_SASPHY2_PAGEVERSION (0x00) - /* SAS PHY Page 3 */ typedef struct _MPI2_SASPHY3_PHY_EVENT_CONFIG @@ -3066,7 +2986,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_3 #define MPI2_SASPHY3_PAGEVERSION (0x00) - /* SAS PHY Page 4 */ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_4 @@ -3085,9 +3004,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_4 #define MPI2_SASPHY4_FLAGS_FRAME_VALID (0x02) #define MPI2_SASPHY4_FLAGS_SATA_FRAME (0x01) - - - /**************************************************************************** * SAS Port Config Pages ****************************************************************************/ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***