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

Hello,
Thanks with build 212 it is not hanging anymore. With your advice (unloading the official Ralink driver) I was able to scan with my D- Link G122 Rev B !
However each time I tried to deauthenticate or reinject packets the application was crashing.
Attached is the crash log file.

===== mercredi, 18 octobre 2006 22.00:42 h Europe/Zurich =====
**********

Host Name:      macbook
Date/Time:      2006-10-18 22:01:02.097 +0200
OS Version:     10.4.8 (Build 8L2127)
Report Version: 4

Command: KisMAC
Path:    
/Users/xxx/Desktop/kismac/build/Universal/KisMAC.app/Contents/MacOS/KisMAC
Parent:  WindowServer [83]

Version: KisMAC 0.21a (0.2a [$Revision: 211$])

PID:    368
Thread: 0

Exception:  EXC_BAD_ACCESS (0x0001)
Codes:      KERN_INVALID_ADDRESS (0x0001) at 0x4d555478

Thread 0 Crashed:
0   libobjc.A.dylib             0x90a53380 objc_msgSend + 16
1   com.apple.CoreFoundation    0x908103a2 _CFStringAppendFormatAndArgumentsAux 
+ 5644
2   com.apple.CoreFoundation    0x9080ec8c 
_CFStringCreateWithFormatAndArgumentsAux + 122
3   com.apple.Foundation        0x9260dab9 NSLogv + 85
4   com.apple.Foundation        0x9264b3a5 NSLog + 27
5   de.binaervarianz.kismac     0x00069e6b +[WaveHelper loadDrivers] + 803 
(WaveHelper.m:278)
6   de.binaervarianz.kismac     0x000107d0 -[ScanController(PrivateExtension) 
startActiveAttack] + 237 (ScanControllerPrivate.m:374)
7   de.binaervarianz.kismac     0x0000c75c -[ScanController(MenuExtension) 
authFloodNetwork:] + 61 (ScanControllerMenus.m:562)
8   com.apple.AppKit            0x9335cd88 -[NSApplication sendAction:to:from:] 
+ 107
9   com.apple.AppKit            0x9340ace7 -[NSMenu 
performActionForItemAtIndex:] + 455
10  com.apple.AppKit            0x9340aa29 -[NSCarbonMenuImpl 
performActionWithHighlightingForItemAtIndex:] + 103
11  com.apple.AppKit            0x9333be16 _NSHandleCarbonMenuEvent + 477
12  com.apple.AppKit            0x9326f7fc _DPSNextEvent + 1491
13  com.apple.AppKit            0x9326f056 -[NSApplication 
nextEventMatchingMask:untilDate:inMode:dequeue:] + 137
14  com.apple.AppKit            0x93268ddb -[NSApplication run] + 512
15  com.apple.AppKit            0x9325cd2f NSApplicationMain + 573
16  de.binaervarianz.kismac     0x00002ba6 _start + 216
17  de.binaervarianz.kismac     0x00002acd start + 41

Thread 1:
0   libSystem.B.dylib           0x9003f23f syscall_thread_switch + 7
1   de.binaervarianz.kismac     0x0006168d -[PointView animationThread:] + 366 
(PointView.m:169)
2   com.apple.Foundation        0x925f536c forkThreadForFunction + 123
3   libSystem.B.dylib           0x90023d87 _pthread_body + 84

Thread 2:
0   libSystem.B.dylib           0x90009857 mach_msg_trap + 7
1   com.apple.CoreFoundation    0x9082869a CFRunLoopRunSpecific + 2014
2   com.apple.CoreFoundation    0x90839577 CFRunLoopRun + 60
3   de.binaervarianz.kismac     0x0007b991 USBJack::_runCFRunLoop(USBJack*) + 
25 (USBJack.mm:947)
4   libSystem.B.dylib           0x90023d87 _pthread_body + 84

Thread 3:
0   libSystem.B.dylib           0x9003f23f syscall_thread_switch + 7
1   de.binaervarianz.kismac     0x00049dea -[SpinChannel animThread:] + 292 
(SpinChannel.m:61)
2   com.apple.Foundation        0x925f536c forkThreadForFunction + 123
3   libSystem.B.dylib           0x90023d87 _pthread_body + 84

