Changeset 163 for trunk/tx80211.c

Timestamp:

08/16/08 15:03:23 (5 months ago)

Author:

dragorn

Message:

Expanded d80211 into mac80211 and added multiple other cards (from diff sent on irc

by someone who I can't find in the logs, and the original diff was broken so the
actions were recreated)

Files:

• trunk/tx80211.c (modified) (4 diffs)

trunk/tx80211.c

@@ -120 +120 @@
 
         ret->cardnames[ret->num_cards] = strdup("rt2570");
-        ret->descriptions[ret->num_cards] = strdup("Raylink 2570 802.11b");
+        ret->descriptions[ret->num_cards] = strdup("Ralink 2570 802.11b");
         ret->capabilities[ret->num_cards] = tx80211_rt2570_capabilities();
         ret->num_cards++;
 
         ret->cardnames[ret->num_cards] = strdup("rt2500");
-        ret->descriptions[ret->num_cards] = strdup("Raylink 2500 802.11b");
+        ret->descriptions[ret->num_cards] = strdup("Ralink 2500 802.11b");
         ret->capabilities[ret->num_cards] = tx80211_rt2500_capabilities();
         ret->num_cards++;
 
         ret->cardnames[ret->num_cards] = strdup("rt73");
-        ret->descriptions[ret->num_cards] = strdup("Raylink 73 802.11g USB");
+        ret->descriptions[ret->num_cards] = strdup("Ralink 73 802.11g USB");
         ret->capabilities[ret->num_cards] = tx80211_rt73_capabilities();
         ret->num_cards++;
 
         ret->cardnames[ret->num_cards] = strdup("rt61");
-        ret->descriptions[ret->num_cards] = strdup("Raylink 61 pre-N PC Card");
+        ret->descriptions[ret->num_cards] = strdup("Ralink 61 pre-N PC Card");
         ret->capabilities[ret->num_cards] = tx80211_rt61_capabilities();
         ret->num_cards++;
@@ -150 +150 @@
 
         ret->cardnames[ret->num_cards] = strdup("d80211");
-        ret->descriptions[ret->num_cards] = strdup("Linux generic d80211");
-        ret->capabilities[ret->num_cards] = tx80211_d80211_capabilities();
+        ret->descriptions[ret->num_cards] = strdup("Linux generic mac80211");
+        ret->capabilities[ret->num_cards] = tx80211_mac80211_capabilities();
+        ret->num_cards++;
+
+        ret->cardnames[ret->num_cards] = strdup("mac80211");
+        ret->descriptions[ret->num_cards] = strdup("Linux generic mac80211");
+        ret->capabilities[ret->num_cards] = tx80211_mac80211_capabilities();
         ret->num_cards++;
 
         ret->cardnames[ret->num_cards] = strdup("ath5k");
-        ret->descriptions[ret->num_cards] = strdup("Ath5k Atheros");
-        ret->capabilities[ret->num_cards] = tx80211_d80211_capabilities();
+        ret->descriptions[ret->num_cards] = strdup("Ath5k Atheros (mac80211)");
+        ret->capabilities[ret->num_cards] = tx80211_mac80211_capabilities();
         ret->num_cards++;
 
         ret->cardnames[ret->num_cards] = strdup("iwlwifi");
