Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/ic KNF. s/u_quad_t/uint64_t/. No functional change.
details: https://anonhg.NetBSD.org/src/rev/df428d82a40f
branches: trunk
changeset: 366041:df428d82a40f
user: msaitoh <msaitoh%NetBSD.org@localhost>
date: Wed May 11 15:20:54 2022 +0000
description:
KNF. s/u_quad_t/uint64_t/. No functional change.
diffstat:
sys/dev/ic/mfireg.h | 233 ++++++++++++++++++++++++++-------------------------
1 files changed, 117 insertions(+), 116 deletions(-)
diffs (truncated from 411 to 300 lines):
diff -r 6ad4c1a9478c -r df428d82a40f sys/dev/ic/mfireg.h
--- a/sys/dev/ic/mfireg.h Wed May 11 14:58:00 2022 +0000
+++ b/sys/dev/ic/mfireg.h Wed May 11 15:20:54 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mfireg.h,v 1.16 2022/05/07 04:47:25 msaitoh Exp $ */
+/* $NetBSD: mfireg.h,v 1.17 2022/05/11 15:20:54 msaitoh Exp $ */
/* $OpenBSD: mfireg.h,v 1.24 2006/06/19 19:05:45 marco Exp $ */
/*
* Copyright (c) 2006 Marco Peereboom <marco%peereboom.us@localhost>
@@ -75,7 +75,7 @@
#define MFI_IQP 0x40 /* inbound queue port */
#define MFI_OQP 0x44 /* outbound queue port */
#define MFI_ODC 0xa0 /* outbound doorbell clr */
-#define MFI_OSP 0xb0 /* outbound scratch pad */
+#define MFI_OSP 0xb0 /* outbound scratch pad */
/* ThunderBolt specific Register */
#define MFI_RPI 0x6c /* reply_post_host_index */
@@ -357,27 +357,27 @@
} mfi_evt_locale_t;
typedef enum {
- MR_EVT_ARGS_NONE = 0x00,
- MR_EVT_ARGS_CDB_SENSE,
- MR_EVT_ARGS_LD,
- MR_EVT_ARGS_LD_COUNT,
- MR_EVT_ARGS_LD_LBA,
- MR_EVT_ARGS_LD_OWNER,
- MR_EVT_ARGS_LD_LBA_PD_LBA,
- MR_EVT_ARGS_LD_PROG,
- MR_EVT_ARGS_LD_STATE,
- MR_EVT_ARGS_LD_STRIP,
- MR_EVT_ARGS_PD,
- MR_EVT_ARGS_PD_ERR,
- MR_EVT_ARGS_PD_LBA,
- MR_EVT_ARGS_PD_LBA_LD,
- MR_EVT_ARGS_PD_PROG,
- MR_EVT_ARGS_PD_STATE,
- MR_EVT_ARGS_PCI,
- MR_EVT_ARGS_RATE,
- MR_EVT_ARGS_STR,
- MR_EVT_ARGS_TIME,
- MR_EVT_ARGS_ECC
+ MR_EVT_ARGS_NONE = 0x00,
+ MR_EVT_ARGS_CDB_SENSE,
+ MR_EVT_ARGS_LD,
+ MR_EVT_ARGS_LD_COUNT,
+ MR_EVT_ARGS_LD_LBA,
+ MR_EVT_ARGS_LD_OWNER,
+ MR_EVT_ARGS_LD_LBA_PD_LBA,
+ MR_EVT_ARGS_LD_PROG,
+ MR_EVT_ARGS_LD_STATE,
+ MR_EVT_ARGS_LD_STRIP,
+ MR_EVT_ARGS_PD,
+ MR_EVT_ARGS_PD_ERR,
+ MR_EVT_ARGS_PD_LBA,
+ MR_EVT_ARGS_PD_LBA_LD,
+ MR_EVT_ARGS_PD_PROG,
+ MR_EVT_ARGS_PD_STATE,
+ MR_EVT_ARGS_PCI,
+ MR_EVT_ARGS_RATE,
+ MR_EVT_ARGS_STR,
+ MR_EVT_ARGS_TIME,
+ MR_EVT_ARGS_ECC
} mfi_evt_args;
/* XXX should be in mfi_evt_args ? */
@@ -543,7 +543,7 @@
union {
struct mfi_sg32 sg32[2];
struct mfi_sg64 sg64[2];
- } msf_sgl;
+ } msf_sgl;
} __packed;
union mfi_frame {
@@ -561,9 +561,9 @@
union mfi_evt_class_locale {
struct {
uint16_t locale;
- uint8_t reserved;
+ uint8_t reserved;
int8_t class;
- } mec_members;
+ } mec_members;
uint32_t mec_word;
};
@@ -613,12 +613,12 @@
} encl_address;
} address;
- uint8_t scsi_dev_type;
+ uint8_t scsi_dev_type;
union {
uint8_t port_bitmap;
uint8_t port_numbers;
- } connected;
+ } connected;
uint64_t sas_addr[2];
};
@@ -641,7 +641,7 @@
uint8_t sense[64];
} __packed cdb_sense;
- struct mfi_evtarg_ld ld;
+ struct mfi_evtarg_ld ld;
struct {
struct mfi_evtarg_ld ld;
@@ -762,12 +762,12 @@
uint16_t mcp_ecc_bucket_leak_rate;
uint8_t mcp_restore_hotspare_on_insertion;
uint8_t mcp_expose_encl_devices;
- uint8_t maintainPdFailHistory;
- uint8_t disallowHostRequestReordering;
+ uint8_t maintainPdFailHistory;
+ uint8_t disallowHostRequestReordering;
/* set TRUE to abort CC on detecting an inconsistency */
- uint8_t abortCCOnError;
+ uint8_t abortCCOnError;
/* load balance mode (MR_LOAD_BALANCE_MODE) */
- uint8_t loadBalanceMode;
+ uint8_t loadBalanceMode;
/*
* 0 - use auto detect logic of backplanes like SGPIO, i2c SEP using
* h/w mechanism like GPIO pins
@@ -775,12 +775,12 @@
* 2 - disable i2c SEP auto detect
* 3 - disable both auto detect
*/
- uint8_t disableAutoDetectBackplane;
+ uint8_t disableAutoDetectBackplane;
/*
* % of source LD to be reserved for a VDs snapshot in snapshot
* repository, for metadata and user data: 1=5%, 2=10%, 3=15% and so on
*/
- uint8_t snapVDSpace;
+ uint8_t snapVDSpace;
/*
* Add properties that can be controlled by a bit in the following
@@ -789,24 +789,25 @@
struct {
/* set TRUE to disable copyBack (0=copback enabled) */
uint32_t copyBackDisabled :1;
- uint32_t SMARTerEnabled :1;
- uint32_t prCorrectUnconfiguredAreas :1;
- uint32_t useFdeOnly :1;
- uint32_t disableNCQ :1;
- uint32_t SSDSMARTerEnabled :1;
- uint32_t SSDPatrolReadEnabled :1;
- uint32_t enableSpinDownUnconfigured :1;
- uint32_t autoEnhancedImport :1;
- uint32_t enableSecretKeyControl :1;
- uint32_t disableOnlineCtrlReset :1;
+ uint32_t SMARTerEnabled :1;
+ uint32_t prCorrectUnconfiguredAreas :1;
+ uint32_t useFdeOnly :1;
+ uint32_t disableNCQ :1;
+ uint32_t SSDSMARTerEnabled :1;
+ uint32_t SSDPatrolReadEnabled :1;
+ uint32_t enableSpinDownUnconfigured :1;
+ uint32_t autoEnhancedImport :1;
+ uint32_t enableSecretKeyControl :1;
+ uint32_t disableOnlineCtrlReset :1;
uint32_t allowBootWithPinnedCache :1;
- uint32_t disableSpinDownHS :1;
- uint32_t enableJBOD :1;
+ uint32_t disableSpinDownHS :1;
+ uint32_t enableJBOD :1;
uint32_t reserved :18;
} OnOffProperties;
/*
* % of source LD to be reserved for auto snapshot in snapshot
- * repository, for metadata and user data: 1=5%, 2=10%, 3=15% and so on.
+ * repository, for metadata and user data: 1=5%, 2=10%, 3=15% and so
+ * on.
*/
uint8_t autoSnapVDSpace;
/*
@@ -854,10 +855,10 @@
/* firmware component info */
struct mfi_info_component {
- char mic_name[8];
- char mic_version[32];
- char mic_build_date[16];
- char mic_build_time[16];
+ char mic_name[8];
+ char mic_version[32];
+ char mic_build_date[16];
+ char mic_build_time[16];
} __packed;
/* controller info from MFI_DCMD_CTRL_GETINFO. */
@@ -914,7 +915,7 @@
#define MFI_INFO_RAID_6 0x10
uint32_t mci_adapter_ops;
-#define MFI_INFO_AOPS_RBLD_RATE 0x0001
+#define MFI_INFO_AOPS_RBLD_RATE 0x0001
#define MFI_INFO_AOPS_CC_RATE 0x0002
#define MFI_INFO_AOPS_BGI_RATE 0x0004
#define MFI_INFO_AOPS_RECON_RATE 0x0008
@@ -982,7 +983,7 @@
uint8_t mll_res2;
uint8_t mll_res3;
uint8_t mll_res4;
- u_quad_t mll_size;
+ uint64_t mll_size;
} mll_list[MFI_MAX_LD];
} __packed;
@@ -1029,8 +1030,8 @@
} __packed;
struct mfi_ld_span {
- u_quad_t mls_start_block;
- u_quad_t mls_no_blocks;
+ uint64_t mls_start_block;
+ uint64_t mls_no_blocks;
uint16_t mls_index;
uint8_t mls_res[6];
} __packed;
@@ -1056,7 +1057,7 @@
struct mfi_ld_details {
struct mfi_ld_cfg mld_cfg;
- u_quad_t mld_size;
+ uint64_t mld_size;
struct mfi_ld_progress mld_progress;
uint16_t mld_clust_own_id;
uint8_t mld_res1;
@@ -1073,7 +1074,7 @@
uint8_t mpa_enc_slot;
uint8_t mpa_scsi_type;
uint8_t mpa_port;
- u_quad_t mpa_sas_address[2];
+ uint64_t mpa_sas_address[2];
} __packed;
#define MFI_MAX_PD 256
@@ -1131,11 +1132,11 @@
uint8_t mpp_cnt;
uint8_t mpp_severed;
uint8_t mpp_res[6];
- u_quad_t mpp_sas_addr[4];
+ uint64_t mpp_sas_addr[4];
} __packed mpd_path;
- u_quad_t mpd_size;
- u_quad_t mpd_no_coerce_size;
- u_quad_t mpd_coerce_size;
+ uint64_t mpd_size;
+ uint64_t mpd_no_coerce_size;
+ uint64_t mpd_coerce_size;
uint16_t mpd_enc_id;
uint8_t mpd_enc_idx;
uint8_t mpd_enc_slot;
@@ -1147,7 +1148,7 @@
/* array configuration from MR_DCMD_CONF_GET */
struct mfi_array {
- u_quad_t mar_smallest_pd;
+ uint64_t mar_smallest_pd;
uint8_t mar_no_disk;
uint8_t mar_res1;
uint16_t mar_array_ref;
@@ -1194,11 +1195,11 @@
uint16_t spec_info;
uint16_t serial_number;
uint16_t pack_stat_config;
- uint8_t mfg_name[12];
- uint8_t device_name[8];
- uint8_t device_chemistry[8];
- uint8_t mfg_data[8];
- uint8_t reserved[17];
+ uint8_t mfg_name[12];
+ uint8_t device_name[8];
+ uint8_t device_chemistry[8];
+ uint8_t mfg_data[8];
+ uint8_t reserved[17];
} __packed;
struct mfi_ibbu_state {
@@ -1224,15 +1225,15 @@
union mfi_bbu_status_detail {
struct mfi_ibbu_state ibbu;
- struct mfi_bbu_state bbu;
+ struct mfi_bbu_state bbu;
};
/* informations from MR_DCMD_BBU_GET_STATUS */
struct mfi_bbu_status {
uint8_t battery_type;
-#define MFI_BBU_TYPE_NONE 0
-#define MFI_BBU_TYPE_IBBU 1
Home |
Main Index |
Thread Index |
Old Index