Thread 4:
0   libSystem.B.dylib           0x90024427 semaphore_wait_signal_trap + 7
1   de.binaervarianz.kismac     0x0007ad1f USBJack::receiveFrame() + 53 
(USBJack.mm:168)
2   de.binaervarianz.kismac     0x0004d71d -[WaveDriverUSBIntersil nextFrame] + 
23 (WaveDriverUSBIntersil.mm:178)
3   de.binaervarianz.kismac     0x00029b89 -[WaveScanner doPassiveScan:] + 1483 
(WaveScanner.mm:209)
4   de.binaervarianz.kismac     0x00029fa0 -[WaveScanner doScan:] + 170 
(WaveScanner.mm:264)
5   com.apple.Foundation        0x925f536c forkThreadForFunction + 123
6   libSystem.B.dylib           0x90023d87 _pthread_body + 84

Thread 0 crashed with X86 Thread State (32-bit):
  eax: 0x4d555458    ebx: 0x925f83d4 ecx: 0x90abbf88 edx: 0x925f83c6
  edi: 0x00000000    esi: 0xa0a51180 ebp: 0xbfffe508 esp: 0xbfffe4d8
   ss: 0x0000001f    efl: 0x00010282 eip: 0x90a53380  cs: 0x00000017
   ds: 0x0000001f     es: 0x0000001f  fs: 0x00000000  gs: 0x00000037

Binary Images Description:
    0x1000 -    0x92fff de.binaervarianz.kismac KisMAC 0.21a (0.2a [$Revision: 
211$])   
/Users/xxx/Desktop/kismac/build/Universal/KisMAC.app/Contents/MacOS/KisMAC
 0x31fc000 -  0x31fcfff com.apple.applescript.component 1.10.7  
/System/Library/Components/AppleScript.component/Contents/MacOS/AppleScript
 0x488a000 -  0x4892fff com.apple.iokit.IOUSBLib 2.6.0  
/System/Library/Extensions/IOUSBFamily.kext/Contents/PlugIns/IOUSBLib.bundle/Contents/MacOS/IOUSBLib
 0x6127000 -  0x6177fff com.DivXInc.DivXDecoder 6.0.5   /Library/QuickTime/DivX 
