[kismac] [binaervarianz] r239 - in trunk/Sources: Core WaveDrivers

Author: gkruse
Date: 2007-06-11 07:15:05 +0200 (Mon, 11 Jun 2007)
New Revision: 239

Modified:
   trunk/Sources/Core/WaveHelper.m
   trunk/Sources/WaveDrivers/WaveDriverAirport.m
   trunk/Sources/WaveDrivers/WaveDriverAirportExtreme.m
Log:
Fix for change in atheros driver name in 10.4.10

Modified: trunk/Sources/Core/WaveHelper.m
===================================================================
--- trunk/Sources/Core/WaveHelper.m     2007-05-13 09:55:37 UTC (rev 238)
+++ trunk/Sources/Core/WaveHelper.m     2007-06-11 05:15:05 UTC (rev 239)
@@ -226,7 +226,9 @@
         if (![self isServiceAvailable:"AiroJackDriver"]) return NO;
         else return YES;
     case 4:
-        if ([self isServiceAvailable:"AirPortDriver"] || [self 
isServiceAvailable:"AirPortPCI"] || [self isServiceAvailable:"AirPortPCI_MM"] 
|| [self isServiceAvailable:"AirPort_Brcm43xx"] || [WaveHelper 
isServiceAvailable:"AirPort_Athr5424"]) return YES;
+        if ([self isServiceAvailable:"AirPortDriver"] || [self 
isServiceAvailable:"AirPortPCI"] ||
+            [self isServiceAvailable:"AirPortPCI_MM"] || [self 
isServiceAvailable:"AirPort_Brcm43xx"]  ||
+            [WaveHelper isServiceAvailable:"AirPort_Athr5424"] || [self 
isServiceAvailable:"AirPort_Athr5424ab"]) return YES;
         else return NO;
     default:
         return NO;

Modified: trunk/Sources/WaveDrivers/WaveDriverAirport.m
===================================================================
--- trunk/Sources/WaveDrivers/WaveDriverAirport.m       2007-05-13 09:55:37 UTC 
(rev 238)
+++ trunk/Sources/WaveDrivers/WaveDriverAirport.m       2007-06-11 05:15:05 UTC 
(rev 239)
@@ -34,7 +34,9 @@
     self = [super init];
     if (!self)  return nil;
     
-    if (![WaveHelper isServiceAvailable:"AirPortDriver"] && ![WaveHelper 
isServiceAvailable:"AirPortPCI"] && ![WaveHelper 
isServiceAvailable:"AirPort_Athr5424"]) {
+    if (![WaveHelper isServiceAvailable:"AirPortDriver"] && ![WaveHelper 
isServiceAvailable:"AirPortPCI"] &&
+        ![WaveHelper isServiceAvailable:"AirPort_Athr5424"] && ![WaveHelper 
isServiceAvailable:"AirPort_Athr5424ab"])
+    {
         NSRunCriticalAlertPanel(NSLocalizedString(@"Could not load Airport 
Driver.", "Error dialog title"),
             NSLocalizedString(@"Could not load Airport Driver. Apple Driver 
not loaded", "LONG desc with solution"),
            // @"KisMAC is not able to load the Apple Airport driver, if you 
killed it by loading the Viha driver. Try restarting KisMAC."
@@ -89,7 +91,10 @@
 #pragma mark -
 
 + (bool) loadBackend {
-    if (!([WaveHelper isServiceAvailable:"AirPortDriver"] || [WaveHelper 
isServiceAvailable:"AirPortPCI"] || [WaveHelper 
isServiceAvailable:"AirPort_Athr5424"] || WirelessIsAvailable()==1)) {
+    if (!([WaveHelper isServiceAvailable:"AirPortDriver"] || [WaveHelper 
isServiceAvailable:"AirPortPCI"] ||
+          [WaveHelper isServiceAvailable:"AirPort_Athr5424"] || [WaveHelper 
isServiceAvailable:"AirPort_Athr5424ab"]  ||
+          WirelessIsAvailable()==1))
+    {
         NSLog(@"Could not find an AirPortCard for PseudoJack.");
         NSRunCriticalAlertPanel(
             NSLocalizedString(@"Could not load Airport Driver.", "Error dialog 
title"),

Modified: trunk/Sources/WaveDrivers/WaveDriverAirportExtreme.m
===================================================================
--- trunk/Sources/WaveDrivers/WaveDriverAirportExtreme.m        2007-05-13 
09:55:37 UTC (rev 238)
+++ trunk/Sources/WaveDrivers/WaveDriverAirportExtreme.m        2007-06-11 
05:15:05 UTC (rev 239)
@@ -124,7 +124,8 @@
        
     NSUserDefaults *defs;
     
-       if([WaveHelper isServiceAvailable:"AirPort_Athr5424"]) {
+       if([WaveHelper isServiceAvailable:"AirPort_Athr5424"] || [WaveHelper 
isServiceAvailable:"AirPort_Athr5424ab"])
+    {
                NSLog(@"User has a Atheros card.");
                return 0;
                NSRunCriticalAlertPanel(
@@ -257,7 +258,8 @@
     defs = [NSUserDefaults standardUserDefaults];
     char err[PCAP_ERRBUF_SIZE];
        
-       if([WaveHelper isServiceAvailable:"AirPort_Athr5424"]) {
+       if([WaveHelper isServiceAvailable:"AirPort_Athr5424"] || [WaveHelper 
isServiceAvailable:"AirPort_Athr5424ab"] )
+    {
                _apeType = APExtTypeAth5414;
        } else if([WaveHelper isServiceAvailable:"AirPortPCI_MM"] || 
[WaveHelper isServiceAvailable:"AirPort_Brcm43xx"]) {
                _apeType = APExtTypeBcm;

Other related posts: