PERFORCE change 117746 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=117746

Change 117746 by sam at sam_ebb on 2007/04/09 16:22:53

	correct compilation problems; the code was writen for building
	only on Windows; I've passed these to Jouni who says he'll
	incorporate them

Affected files ...

.. //depot/projects/wifi/contrib/wpa_supplicant/driver_ndis.c#5 edit
.. //depot/projects/wifi/contrib/wpa_supplicant/driver_ndis.h#4 edit
.. //depot/projects/wifi/contrib/wpa_supplicant/driver_ndis_.c#3 edit

Differences ...

==== //depot/projects/wifi/contrib/wpa_supplicant/driver_ndis.c#5 (text+ko) ====

@@ -42,7 +42,9 @@
 #include "driver_ndis.h"
 
 int wpa_driver_register_event_cb(struct wpa_driver_ndis_data *drv);
+#ifdef CONFIG_NDIS_EVENTS_INTEGRATED
 void wpa_driver_ndis_event_pipe_cb(void *eloop_data, void *user_data);
+#endif
 
 static void wpa_driver_ndis_deinit(void *priv);
 static void wpa_driver_ndis_poll(void *drv);
@@ -1522,7 +1524,7 @@
 		    wpa_driver_ndis_adapter_open(drv) < 0) {
 			wpa_printf(MSG_DEBUG, "NDIS: Driver re-initialization "
 				   "(%d) failed", i);
-			Sleep(1000);
+			os_sleep(0, 1000*1000);
 		} else {
 			wpa_printf(MSG_DEBUG, "NDIS: Driver re-initialized");
 			break;
@@ -2175,6 +2177,7 @@
 }
 
 
+#ifdef CONFIG_SUPPORT_WZC
 #ifndef _WIN32_WCE
 /*
  * These structures are undocumented for WinXP; only WinCE version is
@@ -2538,6 +2541,7 @@
 	return ret;
 #endif /* _WIN32_WCE */
 }
+#endif /* CONFIG_SUPPORT_WZC */
 
 
 #ifdef CONFIG_USE_NDISUIO
@@ -2688,9 +2692,9 @@
 		os_free(drv);
 		return NULL;
 	}
-
+#ifdef CONFIG_SUPPORT_WCZ
 	wpa_driver_ndis_set_wzc(drv, 0);
-
+#endif
 	if (wpa_driver_ndis_adapter_open(drv) < 0) {
 		wpa_driver_ndis_adapter_close(drv);
 		os_free(drv);
@@ -2780,9 +2784,10 @@
 
 	wpa_driver_ndis_adapter_close(drv);
 
+#ifdef CONFIG_SUPPORT_WCZ
 	if (drv->wzc_disabled)
 		wpa_driver_ndis_set_wzc(drv, 1);
-
+#endif
 #ifdef _WIN32_WCE
 	os_free(drv->adapter_name);
 #endif /* _WIN32_WCE */

==== //depot/projects/wifi/contrib/wpa_supplicant/driver_ndis.h#4 (text+ko) ====

@@ -15,11 +15,13 @@
 #ifndef DRIVER_NDIS_H
 #define DRIVER_NDIS_H
 
+#ifdef CONFIG_NDIS_EVENTS_INTEGRATED
 struct ndis_events_data;
 struct ndis_events_data * ndis_events_init(HANDLE *read_pipe, HANDLE *event,
 					   const char *ifname,
 					   const char *desc);
 void ndis_events_deinit(struct ndis_events_data *events);
+#endif
 
 struct ndis_pmkid_entry {
 	struct ndis_pmkid_entry *next;
@@ -53,8 +55,10 @@
 	int mode;
 	int wzc_disabled;
 	int oid_bssid_set;
+#ifdef CONFIG_NDIS_EVENTS_INTEGRATED
 	HANDLE events_pipe, event_avail;
 	struct ndis_events_data *events;
+#endif
 };
 
 #endif /* DRIVER_NDIS_H */

==== //depot/projects/wifi/contrib/wpa_supplicant/driver_ndis_.c#3 (text+ko) ====

@@ -92,6 +92,7 @@
 }
 
 
+#ifdef CONFIG_NDIS_EVENTS_INTEGRATED
 void wpa_driver_ndis_event_pipe_cb(void *eloop_data, void *user_data)
 {
 	struct wpa_driver_ndis_data *drv = eloop_data;
@@ -106,3 +107,4 @@
 			   (int) GetLastError());
 	}
 }
+#endif /* CONFIG_NDIS_EVENTS_INTEGRATED */