Changeset 6259

Timestamp:

09/27/10 16:38:35 (3 years ago)

Author:

jow

Message:

[libiwinfo]

• fix compilation of WL backend
• conditionally compile backends according to selected wifi drivers

Location:

luci/trunk/contrib/package/iwinfo

Files:

• Makefile (modified) (3 diffs)
• src/include/broadcom.h (modified) (1 diff)
• src/iwinfo_wl.c (modified) (1 diff)
• src/Makefile (modified) (1 diff)

luci/trunk/contrib/package/iwinfo/Makefile

@@ -20 +20 @@
   SUBMENU:=Libraries
   TITLE:=Generalized Wireless Information Library (iwinfo)
-  DEPENDS:=+libnl-tiny +liblua +lua
+  DEPENDS:=+PACKAGE_kmod-mac80211:libnl-tiny +liblua +lua
 endef
 
@@ -36 +36 @@
 endef
 
+IWINFO_BACKENDS := \
+    $(if $(CONFIG_PACKAGE_kmod-brcm-wl),wl) \
+    $(if $(CONFIG_PACKAGE_kmod-madwifi),madwifi) \
+    $(if $(CONFIG_PACKAGE_kmod-mac80211),nl80211)
+
 TARGET_CFLAGS += \
     -I$(STAGING_DIR)/usr/include \
@@ -43 +48 @@
     FPIC="$(FPIC)" \
     CFLAGS="$(TARGET_CFLAGS)" \
-    LDFLAGS="$(TARGET_LDFLAGS)"
+    LDFLAGS="$(TARGET_LDFLAGS)" \
+    BACKENDS="$(IWINFO_BACKENDS)"
 
 define Package/libiwinfo/install

luci/trunk/contrib/package/iwinfo/src/include/broadcom.h

@@ -30 +30 @@
 #define WLC_GET_RATE                12
 #define WLC_GET_INFRA               19
+#define WLC_GET_AUTH                21
 #define WLC_GET_BSSID               23
 #define WLC_GET_SSID                25

luci/trunk/contrib/package/iwinfo/src/iwinfo_wl.c

@@ -266 +266 @@
 
             /* ToDo: evaluate WEP key lengths */
-            c->auth_ciphers = IWINFO_CIPHER_WEP40 | IWINFO_CIPHER_WEP104;
+            c->pair_ciphers = IWINFO_CIPHER_WEP40 | IWINFO_CIPHER_WEP104;
             c->auth_suites |= IWINFO_KMGMT_NONE;
             break;

luci/trunk/contrib/package/iwinfo/src/Makefile

@@ -1 @@
-IWINFO_LDFLAGS    = $(LDFLAGS) -shared -llua $(if $(CRAP),,-lnl-tiny)
-IWINFO_CFLAGS     = $(CFLAGS) -std=gnu99 -fstrict-aliasing $(if $(CRAP),-DUSE_WL,-DUSE_MADWIFI -DUSE_NL80211)
+IWINFO_BACKENDS   = $(if $(BACKENDS),$(BACKENDS),madwifi nl80211)
+IWINFO_LDFLAGS    = $(LDFLAGS) -shared -llua
+IWINFO_CFLAGS     = $(CFLAGS) -std=gnu99 -fstrict-aliasing
 IWINFO_SO         = iwinfo.so
-IWINFO_OBJ        = $(if $(CRAP),iwinfo_wl.o,iwinfo_madwifi.o iwinfo_nl80211.o) \
-    iwinfo_wext.o iwinfo_wext_scan.o iwinfo_lualib.o
+IWINFO_OBJ        = iwinfo_wext.o iwinfo_wext_scan.o iwinfo_lualib.o
+
+ifneq ($(filter wl,$(IWINFO_BACKENDS)),)
+    IWINFO_CFLAGS  += -DUSE_WL
+    IWINFO_OBJ     += iwinfo_wl.o
+endif
+
+ifneq ($(filter madwifi,$(IWINFO_BACKENDS)),)
+    IWINFO_CFLAGS  += -DUSE_MADWIFI
+    IWINFO_OBJ     += iwinfo_madwifi.o
+endif
+
+ifneq ($(filter nl80211,$(IWINFO_BACKENDS)),)
+    IWINFO_CFLAGS  += -DUSE_NL80211
+    IWINFO_LDFLAGS += -lnl-tiny
+    IWINFO_OBJ     += iwinfo_nl80211.o
+endif
+
 
 %.o: %.c