6 Decoder.component/Contents/MacOS/DivX 6 Decoder
0x10000000 - 0x10009fff de.binaervarianz.framework.bigl 1.0     
/Users/xxx/Desktop/kismac/build/Universal/KisMAC.app/Contents/Frameworks/BIGL.framework/Versions/A/BIGL
0x11000000 - 0x1100afff de.binaervarianz.bigeneric 1.0  
/Users/xxx/Desktop/kismac/build/Universal/KisMAC.app/Contents/Frameworks/BIGeneric.framework/Versions/A/BIGeneric
0x8fe00000 - 0x8fe49fff dyld 46.9       /usr/lib/dyld
0x90000000 - 0x9016ffff libSystem.B.dylib       /usr/lib/libSystem.B.dylib
0x901bf000 - 0x901c1fff libmathCommon.A.dylib   
/usr/lib/system/libmathCommon.A.dylib
0x901c3000 - 0x901fffff com.apple.CoreText 1.1.1 (???)  
/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/CoreText.framework/Versions/A/CoreText
0x90226000 - 0x902fbfff ATS     
/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/ATS
0x9031b000 - 0x9076ffff com.apple.CoreGraphics 1.258.38 (???)   
/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/CoreGraphics.framework/Versions/A/CoreGraphics
0x90806000 - 0x908cefff com.apple.CoreFoundation 6.4.6 (368.27) 
/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation
0x9090c000 - 0x9090cfff com.apple.CoreServices 10.4 (???)       
/System/Library/Frameworks/CoreServices.framework/Versions/A/CoreServices
0x9090e000 - 0x90a01fff libicucore.A.dylib      /usr/lib/libicucore.A.dylib
0x90a51000 - 0x90ad0fff libobjc.A.dylib         /usr/lib/libobjc.A.dylib
0x90af9000 - 0x90b5dfff libstdc++.6.dylib       /usr/lib/libstdc++.6.dylib
0x90bcc000 - 0x90bd3fff libgcc_s.1.dylib        /usr/lib/libgcc_s.1.dylib
0x90bd8000 - 0x90c4bfff com.apple.framework.IOKit 1.4.6 (???)   
/System/Library/Frameworks/IOKit.framework/Versions/A/IOKit
0x90c60000 - 0x90c72fff libauto.dylib   /usr/lib/libauto.dylib
0x90c78000 - 0x90f1efff com.apple.CoreServices.CarbonCore 682.15        
/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/CarbonCore
0x90f61000 - 0x90fc9fff com.apple.CoreServices.OSServices 4.1   
/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/OSServices.framework/Versions/A/OSServices
0x91001000 - 0x9103ffff com.apple.CFNetwork 129.18      
/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CFNetwork.framework/Versions/A/CFNetwork
0x91052000 - 0x91062fff com.apple.WebServices 1.1.3 (1.1.0)     
/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/WebServicesCore.framework/Versions/A/WebServicesCore
0x9106d000 - 0x910ebfff com.apple.SearchKit 1.0.5       
/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SearchKit.framework/Versions/A/SearchKit
0x91120000 - 0x9113efff com.apple.Metadata 10.4.4 (121.36)      
/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/Metadata.framework/Versions/A/Metadata
0x9114a000 - 0x91158fff libz.1.dylib    /usr/lib/libz.1.dylib
0x9115b000 - 0x912fafff com.apple.security 4.5.1 (29002)        
/System/Library/Frameworks/Security.framework/Versions/A/Security
0x913f8000 - 0x91400fff com.apple.DiskArbitration 2.1.1 
/System/Library/Frameworks/DiskArbitration.framework/Versions/A/DiskArbitration
0x91407000 - 0x9142dfff com.apple.SystemConfiguration 1.8.6     
/System/Library/Frameworks/SystemConfiguration.framework/Versions/A/SystemConfiguration
0x9143f000 - 0x91446fff libbsm.dylib    /usr/lib/libbsm.dylib
0x9144a000 - 0x914c3fff com.apple.audio.CoreAudio 3.0.4 
/System/Library/Frameworks/CoreAudio.framework/Versions/A/CoreAudio
0x91511000 - 0x91511fff com.apple.ApplicationServices 10.4 (???)        
/System/Library/Frameworks/ApplicationServices.framework/Versions/A/ApplicationServices
0x91513000 - 0x9153efff com.apple.AE 314 (313)  
/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/AE.framework/Versions/A/AE
0x91551000 - 0x91625fff com.apple.ColorSync 4.4.8       
/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ColorSync.framework/Versions/A/ColorSync
0x91660000 - 0x916ddfff com.apple.print.framework.PrintCore 4.6 (177.13)        
/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A/PrintCore
0x9170a000 - 0x917b3fff com.apple.QD 3.10.21 (???)      
/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/QD.framework/Versions/A/QD
0x917d9000 - 0x91824fff com.apple.HIServices 1.5.2 (???)        
/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/HIServices.framework/Versions/A/HIServices
0x91843000 - 0x91859fff com.apple.LangAnalysis 1.6.3    
/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/LangAnalysis.framework/Versions/A/LangAnalysis
0x91865000 - 0x9187ffff com.apple.FindByContent 1.5     
/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/FindByContent.framework/Versions/A/FindByContent
0x91889000 - 0x918c6fff com.apple.LaunchServices 181    
/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/LaunchServices
0x918da000 - 0x918e6fff com.apple.speech.synthesis.framework 3.5        
/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/SpeechSynthesis.framework/Versions/A/SpeechSynthesis
0x918ed000 - 0x91928fff com.apple.ImageIO.framework 1.5.0       
/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/ImageIO
0x9193a000 - 0x919ecfff libcrypto.0.9.7.dylib   /usr/lib/libcrypto.0.9.7.dylib
0x91a32000 - 0x91a48fff libcups.2.dylib         /usr/lib/libcups.2.dylib
0x91a4d000 - 0x91a6bfff libJPEG.dylib   
/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libJPEG.dylib
0x91a70000 - 0x91acefff libJP2.dylib    
/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libJP2.dylib
0x91ae0000 - 0x91ae4fff libGIF.dylib    
/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libGIF.dylib
0x91ae6000 - 0x91b63fff libRaw.dylib    
/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libRaw.dylib
0x91b67000 - 0x91ba4fff libTIFF.dylib   
/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libTIFF.dylib
0x91baa000 - 0x91bc4fff libPng.dylib    
/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libPng.dylib
0x91bc9000 - 0x91bcbfff libRadiance.dylib       
/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libRadiance.dylib
0x91bcd000 - 0x91bcdfff com.apple.Accelerate 1.3.1 (Accelerate 1.3.1)   
/System/Library/Frameworks/Accelerate.framework/Versions/A/Accelerate
0x91bcf000 - 0x91c5dfff com.apple.vImage 2.5    
/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vImage.framework/Versions/A/vImage
0x91c64000 - 0x91c64fff com.apple.Accelerate.vecLib 3.3.1 (vecLib 3.3.1)        
/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/vecLib
0x91c66000 - 0x91cbffff libvMisc.dylib  
/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvMisc.dylib
0x91cc8000 - 0x91cecfff libvDSP.dylib   
/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvDSP.dylib
0x91cf4000 - 0x920fdfff libBLAS.dylib   
/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib
0x92137000 - 0x924ebfff libLAPACK.dylib         
/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib
0x92518000 - 0x9259cfff com.apple.DesktopServices 1.3.4 
/System/Library/PrivateFrameworks/DesktopServicesPriv.framework/Versions/A/DesktopServicesPriv
0x925d8000 - 0x92808fff com.apple.Foundation 6.4.7 (567.28)     
/System/Library/Frameworks/Foundation.framework/Versions/C/Foundation
0x92914000 - 0x929f2fff libxml2.2.dylib         /usr/lib/libxml2.2.dylib
0x92a0f000 - 0x92afcfff libiconv.2.dylib        /usr/lib/libiconv.2.dylib
0x92b0c000 - 0x92b23fff libGL.dylib     
/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
0x92b2e000 - 0x92b86fff libGLU.dylib    
/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.dylib
0x92b9a000 - 0x92b9afff com.apple.Carbon 10.4 (???)     
/System/Library/Frameworks/Carbon.framework/Versions/A/Carbon
0x92b9c000 - 0x92bacfff com.apple.ImageCapture 3.0.4    
/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/ImageCapture.framework/Versions/A/ImageCapture
0x92bba000 - 0x92bc2fff com.apple.speech.recognition.framework 3.6      
/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/SpeechRecognition.framework/Versions/A/SpeechRecognition
0x92bc8000 - 0x92bcdfff com.apple.securityhi 2.0.1 (24742)      
/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/SecurityHI.framework/Versions/A/SecurityHI
0x92bd3000 - 0x92c64fff com.apple.ink.framework 101.2.1 (71)    
/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/Ink.framework/Versions/A/Ink
0x92c78000 - 0x92c7bfff com.apple.help 1.0.3 (32.1)     
/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/Help.framework/Versions/A/Help
0x92c7e000 - 0x92c9bfff com.apple.openscripting 1.2.5 (???)     
/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/OpenScripting.framework/Versions/A/OpenScripting
0x92cab000 - 0x92cb1fff com.apple.print.framework.Print 5.2 (192.4)     
/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/Print.framework/Versions/A/Print
0x92cb7000 - 0x92d1afff com.apple.htmlrendering 66.1 (1.1.3)    
/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/HTMLRendering.framework/Versions/A/HTMLRendering
0x92d3e000 - 0x92d7ffff com.apple.NavigationServices 3.4.4 (3.4.3)      
/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/NavigationServices.framework/Versions/A/NavigationServices
0x92da6000 - 0x92db3fff com.apple.audio.SoundManager 3.9.1      
/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/CarbonSound.framework/Versions/A/CarbonSound
0x92dba000 - 0x92dbffff com.apple.CommonPanels 1.2.3 (73)       
/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/CommonPanels.framework/Versions/A/CommonPanels
0x92dc4000 - 0x930b6fff com.apple.HIToolbox 1.4.8 (???) 
/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/HIToolbox.framework/Versions/A/HIToolbox
0x931bb000 - 0x931c6fff com.apple.opengl 1.4.12 
/System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL
0x931cb000 - 0x931e6fff com.apple.DirectoryService.Framework 3.2        
/System/Library/Frameworks/DirectoryService.framework/Versions/A/DirectoryService
0x93256000 - 0x93256fff com.apple.Cocoa 6.4 (???)       
/System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa
0x93258000 - 0x9390efff com.apple.AppKit 6.4.8 (824.42) 
/System/Library/Frameworks/AppKit.framework/Versions/C/AppKit
0x93c8f000 - 0x93d09fff com.apple.CoreData 90   
/System/Library/Frameworks/CoreData.framework/Versions/A/CoreData
0x93d42000 - 0x93e03fff com.apple.audio.toolbox.AudioToolbox 1.4.3      
/System/Library/Frameworks/AudioToolbox.framework/Versions/A/AudioToolbox
0x93e43000 - 0x93e43fff com.apple.audio.units.AudioUnit 1.4.2   
/System/Library/Frameworks/AudioUnit.framework/Versions/A/AudioUnit
0x93e45000 - 0x94017fff com.apple.QuartzCore 1.4.9      
/System/Library/Frameworks/QuartzCore.framework/Versions/A/QuartzCore
0x94068000 - 0x940a9fff libsqlite3.0.dylib      /usr/lib/libsqlite3.0.dylib
0x940b1000 - 0x940ebfff libGLImage.dylib        
/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLImage.dylib
0x94271000 - 0x94280fff libCGATS.A.dylib        
/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/CoreGraphics.framework/Versions/A/Resources/libCGATS.A.dylib
0x94287000 - 0x94292fff libCSync.A.dylib        
/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/CoreGraphics.framework/Versions/A/Resources/libCSync.A.dylib
0x942de000 - 0x942f8fff libRIP.A.dylib  
/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/CoreGraphics.framework/Versions/A/Resources/libRIP.A.dylib
0x942fe000 - 0x945b7fff com.apple.QuickTime 7.1.3       
/System/Library/Frameworks/QuickTime.framework/Versions/A/QuickTime
0x94658000 - 0x94664fff com.apple.framework.Apple80211 4.3.1 (431.4)    
/System/Library/PrivateFrameworks/Apple80211.framework/Versions/A/Apple80211
0x94718000 - 0x94861fff com.apple.AddressBook.framework 4.0.4 (485.1)   
/System/Library/Frameworks/AddressBook.framework/Versions/A/AddressBook
0x948ed000 - 0x948fcfff com.apple.DSObjCWrappers.Framework 1.1  
/System/Library/PrivateFrameworks/DSObjCWrappers.framework/Versions/A/DSObjCWrappers
0x94903000 - 0x9492cfff com.apple.LDAPFramework 1.4.2 (69.1.1)  
/System/Library/Frameworks/LDAP.framework/Versions/A/LDAP
0x94932000 - 0x94941fff libsasl2.2.dylib        /usr/lib/libsasl2.2.dylib
0x94945000 - 0x94969fff libssl.0.9.7.dylib      /usr/lib/libssl.0.9.7.dylib
0x94975000 - 0x94992fff libresolv.9.dylib       /usr/lib/libresolv.9.dylib
0x95142000 - 0x951d5fff com.apple.WebKit 418.9  
/System/Library/Frameworks/WebKit.framework/Versions/A/WebKit
0x9522f000 - 0x952b1fff com.apple.JavaScriptCore 418.3  
/System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks/JavaScriptCore.framework/Versions/A/JavaScriptCore
0x952e4000 - 0x955c3fff com.apple.WebCore 418.21        
/System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks/WebCore.framework/Versions/A/WebCore
0x95742000 - 0x95765fff libxslt.1.dylib         /usr/lib/libxslt.1.dylib
0x95953000 - 0x95995fff com.apple.AppleScriptKit 1.4.1 (64)     
/System/Library/Frameworks/AppleScriptKit.framework/Versions/A/AppleScriptKit
0x959c3000 - 0x959fbfff com.apple.OSAKit 1.0.1 (43)     
/System/Library/Frameworks/OSAKit.framework/Versions/A/OSAKit
0x95a1a000 - 0x95a24fff libexslt.0.dylib        /usr/lib/libexslt.0.dylib
0x96a19000 - 0x96a19fff com.apple.vecLib 3.3.1 (vecLib 3.3.1)   
/System/Library/Frameworks/vecLib.framework/Versions/A/vecLib
0x9707b000 - 0x97080fff com.apple.agl 2.5.9 (AGL-2.5.9) 
/System/Library/Frameworks/AGL.framework/Versions/A/AGL
0x98891000 - 0x98922fff com.apple.applescript 1.10.7    
/System/Library/PrivateFrameworks/AppleScript.framework/Versions/A/AppleScript
0x98ab8000 - 0x995a2fff com.apple.QuickTimeComponents.component 7.1.3   
/System/Library/QuickTime/QuickTimeComponents.component/Contents/MacOS/QuickTimeComponents
0x9a4da000 - 0x9a4fbfff libpcap.A.dylib         /usr/lib/libpcap.A.dylib
0xc0000000 - 0xc0008fff com.growl.growlframework 0.7.3  
/Users/xxx/Desktop/kismac/build/Universal/KisMAC.app/Contents/Frameworks/Growl.framework/Versions/A/Growl