-        ret->descriptions[ret->num_cards] = strdup("iwlwifi Intel");
-        ret->capabilities[ret->num_cards] = tx80211_d80211_capabilities();
-        ret->num_cards++;
+        ret->descriptions[ret->num_cards] = strdup("iwlwifi Intel (mac80211)");
+        ret->capabilities[ret->num_cards] = tx80211_mac80211_capabilities();
+        ret->num_cards++;
+
+        ret->cardnames[ret->num_cards] = strdup("iwl-agn");
+        ret->descriptions[ret->num_cards] = strdup("iwlwifi Intel (mac80211)");
+        ret->capabilities[ret->num_cards] = tx80211_mac80211_capabilities();
+        ret->num_cards++;
+
+        ret->cardnames[ret->num_cards] = strdup("iwl4965");
+        ret->descriptions[ret->num_cards] = strdup("iwlwifi Intel (mac80211)");
+        ret->capabilities[ret->num_cards] = tx80211_mac80211_capabilities();
+        ret->num_cards++;
+
+        ret->cardnames[ret->num_cards] = strdup("iwl5000");
+        ret->descriptions[ret->num_cards] = strdup("iwlwifi Intel (mac80211)");
+        ret->capabilities[ret->num_cards] = tx80211_mac80211_capabilities();
+        ret->num_cards++;
+
+        ret->cardnames[ret->num_cards] = strdup("b43");
+        ret->descriptions[ret->num_cards] = strdup("Broadcom b43 (mac80211)");
+        ret->capabilities[ret->num_cards] = tx80211_mac80211_capabilities();
+        ret->num_cards++;
+
+        ret->cardnames[ret->num_cards] = strdup("b43-legacy");
+        ret->descriptions[ret->num_cards] = strdup("Broadcom b43-legacy (mac80211)");
+        ret->capabilities[ret->num_cards] = tx80211_mac80211_capabilities();
+        ret->num_cards++;
+
+        ret->cardnames[ret->num_cards] = strdup("rt2x00");
+        ret->descriptions[ret->num_cards] = strdup("Realtek 2x00 (mac80211)");
+        ret->capabilities[ret->num_cards] = tx80211_mac80211_capabilities();
+        ret->num_cards++;
+
+        ret->cardnames[ret->num_cards] = strdup("rt2500pci");
+        ret->descriptions[ret->num_cards] = strdup("Realtek 2500 PCI (mac80211)");
+        ret->capabilities[ret->num_cards] = tx80211_mac80211_capabilities();
+        ret->num_cards++;
+
+        ret->cardnames[ret->num_cards] = strdup("rt2500usb");
+        ret->descriptions[ret->num_cards] = strdup("Realtek 2500 USB (mac80211)");
+        ret->capabilities[ret->num_cards] = tx80211_mac80211_capabilities();
+        ret->num_cards++;
+
+        ret->cardnames[ret->num_cards] = strdup("rt61pci");
+        ret->descriptions[ret->num_cards] = strdup("Realtek 61 PCI (mac80211)");
+        ret->capabilities[ret->num_cards] = tx80211_mac80211_capabilities();
+        ret->num_cards++;
+
+
 
 #endif /* SYS_LINUX */
@@ -244 +296 @@
                 return INJ_BCM43XX;
 
-        if (!strcasecmp(in_str, "ath5k") || 
-                !strcasecmp(in_str, "iwlwifi") ||
-                !strcasecmp(in_str, "d80211"))
-                return INJ_D80211;
+        if (!strcasecmp(in_str, "ath5k") || !strcasecmp(in_str, "ath9k") ||
+                !strcasecmp(in_str, "iwlwifi") || !strcasecmp(in_str, "iwlagn") ||
+                !strcasecmp(in_str, "iwl-agn") || !strcasecmp(in_str, "iwl3945") ||
+                !strcasecmp(in_str, "iwl4965") || !strcasecmp(in_str, "iwl5000") ||
+                !strcasecmp(in_str, "mac80211") || !strcasecmp(in_str, "d80211") ||
+                !strcasecmp(in_str, "rt2x00") || !strcasecmp(in_str, "rt2400pci") ||
+                !strcasecmp(in_str, "rt2500pci") || strcasecmp(in_str, "rt2500usb") ||
+                !strcasecmp(in_str, "rt61pci") || strcasecmp(in_str, "rt73usb") ||
+                !strcasecmp(in_str, "b43") || !strcasecmp(in_str, "b43legacy") ||
+                !strcasecmp(in_str, "rtl8180") || !strcasecmp(in_str, "rtl8187"))
+                return INJ_MAC80211;
 
 #endif /* SYS_LINUX */
@@ -325 +384 @@
                 break;
 
-        case INJ_D80211:
-                ret = tx80211_d80211_init(in_tx);
+        case INJ_MAC80211:
+                ret = tx80211_mac80211_init(in_tx);
                 break;