ndis: Work around lack of C99 designated initializers in MSVC

Use a driver_ndis.c specific initialization function to fill in the
wpa_driver_ops information to make it easier to modify struct
wpa_driver_ops in the future. Being able to build driver_ndis.c
with MSVC was the only reason for having to maintain the same order
of function pointers in struct wpa_driver_ops and for having to
update driver_ndis.c for all changes in that structure.

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2011-11-03 18:45:21 +02:00
parent 4877e1fcf9
commit 39e7d718f6
2 changed files with 37 additions and 111 deletions

View file

@ -3213,114 +3213,33 @@ wpa_driver_ndis_get_interfaces(void *global_priv)
} }
const struct wpa_driver_ops wpa_driver_ndis_ops = { static const char *ndis_drv_name = "ndis";
"ndis", static const char *ndis_drv_desc = "Windows NDIS driver";
"Windows NDIS driver",
wpa_driver_ndis_get_bssid, struct wpa_driver_ops wpa_driver_ndis_ops;
wpa_driver_ndis_get_ssid,
wpa_driver_ndis_set_key, void driver_ndis_init_ops(void)
wpa_driver_ndis_init, {
wpa_driver_ndis_deinit, os_memset(&wpa_driver_ndis_ops, 0, sizeof(wpa_driver_ndis_ops));
NULL /* set_param */, wpa_driver_ndis_ops.name = ndis_drv_name;
NULL /* set_countermeasures */, wpa_driver_ndis_ops.desc = ndis_drv_desc;
wpa_driver_ndis_deauthenticate, wpa_driver_ndis_ops.get_bssid = wpa_driver_ndis_get_bssid;
wpa_driver_ndis_disassociate, wpa_driver_ndis_ops.get_ssid = wpa_driver_ndis_get_ssid;
wpa_driver_ndis_associate, wpa_driver_ndis_ops.set_key = wpa_driver_ndis_set_key;
wpa_driver_ndis_add_pmkid, wpa_driver_ndis_ops.init = wpa_driver_ndis_init;
wpa_driver_ndis_remove_pmkid, wpa_driver_ndis_ops.deinit = wpa_driver_ndis_deinit;
wpa_driver_ndis_flush_pmkid, wpa_driver_ndis_ops.deauthenticate = wpa_driver_ndis_deauthenticate;
wpa_driver_ndis_get_capa, wpa_driver_ndis_ops.disassociate = wpa_driver_ndis_disassociate;
wpa_driver_ndis_poll, wpa_driver_ndis_ops.associate = wpa_driver_ndis_associate;
wpa_driver_ndis_get_ifname, wpa_driver_ndis_ops.add_pmkid = wpa_driver_ndis_add_pmkid;
wpa_driver_ndis_get_mac_addr, wpa_driver_ndis_ops.remove_pmkid = wpa_driver_ndis_remove_pmkid;
NULL /* send_eapol */, wpa_driver_ndis_ops.flush_pmkid = wpa_driver_ndis_flush_pmkid;
NULL /* set_operstate */, wpa_driver_ndis_ops.get_capa = wpa_driver_ndis_get_capa;
NULL /* mlme_setprotection */, wpa_driver_ndis_ops.poll = wpa_driver_ndis_poll;
NULL /* get_hw_feature_data */, wpa_driver_ndis_ops.get_ifname = wpa_driver_ndis_get_ifname;
NULL /* send_mlme */, wpa_driver_ndis_ops.get_mac_addr = wpa_driver_ndis_get_mac_addr;
NULL /* update_ft_ies */, wpa_driver_ndis_ops.get_scan_results2 =
NULL /* send_ft_action */, wpa_driver_ndis_get_scan_results;
wpa_driver_ndis_get_scan_results, wpa_driver_ndis_ops.get_interfaces = wpa_driver_ndis_get_interfaces;
NULL /* set_country */, wpa_driver_ndis_ops.scan2 = wpa_driver_ndis_scan;
NULL /* global_init */, }
NULL /* global_deinit */,
NULL /* init2 */,
wpa_driver_ndis_get_interfaces,
wpa_driver_ndis_scan,
NULL /* authenticate */,
NULL /* set_ap */,
NULL /* hapd_init */,
NULL /* hapd_deinit */,
NULL /* set_ieee8021x */,
NULL /* set_privacy */,
NULL /* get_seqnum */,
NULL /* flush */,
NULL /* set_generic_elem */,
NULL /* read_sta_data */,
NULL /* hapd_send_eapol */,
NULL /* sta_deauth */,
NULL /* sta_disassoc */,
NULL /* sta_remove */,
NULL /* hapd_get_ssid */,
NULL /* hapd_set_ssid */,
NULL /* hapd_set_countermeasures */,
NULL /* sta_add */,
NULL /* get_inact_sec */,
NULL /* sta_clear_stats */,
NULL /* set_freq */,
NULL /* set_rts */,
NULL /* set_frag */,
NULL /* sta_set_flags */,
NULL /* set_rate_sets */,
NULL /* set_tx_queue_params */,
NULL /* if_add */,
NULL /* if_remove */,
NULL /* set_sta_vlan */,
NULL /* commit */,
NULL /* send_ether */,
NULL /* set_radius_acl_auth */,
NULL /* set_radius_acl_expire */,
NULL /* set_ap_wps_ie */,
NULL /* set_supp_port */,
NULL /* set_wds_sta */,
NULL /* send_action */,
NULL /* send_action_cancel_wait */,
NULL /* remain_on_channel */,
NULL /* cancel_remain_on_channel */,
NULL /* probe_req_report */,
NULL /* deinit_ap */,
NULL /* suspend */,
NULL /* resume */,
NULL /* signal_monitor */,
NULL /* send_frame */,
NULL /* shared_freq */,
NULL /* get_noa */,
NULL /* set_noa */,
NULL /* set_p2p_powersave */,
NULL /* ampdu */,
NULL /* get_radio_name */,
NULL /* p2p_find */,
NULL /* p2p_stop_find */,
NULL /* p2p_listen */,
NULL /* p2p_connect */,
NULL /* wps_success_cb */,
NULL /* p2p_group_formation_failed */,
NULL /* p2p_set_params */,
NULL /* p2p_prov_disc_req */,
NULL /* p2p_sd_request */,
NULL /* p2p_sd_cancel_request */,
NULL /* p2p_sd_response */,
NULL /* p2p_service_update */,
NULL /* p2p_reject */,
NULL /* p2p_invite */,
NULL /* send_tdls_mgmt */,
NULL /* tdls_oper */,
NULL /* signal_poll */,
NULL /* sta_assoc */,
NULL /* sta_auth */,
NULL /* add_tspec */,
NULL /* add_sta_node */,
NULL /* sched_scan */,
NULL /* stop_sched_scan */,
NULL /* poll_client */
};

View file

@ -2591,6 +2591,13 @@ struct wpa_global * wpa_supplicant_init(struct wpa_params *params)
if (params == NULL) if (params == NULL)
return NULL; return NULL;
#ifdef CONFIG_DRIVER_NDIS
{
void driver_ndis_init_ops(void);
driver_ndis_init_ops();
}
#endif /* CONFIG_DRIVER_NDIS */
#ifndef CONFIG_NO_WPA_MSG #ifndef CONFIG_NO_WPA_MSG
wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb); wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb);
#endif /* CONFIG_NO_WPA_MSG */ #endif /* CONFIG_NO_WPA_MSG */