Le 18 oct. 06 à 19:44, svn@xxxxxxxxxxxxxxxx a écrit :

Author: gkruse
Date: 2006-10-18 19:43:58 +0200 (Wed, 18 Oct 2006)
New Revision: 212

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.h
branches/usb-drivers/Sources/Driver/USBJack/USBJack.mm
branches/usb-drivers/Sources/WaveDrivers/WaveDriverUSBIntersil.mm
Log:
Some small cleanup to not hang if the usb device is in use or can't be opened

Modified: branches/usb-drivers/Sources/Driver/USBJack/IntersilJack.mm
===================================================================
--- branches/usb-drivers/Sources/Driver/USBJack/IntersilJack.mm 2006-10-17 06:32:44 UTC (rev 211)
+++ branches/usb-drivers/Sources/Driver/USBJack/IntersilJack.mm 2006-10-18 17:43:58 UTC (rev 212)
@@ -109,8 +109,11 @@
WLHardwareAddress macAddr;
int i;

+    if(!_attachDevice()){
+        NSLog(@"Device could not be opened");
+        return kIOReturnNoDevice;
+    }

-    _attachDevice();
     _firmwareType = -1;

     for (i = 0; i< wlResetTries; i++) {

Modified: branches/usb-drivers/Sources/Driver/USBJack/RT73Jack.mm
===================================================================
--- branches/usb-drivers/Sources/Driver/USBJack/RT73Jack.mm 2006-10-17 06:32:44 UTC (rev 211)
+++ branches/usb-drivers/Sources/Driver/USBJack/RT73Jack.mm 2006-10-18 17:43:58 UTC (rev 212)
@@ -10,15 +10,16 @@
#include "RT73.h"

 IOReturn RT73Jack::_init() {
-    unsigned long      Index;
        unsigned long   temp;
        unsigned int    i;
-       unsigned char   Value = 0xff;
     IOReturn   ret;
        
        NICInitialized = false;

-    _attachDevice();
+    if(!_attachDevice()){
+        NSLog(@"Device could not be opened");
+        return kIOReturnNoDevice;
+    }

        // Wait for hardware stable

@@ -82,7 +83,7 @@
        }
 */

-       return kIOReturnSuccess;
+       return ret;
 }

 IOReturn       RT73Jack::RTUSB_VendorRequest(UInt8 direction,

Modified: branches/usb-drivers/Sources/Driver/USBJack/RalinkJack.mm
===================================================================
--- branches/usb-drivers/Sources/Driver/USBJack/RalinkJack.mm 2006-10-17 06:32:44 UTC (rev 211)
+++ branches/usb-drivers/Sources/Driver/USBJack/RalinkJack.mm 2006-10-18 17:43:58 UTC (rev 212)
@@ -17,7 +17,10 @@
unsigned int i;
IOReturn ret;

-    _attachDevice();
+    if(!_attachDevice()){
+        NSLog(@"Device could not be opened");
+        return kIOReturnNoDevice;
+    }

        NSLog(@"--> NICInitializeAsic");


Modified: branches/usb-drivers/Sources/Driver/USBJack/USBJack.h
===================================================================
--- branches/usb-drivers/Sources/Driver/USBJack/USBJack.h 2006-10-17 06:32:44 UTC (rev 211)
+++ branches/usb-drivers/Sources/Driver/USBJack/USBJack.h 2006-10-18 17:43:58 UTC (rev 212)
@@ -93,7 +93,7 @@
IOReturn _configureAnchorDevice(IOUSBDeviceInterface **dev);
IOReturn _findInterfaces(IOUSBDeviceInterface **dev);

- void _attachDevice();
+ bool _attachDevice();
static void _addDevice(void *refCon, io_iterator_t iterator);
static void _handleDeviceRemoval(void *refCon, io_iterator_t iterator);
static void _interruptRecieved(void *refCon, IOReturn result, int len);

Modified: branches/usb-drivers/Sources/Driver/USBJack/USBJack.mm
===================================================================
--- branches/usb-drivers/Sources/Driver/USBJack/USBJack.mm 2006-10-17 06:32:44 UTC (rev 211)
+++ branches/usb-drivers/Sources/Driver/USBJack/USBJack.mm 2006-10-18 17:43:58 UTC (rev 212)
@@ -796,7 +796,7 @@
return kr;
}

