Date: Tue, 1 Sep 2020 22:06:42 +0000 (UTC) From: Mateusz Guzik <mjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365202 - in head/sys/dev/mpt: . mpilib Message-ID: <202009012206.081M6g8R055709@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mjg Date: Tue Sep 1 22:06:41 2020 New Revision: 365202 URL: https://svnweb.freebsd.org/changeset/base/365202 Log: mpt: clean up empty lines in .c and .h files Modified: head/sys/dev/mpt/mpilib/mpi.h head/sys/dev/mpt/mpilib/mpi_cnfg.h head/sys/dev/mpt/mpilib/mpi_fc.h head/sys/dev/mpt/mpilib/mpi_init.h head/sys/dev/mpt/mpilib/mpi_ioc.h head/sys/dev/mpt/mpilib/mpi_lan.h head/sys/dev/mpt/mpilib/mpi_log_fc.h head/sys/dev/mpt/mpilib/mpi_log_sas.h head/sys/dev/mpt/mpilib/mpi_raid.h head/sys/dev/mpt/mpilib/mpi_sas.h head/sys/dev/mpt/mpilib/mpi_targ.h head/sys/dev/mpt/mpilib/mpi_tool.h head/sys/dev/mpt/mpilib/mpi_type.h head/sys/dev/mpt/mpt.c head/sys/dev/mpt/mpt.h head/sys/dev/mpt/mpt_cam.c head/sys/dev/mpt/mpt_debug.c head/sys/dev/mpt/mpt_raid.c head/sys/dev/mpt/mpt_user.c Modified: head/sys/dev/mpt/mpilib/mpi.h ============================================================================== --- head/sys/dev/mpt/mpilib/mpi.h Tue Sep 1 22:06:23 2020 (r365201) +++ head/sys/dev/mpt/mpilib/mpi.h Tue Sep 1 22:06:41 2020 (r365202) @@ -118,7 +118,6 @@ #ifndef MPI_H #define MPI_H - /***************************************************************************** * * M P I V e r s i o n D e f i n i t i o n s @@ -175,7 +174,6 @@ #define MPI_FAULT_DATA_RECEIVE_PCI_PARITY_ERROR (0x8117) #define MPI_FAULT_DATA_RECEIVE_PCI_BUS_FAULT (0x8118) - /***************************************************************************** * * P C I S y s t e m I n t e r f a c e R e g i s t e r s @@ -206,7 +204,6 @@ #define MPI_DB_HPBAC_DISABLE_ACCESS (0x02) #define MPI_DB_HPBAC_FREE_BUFFER (0x03) - #define MPI_WRITE_SEQUENCE_OFFSET (0x00000004) #define MPI_WRSEQ_KEY_VALUE_MASK (0x0000000F) #define MPI_WRSEQ_1ST_KEY_VALUE (0x04) @@ -250,8 +247,6 @@ #define MPI_HI_PRI_REQUEST_QUEUE_OFFSET (0x00000048) - - /***************************************************************************** * * M e s s a g e F r a m e D e s c r i p t o r s @@ -273,7 +268,6 @@ #define MPI_CONTEXT_REPLY_TYPE_SHIFT (29) #define MPI_CONTEXT_REPLY_CONTEXT_MASK (0x1FFFFFFF) - /****************************************************************************/ /* Context Reply macros */ /****************************************************************************/ @@ -286,7 +280,6 @@ (((typ) << MPI_CONTEXT_REPLY_TYPE_SHIFT) & \ MPI_CONTEXT_REPLY_TYPE_MASK)) - /***************************************************************************** * * M e s s a g e F u n c t i o n s @@ -354,7 +347,6 @@ #define MPI_FUNCTION_REPLY_FRAME_REMOVAL (0x43) #define MPI_FUNCTION_HOST_PAGEBUF_ACCESS_CONTROL (0x44) - /* standard version format */ typedef struct _MPI_VERSION_STRUCT { @@ -372,7 +364,6 @@ typedef union _MPI_VERSION_FORMAT } MPI_VERSION_FORMAT, MPI_POINTER PTR_MPI_VERSION_FORMAT, MpiVersionFormat_t, MPI_POINTER pMpiVersionFormat_t; - /***************************************************************************** * * S c a t t e r G a t h e r E l e m e n t s @@ -508,7 +499,6 @@ typedef struct _SGE_TRANSACTION_UNION } SGE_TRANSACTION_UNION, MPI_POINTER PTR_SGE_TRANSACTION_UNION, SGETransactionUnion_t, MPI_POINTER pSGETransactionUnion_t; - /****************************************************************************/ /* SGE IO types union for IO SGL's */ /****************************************************************************/ @@ -553,7 +543,6 @@ typedef struct _SGE_MPI_UNION MPI_SGE_UNION_t, MPI_POINTER pMPI_SGE_UNION_t, SGEAllUnion_t, MPI_POINTER pSGEAllUnion_t; - /****************************************************************************/ /* SGE field definition and masks */ /****************************************************************************/ @@ -604,7 +593,6 @@ typedef struct _SGE_MPI_UNION #define MPI_SGE_CHAIN_OFFSET_MASK (0x00FF0000) #define MPI_SGE_CHAIN_OFFSET_SHIFT (16) - /****************************************************************************/ /* SGE operation Macros */ /****************************************************************************/ @@ -626,8 +614,6 @@ typedef struct _SGE_MPI_UNION #define MPI_GET_CHAIN_OFFSET(x) ((x&MPI_SGE_CHAIN_OFFSET_MASK)>>MPI_SGE_CHAIN_OFFSET_SHIFT) - - /***************************************************************************** * * S t a n d a r d M e s s a g e S t r u c t u r e s @@ -649,7 +635,6 @@ typedef struct _MSG_REQUEST_HEADER } MSG_REQUEST_HEADER, MPI_POINTER PTR_MSG_REQUEST_HEADER, MPIHeader_t, MPI_POINTER pMPIHeader_t; - /****************************************************************************/ /* Default Reply */ /****************************************************************************/ @@ -668,12 +653,10 @@ typedef struct _MSG_DEFAULT_REPLY } MSG_DEFAULT_REPLY, MPI_POINTER PTR_MSG_DEFAULT_REPLY, MPIDefaultReply_t, MPI_POINTER pMPIDefaultReply_t; - /* MsgFlags definition for all replies */ #define MPI_MSGFLAGS_CONTINUATION_REPLY (0x80) - /***************************************************************************** * * I O C S t a t u s V a l u e s @@ -732,7 +715,6 @@ typedef struct _MSG_DEFAULT_REPLY #define MPI_IOCSTATUS_EEDP_REF_TAG_ERROR (0x004E) #define MPI_IOCSTATUS_EEDP_APP_TAG_ERROR (0x004F) - /****************************************************************************/ /* SCSI Target values */ /****************************************************************************/ @@ -804,7 +786,6 @@ typedef struct _MSG_DEFAULT_REPLY #define MPI_IOCSTATUS_DIAGNOSTIC_RELEASED (0x00A0) - /****************************************************************************/ /* IOCStatus flag to indicate that log info is available */ /****************************************************************************/ @@ -824,6 +805,5 @@ typedef struct _MSG_DEFAULT_REPLY #define MPI_IOCLOGINFO_TYPE_SAS (0x3) #define MPI_IOCLOGINFO_TYPE_ISCSI (0x4) #define MPI_IOCLOGINFO_LOG_DATA_MASK (0x0FFFFFFF) - #endif Modified: head/sys/dev/mpt/mpilib/mpi_cnfg.h ============================================================================== --- head/sys/dev/mpt/mpilib/mpi_cnfg.h Tue Sep 1 22:06:23 2020 (r365201) +++ head/sys/dev/mpt/mpilib/mpi_cnfg.h Tue Sep 1 22:06:41 2020 (r365202) @@ -365,7 +365,6 @@ #ifndef MPI_CNFG_H #define MPI_CNFG_H - /***************************************************************************** * * C o n f i g M e s s a g e a n d S t r u c t u r e s @@ -402,8 +401,6 @@ typedef struct _CONFIG_EXTENDED_PAGE_HEADER } CONFIG_EXTENDED_PAGE_HEADER, MPI_POINTER PTR_CONFIG_EXTENDED_PAGE_HEADER, ConfigExtendedPageHeader_t, MPI_POINTER pConfigExtendedPageHeader_t; - - /**************************************************************************** * PageType field values ****************************************************************************/ @@ -430,7 +427,6 @@ typedef struct _CONFIG_EXTENDED_PAGE_HEADER #define MPI_CONFIG_TYPENUM_MASK (0x0FFF) - /**************************************************************************** * ExtPageType field values ****************************************************************************/ @@ -441,7 +437,6 @@ typedef struct _CONFIG_EXTENDED_PAGE_HEADER #define MPI_CONFIG_EXTPAGETYPE_LOG (0x14) #define MPI_CONFIG_EXTPAGETYPE_ENCLOSURE (0x15) - /**************************************************************************** * PageAddress field values ****************************************************************************/ @@ -531,8 +526,6 @@ typedef struct _CONFIG_EXTENDED_PAGE_HEADER #define MPI_SAS_ENCLOS_PGAD_H_HANDLE_MASK (0x0000FFFF) #define MPI_SAS_ENCLOS_PGAD_H_HANDLE_SHIFT (0) - - /**************************************************************************** * Config Request Message ****************************************************************************/ @@ -553,7 +546,6 @@ typedef struct _MSG_CONFIG } MSG_CONFIG, MPI_POINTER PTR_MSG_CONFIG, Config_t, MPI_POINTER pConfig_t; - /**************************************************************************** * Action field values ****************************************************************************/ @@ -565,7 +557,6 @@ typedef struct _MSG_CONFIG #define MPI_CONFIG_ACTION_PAGE_READ_DEFAULT (0x05) #define MPI_CONFIG_ACTION_PAGE_READ_NVRAM (0x06) - /* Config Reply Message */ typedef struct _MSG_CONFIG_REPLY { @@ -584,8 +575,6 @@ typedef struct _MSG_CONFIG_REPLY } MSG_CONFIG_REPLY, MPI_POINTER PTR_MSG_CONFIG_REPLY, ConfigReply_t, MPI_POINTER pConfigReply_t; - - /***************************************************************************** * * C o n f i g u r a t i o n P a g e s @@ -622,7 +611,6 @@ typedef struct _MSG_CONFIG_REPLY #define MPI_MANUFACTPAGE_DEVID_SAS1068E (0x0058) #define MPI_MANUFACTPAGE_DEVID_SAS1078 (0x0062) - typedef struct _CONFIG_PAGE_MANUFACTURING_0 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -637,7 +625,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_0 #define MPI_MANUFACTURING0_PAGEVERSION (0x00) - typedef struct _CONFIG_PAGE_MANUFACTURING_1 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -647,7 +634,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_1 #define MPI_MANUFACTURING1_PAGEVERSION (0x00) - typedef struct _MPI_CHIP_REVISION_ID { U16 DeviceID; /* 00h */ @@ -656,7 +642,6 @@ typedef struct _MPI_CHIP_REVISION_ID } MPI_CHIP_REVISION_ID, MPI_POINTER PTR_MPI_CHIP_REVISION_ID, MpiChipRevisionId_t, MPI_POINTER pMpiChipRevisionId_t; - /* * Host code (drivers, BIOS, utilities, etc.) should leave this define set to * one and check Header.PageLength at runtime. @@ -675,7 +660,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_2 #define MPI_MANUFACTURING2_PAGEVERSION (0x00) - /* * Host code (drivers, BIOS, utilities, etc.) should leave this define set to * one and check Header.PageLength at runtime. @@ -694,7 +678,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_3 #define MPI_MANUFACTURING3_PAGEVERSION (0x00) - typedef struct _CONFIG_PAGE_MANUFACTURING_4 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -752,7 +735,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_4 #define MPI_MANPAGE4_EXTFLAGS_SATA_CACHE_DISABLE (0x0002) #define MPI_MANPAGE4_EXTFLAGS_LEGACY_MODE (0x0001) - #ifndef MPI_MANPAGE5_NUM_FORCEWWID #define MPI_MANPAGE5_NUM_FORCEWWID (1) #endif @@ -775,7 +757,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_5 /* defines for the Flags field */ #define MPI_MANPAGE5_TWO_WWID_PER_PHY (0x01) - typedef struct _CONFIG_PAGE_MANUFACTURING_6 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -785,7 +766,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_6 #define MPI_MANUFACTURING6_PAGEVERSION (0x00) - typedef struct _MPI_MANPAGE7_CONNECTOR_INFO { U32 Pinout; /* 00h */ @@ -845,7 +825,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_7 /* defines for the Flags field */ #define MPI_MANPAGE7_FLAG_USE_SLOT_INFO (0x00000001) - typedef struct _CONFIG_PAGE_MANUFACTURING_8 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -855,7 +834,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_8 #define MPI_MANUFACTURING8_PAGEVERSION (0x00) - typedef struct _CONFIG_PAGE_MANUFACTURING_9 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -865,7 +843,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_9 #define MPI_MANUFACTURING9_PAGEVERSION (0x00) - typedef struct _CONFIG_PAGE_MANUFACTURING_10 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -875,7 +852,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_10 #define MPI_MANUFACTURING10_PAGEVERSION (0x00) - /**************************************************************************** * IO Unit Config Pages ****************************************************************************/ @@ -889,7 +865,6 @@ typedef struct _CONFIG_PAGE_IO_UNIT_0 #define MPI_IOUNITPAGE0_PAGEVERSION (0x00) - typedef struct _CONFIG_PAGE_IO_UNIT_1 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -944,7 +919,6 @@ typedef struct _CONFIG_PAGE_IO_UNIT_2 #define MPI_IOUNITPAGE2_FLAGS_ADAPTER_DISPLAY (0x00000020) #define MPI_IOUNITPAGE2_FLAGS_ADAPTER_DEV_DISPLAY (0x00000040) - /* * Host code (drivers, BIOS, utilities, etc.) should leave this define set to * one and check Header.PageLength at runtime. @@ -970,7 +944,6 @@ typedef struct _CONFIG_PAGE_IO_UNIT_3 #define MPI_IOUNITPAGE3_GPIO_SETTING_OFF (0x00) #define MPI_IOUNITPAGE3_GPIO_SETTING_ON (0x01) - typedef struct _CONFIG_PAGE_IO_UNIT_4 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -981,7 +954,6 @@ typedef struct _CONFIG_PAGE_IO_UNIT_4 #define MPI_IOUNITPAGE4_PAGEVERSION (0x00) - /**************************************************************************** * IOC Config Pages ****************************************************************************/ @@ -1003,7 +975,6 @@ typedef struct _CONFIG_PAGE_IOC_0 #define MPI_IOCPAGE0_PAGEVERSION (0x01) - typedef struct _CONFIG_PAGE_IOC_1 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -1027,7 +998,6 @@ typedef struct _CONFIG_PAGE_IOC_1 #define MPI_IOCPAGE1_PCISLOTNUM_UNKNOWN (0xFF) - typedef struct _CONFIG_PAGE_IOC_2_RAID_VOL { U8 VolumeID; /* 00h */ @@ -1091,7 +1061,6 @@ typedef struct _CONFIG_PAGE_IOC_2 #define MPI_IOCPAGE2_CAP_FLAGS_SAFTE_SUPPORT (0x40000000) #define MPI_IOCPAGE2_CAP_FLAGS_CROSS_CHANNEL_SUPPORT (0x80000000) - typedef struct _IOC_3_PHYS_DISK { U8 PhysDiskID; /* 00h */ @@ -1121,7 +1090,6 @@ typedef struct _CONFIG_PAGE_IOC_3 #define MPI_IOCPAGE3_PAGEVERSION (0x00) - typedef struct _IOC_4_SEP { U8 SEPTargetID; /* 00h */ @@ -1150,7 +1118,6 @@ typedef struct _CONFIG_PAGE_IOC_4 #define MPI_IOCPAGE4_PAGEVERSION (0x00) - typedef struct _IOC_5_HOT_SPARE { U8 PhysDiskNum; /* 00h */ @@ -1230,7 +1197,6 @@ typedef struct _CONFIG_PAGE_IOC_6 #define MPI_IOCPAGE6_CAP_FLAGS_GLOBAL_HOT_SPARE (0x00000001) - /**************************************************************************** * BIOS Config Pages ****************************************************************************/ @@ -1504,7 +1470,6 @@ typedef struct _CONFIG_PAGE_BIOS_4 #define MPI_BIOSPAGE4_PAGEVERSION (0x00) - /**************************************************************************** * SCSI Port Config Pages ****************************************************************************/ @@ -1557,7 +1522,6 @@ typedef struct _CONFIG_PAGE_SCSI_PORT_0 #define MPI_SCSIPORTPAGE0_PHY_BUS_FREE_CONNECTED_ID (0xFE) #define MPI_SCSIPORTPAGE0_PHY_UNKNOWN_CONNECTED_ID (0xFF) - typedef struct _CONFIG_PAGE_SCSI_PORT_1 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -1580,7 +1544,6 @@ typedef struct _CONFIG_PAGE_SCSI_PORT_1 #define MPI_SCSIPORTPAGE1_TARGCONFIG_TARG_ONLY (0x01) #define MPI_SCSIPORTPAGE1_TARGCONFIG_INIT_TARG (0x02) - typedef struct _MPI_DEVICE_INFO { U8 Timeout; /* 00h */ @@ -1611,7 +1574,6 @@ typedef struct _CONFIG_PAGE_SCSI_PORT_2 #define MPI_SCSIPORTPAGE2_PORT_FLAGS_BASIC_DV_ONLY (0x00000020) #define MPI_SCSIPORTPAGE2_PORT_FLAGS_OFF_DV (0x00000060) - /* PortSettings values */ #define MPI_SCSIPORTPAGE2_PORT_HOST_ID_MASK (0x0000000F) #define MPI_SCSIPORTPAGE2_PORT_MASK_INIT_HBA (0x00000030) @@ -1637,7 +1599,6 @@ typedef struct _CONFIG_PAGE_SCSI_PORT_2 #define MPI_SCSIPORTPAGE2_DEVICE_WIDE_DISABLE (0x0010) #define MPI_SCSIPORTPAGE2_DEVICE_BOOT_CHOICE (0x0020) - /**************************************************************************** * SCSI Target Device Config Pages ****************************************************************************/ @@ -1673,7 +1634,6 @@ typedef struct _CONFIG_PAGE_SCSI_DEVICE_0 #define MPI_SCSIDEVPAGE0_INFO_WDTR_REJECTED (0x00000004) #define MPI_SCSIDEVPAGE0_INFO_PPR_REJECTED (0x00000008) - typedef struct _CONFIG_PAGE_SCSI_DEVICE_1 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -1706,7 +1666,6 @@ typedef struct _CONFIG_PAGE_SCSI_DEVICE_1 #define MPI_SCSIDEVPAGE1_CONF_EXTENDED_PARAMS_ENABLE (0x00000008) #define MPI_SCSIDEVPAGE1_CONF_FORCE_PPR_MSG (0x00000010) - typedef struct _CONFIG_PAGE_SCSI_DEVICE_2 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -1747,7 +1706,6 @@ typedef struct _CONFIG_PAGE_SCSI_DEVICE_2 #define MPI_SCSIDEVPAGE2_DPS_BIT_14_PL_SELECT_MASK (0x30000000) #define MPI_SCSIDEVPAGE2_DPS_BIT_15_PL_SELECT_MASK (0xC0000000) - typedef struct _CONFIG_PAGE_SCSI_DEVICE_3 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -1763,7 +1721,6 @@ typedef struct _CONFIG_PAGE_SCSI_DEVICE_3 #define MPI_SCSIDEVPAGE3_MAX_COUNTER (0xFFFE) #define MPI_SCSIDEVPAGE3_UNSUPPORTED_COUNTER (0xFFFF) - /**************************************************************************** * FC Port Config Pages ****************************************************************************/ @@ -1856,7 +1813,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_0 #define MPI_FCPORTPAGE0_CURRENT_SPEED_4GBIT MPI_FCPORTPAGE0_SUPPORT_4GBIT_SPEED #define MPI_FCPORTPAGE0_CURRENT_SPEED_NOT_NEGOTIATED (0x00008000) /* (SNIA)HBA_PORTSPEED_NOT_NEGOTIATED (1<<15) Speed not established */ - typedef struct _CONFIG_PAGE_FC_PORT_1 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -1922,7 +1878,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_1 #define MPI_FCPORTPAGE1_INITIATOR_DEV_TIMEOUT_MASK (0x7F) #define MPI_FCPORTPAGE1_INITIATOR_DEV_UNIT_16 (0x80) - typedef struct _CONFIG_PAGE_FC_PORT_2 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -1933,7 +1888,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_2 #define MPI_FCPORTPAGE2_PAGEVERSION (0x01) - typedef struct _WWN_FORMAT { U64 WWNN; /* 00h */ @@ -1981,7 +1935,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_3 #define MPI_FCPORTPAGE3_PAGEVERSION (0x01) - typedef struct _CONFIG_PAGE_FC_PORT_4 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -2002,7 +1955,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_4 #define MPI_FCPORTPAGE4_PORT_REMOVABLE_MEDIA (0x000000C0) #define MPI_FCPORTPAGE4_PORT_SPINUP_DELAY_MASK (0x00000F00) - typedef struct _CONFIG_PAGE_FC_PORT_5_ALIAS_INFO { U8 Flags; /* 00h */ @@ -2054,7 +2006,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_6 #define MPI_FCPORTPAGE6_PAGEVERSION (0x00) - typedef struct _CONFIG_PAGE_FC_PORT_7 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -2065,7 +2016,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_7 #define MPI_FCPORTPAGE7_PAGEVERSION (0x00) - typedef struct _CONFIG_PAGE_FC_PORT_8 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -2075,7 +2025,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_8 #define MPI_FCPORTPAGE8_PAGEVERSION (0x00) - typedef struct _CONFIG_PAGE_FC_PORT_9 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -2095,7 +2044,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_9 #define MPI_FCPORTPAGE9_PAGEVERSION (0x00) - typedef struct _CONFIG_PAGE_FC_PORT_10_BASE_SFP_DATA { U8 Id; /* 10h */ @@ -2167,7 +2115,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_10_BASE_SFP_DATA #define MPI_FCPORT10_BASE_ENCODE_NRZ (0x03) #define MPI_FCPORT10_BASE_ENCODE_MANCHESTER (0x04) - typedef struct _CONFIG_PAGE_FC_PORT_10_EXTENDED_SFP_DATA { U8 Options[2]; /* 50h */ @@ -2189,7 +2136,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_10_EXTENDED_SFP_DA #define MPI_FCPORT10_EXT_OPTION1_LOS_INVERT (0x04) #define MPI_FCPORT10_EXT_OPTION1_LOS (0x02) - typedef struct _CONFIG_PAGE_FC_PORT_10 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -2223,7 +2169,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_10 #define MPI_FCPORTPAGE10_FLAGS_CC_BASE_OK (0x00000010) #define MPI_FCPORTPAGE10_FLAGS_CC_EXT_OK (0x00000020) - /**************************************************************************** * FC Device Config Pages ****************************************************************************/ @@ -2377,7 +2322,6 @@ typedef struct _CONFIG_PAGE_RAID_VOL_0 #define MPI_RAIDVOLPAGE0_INSUFFICIENT_METADATA_INACTIVE (0x05) #define MPI_RAIDVOLPAGE0_PREVIOUSLY_DELETED (0x06) - typedef struct _CONFIG_PAGE_RAID_VOL_1 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -2395,7 +2339,6 @@ typedef struct _CONFIG_PAGE_RAID_VOL_1 #define MPI_RAIDVOLPAGE1_PAGEVERSION (0x01) - /**************************************************************************** * RAID Physical Disk Config Pages ****************************************************************************/ @@ -2477,7 +2420,6 @@ typedef struct _CONFIG_PAGE_RAID_PHYS_DISK_0 #define MPI_RAIDPHYSDISKPAGE0_PAGEVERSION (0x02) - typedef struct _RAID_PHYS_DISK1_PATH { U8 PhysDiskID; /* 00h */ @@ -2495,7 +2437,6 @@ typedef struct _RAID_PHYS_DISK1_PATH #define MPI_RAID_PHYSDISK1_FLAG_BROKEN (0x0002) #define MPI_RAID_PHYSDISK1_FLAG_INVALID (0x0001) - /* * Host code (drivers, BIOS, utilities, etc.) should leave this define set to * one and check Header.PageLength or NumPhysDiskPaths at runtime. @@ -2517,7 +2458,6 @@ typedef struct _CONFIG_PAGE_RAID_PHYS_DISK_1 #define MPI_RAIDPHYSDISKPAGE1_PAGEVERSION (0x00) - /**************************************************************************** * LAN Config Pages ****************************************************************************/ @@ -2561,7 +2501,6 @@ typedef struct _CONFIG_PAGE_LAN_1 #define MPI_LAN_PAGE1_DEV_STATE_RESET (0x00) #define MPI_LAN_PAGE1_DEV_STATE_OPERATIONAL (0x01) - /**************************************************************************** * Inband Config Pages ****************************************************************************/ @@ -2577,8 +2516,6 @@ typedef struct _CONFIG_PAGE_INBAND_0 #define MPI_INBAND_PAGEVERSION (0x00) - - /**************************************************************************** * SAS IO Unit Config Pages ****************************************************************************/ @@ -2656,7 +2593,6 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_0 #define MPI_SAS_IOUNIT0_DS_MAX_SATA_TARGETS (0x00001000) #define MPI_SAS_IOUNIT0_DS_MULTI_PORT_DOMAIN (0x00002000) - typedef struct _MPI_SAS_IO_UNIT1_PHY_DATA { U8 Port; /* 00h */ @@ -2751,7 +2687,6 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_1 /* see mpi_sas.h for values for SAS IO Unit Page 1 ControllerPhyDeviceInfo values */ - typedef struct _CONFIG_PAGE_SAS_IO_UNIT_2 { CONFIG_EXTENDED_PAGE_HEADER Header; /* 00h */ @@ -2787,7 +2722,6 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_2 #define MPI_SAS_IOUNIT2_FLAGS_RESERVE_ID_0_FOR_BOOT (0x10) #define MPI_SAS_IOUNIT2_FLAGS_DA_STARTING_SLOT (0x20) - typedef struct _CONFIG_PAGE_SAS_IO_UNIT_3 { CONFIG_EXTENDED_PAGE_HEADER Header; /* 00h */ @@ -2805,7 +2739,6 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_3 #define MPI_SASIOUNITPAGE3_PAGEVERSION (0x00) - /**************************************************************************** * SAS Expander Config Pages ****************************************************************************/ @@ -2850,7 +2783,6 @@ typedef struct _CONFIG_PAGE_SAS_EXPANDER_0 #define MPI_SAS_EXPANDER0_FLAGS_ROUTE_TABLE_CONFIG (0x02) #define MPI_SAS_EXPANDER0_FLAGS_CONFIG_IN_PROGRESS (0x01) - typedef struct _CONFIG_PAGE_SAS_EXPANDER_1 { CONFIG_EXTENDED_PAGE_HEADER Header; /* 00h */ @@ -2899,7 +2831,6 @@ typedef struct _CONFIG_PAGE_SAS_EXPANDER_1 #define MPI_SAS_EXPANDER1_NEG_RATE_1_5 (0x08) #define MPI_SAS_EXPANDER1_NEG_RATE_3_0 (0x09) - /**************************************************************************** * SAS Device Config Pages ****************************************************************************/ @@ -2959,7 +2890,6 @@ typedef struct _CONFIG_PAGE_SAS_DEVICE_0 /* see mpi_sas.h for values for SAS Device Page 0 DeviceInfo values */ - typedef struct _CONFIG_PAGE_SAS_DEVICE_1 { CONFIG_EXTENDED_PAGE_HEADER Header; /* 00h */ @@ -2975,7 +2905,6 @@ typedef struct _CONFIG_PAGE_SAS_DEVICE_1 #define MPI_SASDEVICE1_PAGEVERSION (0x00) - typedef struct _CONFIG_PAGE_SAS_DEVICE_2 { CONFIG_EXTENDED_PAGE_HEADER Header; /* 00h */ @@ -2994,7 +2923,6 @@ typedef struct _CONFIG_PAGE_SAS_DEVICE_2 #define MPI_SASDEVICE2_ENC_MAP_MASK_START_INDEX (0x001FF800) #define MPI_SASDEVICE2_ENC_MAP_SHIFT_START_INDEX (11) - /**************************************************************************** * SAS PHY Config Pages ****************************************************************************/ @@ -3062,7 +2990,6 @@ typedef struct _CONFIG_PAGE_SAS_PHY_0 #define MPI_SAS_PHY0_PHYINFO_RATE_1_5 (0x00000008) #define MPI_SAS_PHY0_PHYINFO_RATE_3_0 (0x00000009) - typedef struct _CONFIG_PAGE_SAS_PHY_1 { CONFIG_EXTENDED_PAGE_HEADER Header; /* 00h */ @@ -3076,7 +3003,6 @@ typedef struct _CONFIG_PAGE_SAS_PHY_1 #define MPI_SASPHY1_PAGEVERSION (0x00) - /**************************************************************************** * SAS Enclosure Config Pages ****************************************************************************/ @@ -3113,7 +3039,6 @@ typedef struct _CONFIG_PAGE_SAS_ENCLOSURE_0 #define MPI_SAS_ENCLS0_FLAGS_MNG_SES_ENCLOSURE (0x0004) #define MPI_SAS_ENCLS0_FLAGS_MNG_IOC_GPIO (0x0005) - /**************************************************************************** * Log Config Pages ****************************************************************************/ @@ -3154,6 +3079,4 @@ typedef struct _CONFIG_PAGE_LOG_0 #define MPI_LOG_0_PAGEVERSION (0x01) - #endif - Modified: head/sys/dev/mpt/mpilib/mpi_fc.h ============================================================================== --- head/sys/dev/mpt/mpilib/mpi_fc.h Tue Sep 1 22:06:23 2020 (r365201) +++ head/sys/dev/mpt/mpilib/mpi_fc.h Tue Sep 1 22:06:41 2020 (r365202) @@ -75,7 +75,6 @@ #ifndef MPI_FC_H #define MPI_FC_H - /***************************************************************************** * * F C D i r e c t A c c e s s M e s s a g e s @@ -170,7 +169,6 @@ typedef struct _MSG_LINK_SERVICE_BUFFER_POST_REPLY #define FCP_TARGET_TYPE_MASK (0xFF000000) #define FCP_TARGET_TYPE_SHIFT (24) - /****************************************************************************/ /* Link Service Response messages */ /****************************************************************************/ @@ -201,7 +199,6 @@ typedef struct _MSG_LINK_SERVICE_RSP_REQUEST #define LINK_SERVICE_RSP_FLAGS_IMMEDIATE (0x80) #define LINK_SERVICE_RSP_FLAGS_PORT_MASK (0x01) - /* Link Service Response Reply */ typedef struct _MSG_LINK_SERVICE_RSP_REPLY { @@ -219,7 +216,6 @@ typedef struct _MSG_LINK_SERVICE_RSP_REPLY } MSG_LINK_SERVICE_RSP_REPLY, MPI_POINTER PTR_MSG_LINK_SERVICE_RSP_REPLY, LinkServiceRspReply_t, MPI_POINTER pLinkServiceRspReply_t; - /****************************************************************************/ /* Extended Link Service Send messages */ /****************************************************************************/ @@ -242,7 +238,6 @@ typedef struct _MSG_EXLINK_SERVICE_SEND_REQUEST #define EX_LINK_SERVICE_SEND_MSGFLAGS_MASK (0xFF000000) #define EX_LINK_SERVICE_SEND_MSGFLAGS_SHIFT (24) - /* Extended Link Service Send Reply */ typedef struct _MSG_EXLINK_SERVICE_SEND_REPLY { @@ -302,7 +297,6 @@ typedef struct _MSG_FC_ABORT_REPLY } MSG_FC_ABORT_REPLY, MPI_POINTER PTR_MSG_FC_ABORT_REPLY, FcAbortReply_t, MPI_POINTER pFcAbortReply_t; - /****************************************************************************/ /* FC Common Transport Send messages */ /****************************************************************************/ @@ -328,7 +322,6 @@ typedef struct _MSG_FC_COMMON_TRANSPORT_SEND_REQUEST #define MPI_FC_CT_SEND_MSGFLAGS_MASK (0xFF000000) #define MPI_FC_CT_SEND_MSGFLAGS_SHIFT (24) - /* FC Common Transport Send Reply */ typedef struct _MSG_FC_COMMON_TRANSPORT_SEND_REPLY { @@ -347,7 +340,6 @@ typedef struct _MSG_FC_COMMON_TRANSPORT_SEND_REPLY } MSG_FC_COMMON_TRANSPORT_SEND_REPLY, MPI_POINTER PTR_MSG_FC_COMMON_TRANSPORT_SEND_REPLY, FcCommonTransportSendReply_t, MPI_POINTER pFcCommonTransportSendReply_t; - /****************************************************************************/ /* FC Primitive Send messages */ /****************************************************************************/ @@ -393,4 +385,3 @@ typedef struct _MSG_FC_PRIMITIVE_SEND_REPLY FcPrimitiveSendReply_t, MPI_POINTER pFcPrimitiveSendReply_t; #endif - Modified: head/sys/dev/mpt/mpilib/mpi_init.h ============================================================================== --- head/sys/dev/mpt/mpilib/mpi_init.h Tue Sep 1 22:06:23 2020 (r365201) +++ head/sys/dev/mpt/mpilib/mpi_init.h Tue Sep 1 22:06:41 2020 (r365202) @@ -91,7 +91,6 @@ #ifndef MPI_INIT_H #define MPI_INIT_H - /***************************************************************************** * * S C S I I n i t i a t o r M e s s a g e s @@ -122,7 +121,6 @@ typedef struct _MSG_SCSI_IO_REQUEST } MSG_SCSI_IO_REQUEST, MPI_POINTER PTR_MSG_SCSI_IO_REQUEST, SCSIIORequest_t, MPI_POINTER pSCSIIORequest_t; - /* SCSI IO MsgFlags bits */ #define MPI_SCSIIO_MSGFLGS_SENSE_WIDTH (0x01) @@ -172,7 +170,6 @@ typedef struct _MSG_SCSI_IO_REQUEST #define MPI_SCSIIO_CONTROL_ABORT_TASK_SET (0x00020000) #define MPI_SCSIIO_CONTROL_RESERVED2 (0x00010000) - /* SCSI IO reply structure */ typedef struct _MSG_SCSI_IO_REPLY { @@ -197,7 +194,6 @@ typedef struct _MSG_SCSI_IO_REPLY } MSG_SCSI_IO_REPLY, MPI_POINTER PTR_MSG_SCSI_IO_REPLY, SCSIIOReply_t, MPI_POINTER pSCSIIOReply_t; - /* SCSI IO Reply SCSIStatus values (SAM-2 status codes) */ #define MPI_SCSI_STATUS_SUCCESS (0x00) @@ -215,7 +211,6 @@ typedef struct _MSG_SCSI_IO_REPLY #define MPI_SCSI_STATUS_FCPEXT_NO_LINK (0x81) #define MPI_SCSI_STATUS_FCPEXT_UNASSIGNED (0x82) - /* SCSI IO Reply SCSIState values */ #define MPI_SCSI_STATE_AUTOSENSE_VALID (0x01) @@ -238,7 +233,6 @@ typedef struct _MSG_SCSI_IO_REPLY #define MPI_SCSI_TASKTAG_UNKNOWN (0xFFFF) - /****************************************************************************/ /* SCSI IO 32 messages and associated structures */ /****************************************************************************/ @@ -403,7 +397,6 @@ typedef struct _MSG_SCSI_IO32_REQUEST #define MPI_SCSIIO32_EEDPFLAGS_INC_SEC_REFTAG (0x4000) #define MPI_SCSIIO32_EEDPFLAGS_INC_PRI_REFTAG (0x8000) - /* SCSIIO32 IO reply structure */ typedef struct _MSG_SCSIIO32_IO_REPLY { @@ -429,7 +422,6 @@ typedef struct _MSG_SCSIIO32_IO_REPLY } MSG_SCSIIO32_IO_REPLY, MPI_POINTER PTR_MSG_SCSIIO32_IO_REPLY, SCSIIO32Reply_t, MPI_POINTER pSCSIIO32Reply_t; - /****************************************************************************/ /* SCSI Task Management messages */ /****************************************************************************/ @@ -499,7 +491,6 @@ typedef struct _MSG_SCSI_TASK_MGMT_REPLY #define MPI_SCSITASKMGMT_RSP_TM_INVALID_LUN (0x09) #define MPI_SCSITASKMGMT_RSP_IO_QUEUED_ON_IOC (0x80) - /****************************************************************************/ /* SCSI Enclosure Processor messages */ /****************************************************************************/ @@ -555,7 +546,6 @@ typedef struct _MSG_SEP_REQUEST #define MPI_SEP_REQ_SLOTSTATUS_A_ENABLE_BYPASS (0x08000000) #define MPI_SEP_REQ_SLOTSTATUS_DEV_OFF (0x10000000) #define MPI_SEP_REQ_SLOTSTATUS_SWAP_RESET (0x80000000) - typedef struct _MSG_SEP_REPLY { Modified: head/sys/dev/mpt/mpilib/mpi_ioc.h ============================================================================== --- head/sys/dev/mpt/mpilib/mpi_ioc.h Tue Sep 1 22:06:23 2020 (r365201) +++ head/sys/dev/mpt/mpilib/mpi_ioc.h Tue Sep 1 22:06:41 2020 (r365202) @@ -158,7 +158,6 @@ #ifndef MPI_IOC_H #define MPI_IOC_H - /***************************************************************************** * * I O C M e s s a g e s @@ -216,7 +215,6 @@ typedef struct _MSG_IOC_INIT #define MPI_IOCINIT_HEADERVERSION_DEV_MASK (0x00FF) #define MPI_IOCINIT_HEADERVERSION_DEV_SHIFT (0) - typedef struct _MSG_IOC_INIT_REPLY { U8 WhoInit; /* 00h */ @@ -234,8 +232,6 @@ typedef struct _MSG_IOC_INIT_REPLY } MSG_IOC_INIT_REPLY, MPI_POINTER PTR_MSG_IOC_INIT_REPLY, IOCInitReply_t, MPI_POINTER pIOCInitReply_t; - - /****************************************************************************/ /* IOC Facts message */ /****************************************************************************/ @@ -340,7 +336,6 @@ typedef struct _MSG_IOC_FACTS_REPLY #define MPI_IOCFACTS_CAPABILITY_NO_SCSIIO16 (0x00000400) #define MPI_IOCFACTS_CAPABILITY_TLR (0x00000800) - /***************************************************************************** * * P o r t M e s s a g e s @@ -389,7 +384,6 @@ typedef struct _MSG_PORT_FACTS_REPLY } MSG_PORT_FACTS_REPLY, MPI_POINTER PTR_MSG_PORT_FACTS_REPLY, PortFactsReply_t, MPI_POINTER pPortFactsReply_t; - /* PortTypes values */ #define MPI_PORTFACTS_PORTTYPE_INACTIVE (0x00) @@ -405,7 +399,6 @@ typedef struct _MSG_PORT_FACTS_REPLY #define MPI_PORTFACTS_PROTOCOL_TARGET (0x04) #define MPI_PORTFACTS_PROTOCOL_INITIATOR (0x08) - /****************************************************************************/ /* Port Enable Message */ /****************************************************************************/ @@ -437,7 +430,6 @@ typedef struct _MSG_PORT_ENABLE_REPLY } MSG_PORT_ENABLE_REPLY, MPI_POINTER PTR_MSG_PORT_ENABLE_REPLY, PortEnableReply_t, MPI_POINTER pPortEnableReply_t; - /***************************************************************************** * * E v e n t M e s s a g e s @@ -654,7 +646,6 @@ typedef struct _EVENT_DATA_SAS_DEVICE_STATUS_CHANGE #define MPI_EVENT_SAS_DEV_STAT_RC_CMPL_INTERNAL_DEV_RESET (0x0E) #define MPI_EVENT_SAS_DEV_STAT_RC_CMPL_TASK_ABORT_INTERNAL (0x0F) - /* SCSI Event data for Queue Full event */ typedef struct _EVENT_DATA_QUEUE_FULL @@ -694,7 +685,6 @@ typedef struct _EVENT_DATA_RAID #define MPI_EVENT_RAID_RC_SMART_DATA (0x0A) #define MPI_EVENT_RAID_RC_REPLACE_ACTION_STARTED (0x0B) - /* MPI Integrated RAID Resync Update Event data */ typedef struct _MPI_EVENT_DATA_IR_RESYNC_UPDATE @@ -1010,8 +1000,6 @@ typedef struct _EVENT_DATA_SAS_EXPANDER_STATUS_CHANGE #define MPI_EVENT_SAS_EXP_FLAGS_ROUTE_TABLE_CONFIG (0x02) #define MPI_EVENT_SAS_EXP_FLAGS_CONFIG_IN_PROGRESS (0x01) - - /***************************************************************************** * * F i r m w a r e L o a d M e s s a g e s @@ -1048,7 +1036,6 @@ typedef struct _MSG_FW_DOWNLOAD #define MPI_FW_DOWNLOAD_ITYPE_MEGARAID (0x09) #define MPI_FW_DOWNLOAD_ITYPE_COMMON_BOOT_BLOCK (0x0B) - typedef struct _FWDownloadTCSGE { U8 Reserved; /* 00h */ @@ -1077,7 +1064,6 @@ typedef struct _MSG_FW_DOWNLOAD_REPLY } MSG_FW_DOWNLOAD_REPLY, MPI_POINTER PTR_MSG_FW_DOWNLOAD_REPLY, FWDownloadReply_t, MPI_POINTER pFWDownloadReply_t; - /****************************************************************************/ /* Firmware Upload message and associated structures */ /****************************************************************************/ @@ -1136,7 +1122,6 @@ typedef struct _MSG_FW_UPLOAD_REPLY U32 ActualImageSize; /* 14h */ } MSG_FW_UPLOAD_REPLY, MPI_POINTER PTR_MSG_FW_UPLOAD_REPLY, FWUploadReply_t, MPI_POINTER pFWUploadReply_t; - typedef struct _MPI_FW_HEADER { Modified: head/sys/dev/mpt/mpilib/mpi_lan.h ============================================================================== --- head/sys/dev/mpt/mpilib/mpi_lan.h Tue Sep 1 22:06:23 2020 (r365201) +++ head/sys/dev/mpt/mpilib/mpi_lan.h Tue Sep 1 22:06:41 2020 (r365202) @@ -66,7 +66,6 @@ #ifndef MPI_LAN_H #define MPI_LAN_H - /****************************************************************************** * * L A N M e s s a g e s @@ -88,7 +87,6 @@ typedef struct _MSG_LAN_SEND_REQUEST } MSG_LAN_SEND_REQUEST, MPI_POINTER PTR_MSG_LAN_SEND_REQUEST, LANSendRequest_t, MPI_POINTER pLANSendRequest_t; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009012206.081M6g8R055709>