[kismac] [binaervarianz] r133 - trunk/Sources/Driver/USBIntersilJack
- From: svn@xxxxxxxxxxxxxxxx
- To: kismac@xxxxxxxxxxxxx
- Date: Fri, 21 Apr 2006 03:47:25 +0200
Author: robin
Date: 2006-04-21 03:47:24 +0200 (Fri, 21 Apr 2006)
New Revision: 133
Modified:
trunk/Sources/Driver/USBIntersilJack/USBIntersil.mm
Log:
* Rolling back change from R125 which caused certain USB adapters to stop
working and introduced errors into packet capture from other USB adapters
* Added a re-init attempt to handle repeating timeout errors (may not be
effective, but won't make anything worse - see comments)
Modified: trunk/Sources/Driver/USBIntersilJack/USBIntersil.mm
===================================================================
--- trunk/Sources/Driver/USBIntersilJack/USBIntersil.mm 2006-04-20 07:59:36 UTC
(rev 132)
+++ trunk/Sources/Driver/USBIntersilJack/USBIntersil.mm 2006-04-21 01:47:24 UTC
(rev 133)
@@ -88,12 +88,7 @@
bool USBIntersilJack::startCapture(UInt16 channel) {
if (!_devicePresent) return false;
if (!_deviceInit) return false;
-
- if (_doCommand(wlcInit, 0) != kIOReturnSuccess) {
- NSLog(@"USBIntersilJack::startCapture: _doCommand(wlcInit, 0)
failed\n");
- return false;
- }
-
+
if ((!_isEnabled) && (_disable() != kIOReturnSuccess)) {
NSLog(@"USBIntersilJack::::startCapture: Couldn't disable card\n");
return false;
@@ -712,6 +707,10 @@
kr = (*me->_interface)->ReadPipeAsync((me->_interface), kInPipe,
&me->_recieveBuffer, sizeof(me->_recieveBuffer),
(IOAsyncCallback1)_interruptRecieved, refCon);
if (kIOReturnSuccess != kr) {
NSLog(@"unable to do async interrupt read (%08x). this means the card
is stopped!\n", kr);
+ // I haven't been able to reproduce the error that caused it to
hit this point in the code again since adding the following lines
+ // however, when it hit this point previously, the only
solution was to kill and relaunch KisMAC, so at least this won't make anything
worse
+ NSLog(@"Attempting to re-initialise adapter...");
+ if (me->_init() != kIOReturnSuccess)
NSLog(@"USBIntersilJack::_interruptReceived: _init() failed\n");
}
}
Other related posts:
- » [kismac] [binaervarianz] r133 - trunk/Sources/Driver/USBIntersilJack