-void USBJack::_attachDevice() {
+bool USBJack::_attachDevice() {
     kern_return_t              kr;
     IOUSBDeviceInterface    **dev;

@@ -812,7 +812,7 @@
                 NSLog(@"unable to open device: %08x\n", kr);
             }
             (*dev)->Release(dev);
-            return;
+            return false;
         }

         kr = _configureAnchorDevice(dev);
@@ -820,7 +820,7 @@
             NSLog(@"unable to configure device: %08x\n", kr);
             (*dev)->USBDeviceClose(dev);
             (*dev)->Release(dev);
-            return;
+            return false;
         }

kr = _findInterfaces(dev);
@@ -828,13 +828,14 @@
NSLog(@"unable to find interfaces on device: %08x\n", kr);
(*dev)->USBDeviceClose(dev);
(*dev)->Release(dev);
- return;
+ return false;
}

         kr = (*dev)->USBDeviceClose(dev);
         kr = (*dev)->Release(dev);

     }
+    return true;
 }

 void USBJack::_addDevice(void *refCon, io_iterator_t iterator) {

Modified: branches/usb-drivers/Sources/WaveDrivers/ WaveDriverUSBIntersil.mm
===================================================================
--- branches/usb-drivers/Sources/WaveDrivers/ WaveDriverUSBIntersil.mm 2006-10-17 06:32:44 UTC (rev 211)
+++ branches/usb-drivers/Sources/WaveDrivers/ WaveDriverUSBIntersil.mm 2006-10-18 17:43:58 UTC (rev 212)
@@ -69,7 +69,9 @@
return Nil;
}

-    _driver->_init();
+    if(_driver->_init() != kIOReturnSuccess)
+        return Nil;
+
        _errors = 0;
        
     return self;



Other related posts: