Changeset 796

Timestamp:

Jul 1, 2014, 11:15:00 AM (11 years ago)

Author:

psmedley

Message:

Apply OS/2 patches and associated additional files to wpa_supplicant

Location:

wpa_supplicant/trunk

Files:

• src/drivers/driver_genmac.c (added)
• src/drivers/drivers.c (modified) (2 diffs)
• src/drivers/drivers.mak (modified) (1 diff)
• src/drivers/packet32.c (added)
• src/drivers/packet32.h (added)
• src/l2_packet/l2_packet_os2.c (added)
• src/utils/common.h (modified) (2 diffs)
• src/utils/os_os2.c (added)
• wpa_supplicant/.config (added)
• wpa_supplicant/Makefile (modified) (1 diff)
• wpa_supplicant/wpa_gui-qt4/wpa_gui.pro (modified) (2 diffs)
• wpa_supplicant/wpa_supplicant.c (modified) (1 diff)

wpa_supplicant/trunk/src/drivers/drivers.c ¶

@@ -49 +49 @@
 extern struct wpa_driver_ops wpa_driver_atheros_ops; /* driver_atheros.c */
 #endif /* CONFIG_DRIVER_ATHEROS */
+#ifdef CONFIG_DRIVER_GENMAC
+extern struct wpa_driver_ops wpa_driver_ndis_ops; /* driver_genmac.c */
+#endif /* CONFIG_DRIVER_GENMAC */
 #ifdef CONFIG_DRIVER_NONE
 extern struct wpa_driver_ops wpa_driver_none_ops; /* driver_none.c */
@@ -92 +95 @@
         &wpa_driver_atheros_ops,
 #endif /* CONFIG_DRIVER_ATHEROS */
+#ifdef CONFIG_DRIVER_GENMAC
+        &wpa_driver_ndis_ops,
+#endif /* CONFIG_DRIVER_GENMAC */
 #ifdef CONFIG_DRIVER_NONE
         &wpa_driver_none_ops,

wpa_supplicant/trunk/src/drivers/drivers.mak ¶

@@ -146 +146 @@
 ifdef NEED_NETLINK
 DRV_OBJS += ../src/drivers/netlink.o
+endif
+
+ifdef CONFIG_DRIVER_GENMAC
+DRV_WPA_CFLAGS += -DCONFIG_DRIVER_GENMAC -I../src/drivers
+DRV_WPA_OBJS += ../src/drivers/driver_genmac.o ../src/drivers/packet32.o
 endif
 

wpa_supplicant/trunk/src/utils/common.h ¶

@@ -18 +18 @@
 
 #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || \
-    defined(__OpenBSD__)
+    defined(__OpenBSD__) || defined(__OS2__)
 #include <sys/types.h>
 #include <sys/endian.h>
@@ -34 +34 @@
 #endif /* __OpenBSD__ */
 #endif /* defined(__FreeBSD__) || defined(__NetBSD__) ||
-        * defined(__DragonFly__) || defined(__OpenBSD__) */
+        * defined(__DragonFly__) || defined(__OpenBSD__) || defined(__OS2__) */
 
 #ifdef __APPLE__

wpa_supplicant/trunk/wpa_supplicant/Makefile ¶

@@ -122 +122 @@
 ifeq ($(CONFIG_ELOOP), eloop)
 # Using glibc < 2.17 requires -lrt for clock_gettime()
-LIBS += -lrt
-LIBS_c += -lrt
-LIBS_p += -lrt
+#LIBS += -lrt
+#LIBS_c += -lrt
+#LIBS_p += -lrt
 endif
 

wpa_supplicant/trunk/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro ¶

@@ -24 +24 @@
   SOURCES += ../../src/utils/os_win32.c
   RESOURCES += icons_png.qrc
-} else {
+} else:os2 {
+  DEFINES += CONFIG_CTRL_IFACE_UDP
+  SOURCES += ../../src/utils/os_os2.c
+  LFLAGS += -static-libgcc
+}else {
   DEFINES += CONFIG_CTRL_IFACE_UNIX
   SOURCES += ../../src/utils/os_unix.c
@@ -52 +56 @@
         peers.cpp \
         stringquery.cpp \
-        ../../src/common/wpa_ctrl.c
+        ../../src/common/wpa_ctrl.c \
+        ../../src/utils/wpa_debug.c
 
 RESOURCES += icons.qrc

wpa_supplicant/trunk/wpa_supplicant/wpa_supplicant.c ¶

@@ -3991 +3991 @@
                 return NULL;
 
-#ifdef CONFIG_DRIVER_NDIS
+#if defined(CONFIG_DRIVER_NDIS) || defined(CONFIG_DRIVER_GENMAC)
         {
                 void driver_ndis_init_ops(void);