From 42b74848d1bc71601cb8bec7fbcf705aaf856c2b Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Thu, 12 Jul 2018 20:40:27 -0700 Subject: [PATCH] qcacmn: Clean up the extscan unified WMI (phase 3) For a full explanation of the problem and phased solution refer to "qcacmn: Clean up the extscan unified WMI (phase 1)", Change-Id I11800361b572331cfada00fb7d518c314df20b43, in the qca-wifi-host-cmn project. For phase 3 (this change): Remove the unions introduced in phase 1, leaving just the properly named replacement identifiers. Change-Id: Ia14a42a1a767a850fbfd82a5755ddea51246a95d CRs-Fixed: 2282843 --- wmi/inc/wmi_unified_param.h | 106 +++++++----------------------------- 1 file changed, 20 insertions(+), 86 deletions(-) diff --git a/wmi/inc/wmi_unified_param.h b/wmi/inc/wmi_unified_param.h index 1c51835efb..e80ee1c625 100644 --- a/wmi/inc/wmi_unified_param.h +++ b/wmi/inc/wmi_unified_param.h @@ -1868,10 +1868,7 @@ struct wifi_passpoint_network_param { */ struct wifi_passpoint_req_param { uint32_t request_id; - union { - uint32_t session_id; - uint32_t vdev_id; - }; + uint32_t vdev_id; uint32_t num_networks; struct wifi_passpoint_network_param networks[]; }; @@ -2266,10 +2263,7 @@ struct wifi_epno_network_params { */ struct wifi_enhanced_pno_params { uint32_t request_id; - union { - uint32_t session_id; - uint32_t vdev_id; - }; + uint32_t vdev_id; uint32_t min_5ghz_rssi; uint32_t min_24ghz_rssi; uint32_t initial_score_max; @@ -2281,9 +2275,6 @@ struct wifi_enhanced_pno_params { struct wifi_epno_network_params networks[]; }; -/* legacy misspelled name */ -#define wifi_enhanched_pno_params wifi_enhanced_pno_params - enum { WMI_AP_RX_DATA_OFFLOAD = 0x00, WMI_STA_RX_DATA_OFFLOAD = 0x01, @@ -2323,10 +2314,7 @@ enum wmi_extscan_report_events_type { */ struct extscan_capabilities_params { uint32_t request_id; - union { - uint8_t session_id; - uint8_t vdev_id; - }; + uint8_t vdev_id; }; /** @@ -2337,10 +2325,7 @@ struct extscan_capabilities_params { */ struct extscan_capabilities_reset_params { uint32_t request_id; - union { - uint8_t session_id; - uint8_t vdev_id; - }; + uint8_t vdev_id; }; /** @@ -2350,10 +2335,7 @@ struct extscan_capabilities_reset_params { */ struct extscan_bssid_hotlist_reset_params { uint32_t request_id; - union { - uint8_t session_id; - uint8_t vdev_id; - }; + uint8_t vdev_id; }; /** @@ -2363,10 +2345,7 @@ struct extscan_bssid_hotlist_reset_params { */ struct extscan_stop_req_params { uint32_t request_id; - union { - uint8_t session_id; - uint8_t vdev_id; - }; + uint8_t vdev_id; }; /** @@ -2393,10 +2372,7 @@ struct ap_threshold_params { */ struct extscan_set_sig_changereq_params { uint32_t request_id; - union { - uint8_t session_id; - uint8_t vdev_id; - }; + uint8_t vdev_id; uint32_t rssi_sample_size; uint32_t lostap_sample_size; uint32_t min_breaching; @@ -2412,10 +2388,7 @@ struct extscan_set_sig_changereq_params { */ struct extscan_cached_result_params { uint32_t request_id; - union { - uint8_t session_id; - uint8_t vdev_id; - }; + uint8_t vdev_id; bool flush; }; @@ -2434,15 +2407,9 @@ struct extscan_cached_result_params { */ struct wifi_scan_channelspec_params { uint32_t channel; - union { - uint32_t dwellTimeMs; - uint32_t dwell_time_ms; - }; + uint32_t dwell_time_ms; bool passive; - union { - uint8_t chnlClass; - uint8_t channel_class; - }; + uint8_t channel_class; }; /** @@ -2504,17 +2471,11 @@ struct wifi_scan_bucket_params { uint8_t bucket; enum wmi_wifi_band band; uint32_t period; - union { - uint32_t reportEvents; - uint32_t report_events; - }; + uint32_t report_events; uint32_t max_period; uint32_t exponent; uint32_t step_count; - union { - uint32_t numChannels; - uint32_t num_channels; - }; + uint32_t num_channels; uint32_t min_dwell_time_active; uint32_t max_dwell_time_active; uint32_t min_dwell_time_passive; @@ -2543,28 +2504,13 @@ struct wifi_scan_bucket_params { * @buckets: buckets array */ struct wifi_scan_cmd_req_params { - union { - uint32_t basePeriod; - uint32_t base_period; - }; - union { - uint32_t maxAPperScan; - uint32_t max_ap_per_scan; - }; + uint32_t base_period; + uint32_t max_ap_per_scan; uint32_t report_threshold_percent; uint32_t report_threshold_num_scans; - union { - uint32_t requestId; - uint32_t request_id; - }; - union { - uint8_t sessionId; - uint8_t vdev_id; - }; - union { - uint32_t numBuckets; - uint32_t num_buckets; - }; + uint32_t request_id; + uint8_t vdev_id; + uint32_t num_buckets; uint32_t min_dwell_time_active; uint32_t max_dwell_time_active; uint32_t min_dwell_time_passive; @@ -3628,25 +3574,13 @@ struct wmi_roam_invoke_cmd { * @ap: hotlist APs */ struct ext_scan_setbssid_hotlist_params { - union { - uint32_t requestId; - uint32_t request_id; - }; - union { - uint8_t sessionId; - uint8_t vdev_id; - }; + uint32_t request_id; + uint8_t vdev_id; uint32_t lost_ap_sample_size; - union { - uint32_t numAp; - uint32_t num_ap; - }; + uint32_t num_ap; struct ap_threshold_params ap[WMI_WLAN_EXTSCAN_MAX_HOTLIST_APS]; }; -/* legacy misspelled name */ -#define ext_scan_setbssi_hotlist_params ext_scan_setbssid_hotlist_params - /** * struct host_mem_req - Host memory request paramseters request by target * @req_id: Request id to identify the request.