[kismac] [binaervarianz] r209 - in branches/usb-drivers/Sources: Driver/USBJack WaveDrivers

  • From: svn@xxxxxxxxxxxxxxxx
  • To: kismac@xxxxxxxxxxxxx
  • Date: Tue, 17 Oct 2006 06:52:11 +0200

Author: gkruse
Date: 2006-10-17 06:52:05 +0200 (Tue, 17 Oct 2006)
New Revision: 209

Modified:
   branches/usb-drivers/Sources/Driver/USBJack/IntersilJack.mm
   branches/usb-drivers/Sources/Driver/USBJack/RT73Jack.mm
   branches/usb-drivers/Sources/Driver/USBJack/RalinkJack.mm
   branches/usb-drivers/Sources/Driver/USBJack/USBJack.mm
   branches/usb-drivers/Sources/WaveDrivers/WaveDriverUSBIntersil.mm
Log:
Fix rt2500 support that was broken when we added rt73 support.  Seems there was 
a missing break in the switch statement.

Modified: branches/usb-drivers/Sources/Driver/USBJack/IntersilJack.mm
===================================================================
--- branches/usb-drivers/Sources/Driver/USBJack/IntersilJack.mm 2006-10-16 
21:13:50 UTC (rev 208)
+++ branches/usb-drivers/Sources/Driver/USBJack/IntersilJack.mm 2006-10-17 
04:52:05 UTC (rev 209)
@@ -190,6 +190,7 @@
 }
 
 IntersilJack::~IntersilJack() {
+    /*
     stopRun();
     _interface = NULL;
     _frameSize = 0;
@@ -198,5 +199,6 @@
     pthread_cond_destroy(&_wait_cond);
     pthread_mutex_destroy(&_recv_mutex);
     pthread_cond_destroy(&_recv_cond);
+*/
 }
 

Modified: branches/usb-drivers/Sources/Driver/USBJack/RT73Jack.mm
===================================================================
--- branches/usb-drivers/Sources/Driver/USBJack/RT73Jack.mm     2006-10-16 
21:13:50 UTC (rev 208)
+++ branches/usb-drivers/Sources/Driver/USBJack/RT73Jack.mm     2006-10-17 
04:52:05 UTC (rev 209)
@@ -1768,6 +1768,7 @@
 }
 
 RT73Jack::~RT73Jack() {
+    /*
     stopRun();
     _interface = NULL;
     _frameSize = 0;
@@ -1776,4 +1777,5 @@
     pthread_cond_destroy(&_wait_cond);
     pthread_mutex_destroy(&_recv_mutex);
     pthread_cond_destroy(&_recv_cond);
+     */
 }

Modified: branches/usb-drivers/Sources/Driver/USBJack/RalinkJack.mm
===================================================================
--- branches/usb-drivers/Sources/Driver/USBJack/RalinkJack.mm   2006-10-16 
21:13:50 UTC (rev 208)
+++ branches/usb-drivers/Sources/Driver/USBJack/RalinkJack.mm   2006-10-17 
04:52:05 UTC (rev 209)
@@ -1094,7 +1094,7 @@
 }
 
 RalinkJack::~RalinkJack() {
-    stopRun();
+  /*  stopRun();
     _interface = NULL;
     _frameSize = 0;
     
@@ -1102,4 +1102,5 @@
     pthread_cond_destroy(&_wait_cond);
     pthread_mutex_destroy(&_recv_mutex);
     pthread_cond_destroy(&_recv_cond);
+    */
 }

Modified: branches/usb-drivers/Sources/Driver/USBJack/USBJack.mm
===================================================================
--- branches/usb-drivers/Sources/Driver/USBJack/USBJack.mm      2006-10-16 
21:13:50 UTC (rev 208)
+++ branches/usb-drivers/Sources/Driver/USBJack/USBJack.mm      2006-10-17 
04:52:05 UTC (rev 209)
@@ -1051,8 +1051,6 @@
 USBJack::~USBJack() {
     NSLog(@"I'm being destroyed!!!");
     stopRun();
-//(*_dev)->USBDeviceClose(_dev);
-  //  (*_dev)->Release(_dev);
     _interface = NULL;
     _frameSize = 0;
 

Modified: branches/usb-drivers/Sources/WaveDrivers/WaveDriverUSBIntersil.mm
===================================================================
--- branches/usb-drivers/Sources/WaveDrivers/WaveDriverUSBIntersil.mm   
2006-10-16 21:13:50 UTC (rev 208)
+++ branches/usb-drivers/Sources/WaveDrivers/WaveDriverUSBIntersil.mm   
2006-10-17 04:52:05 UTC (rev 209)
@@ -55,6 +55,7 @@
         case ralink:
             delete(_driver);
             _driver = new RalinkJack;
+            break;
         case rt73:
             delete(_driver);
             _driver = new RT73Jack;


Other related posts:

  • » [kismac] [binaervarianz] r209 - in branches/usb-drivers/Sources: Driver/USBJack WaveDrivers