X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2Fgoodfet;h=c8e21873c389cf2d765fd54d7a27637b3adf75b9;hp=4bf9aa30f1f711aec8a638cef44ccd9ccda9f0e7;hb=46911acb1c879cf7f43f2ac0ae56478a1b4fee24;hpb=4f3c7e48ba54b8ecd32df1668c21e986d8866307

diff --git a/client/goodfet b/client/goodfet
index 4bf9aa3..c8e2187 100755
--- a/client/goodfet
+++ b/client/goodfet
@@ -5,26 +5,52 @@
 #
 # This code is being rewritten and refactored.  You've been warned!
 
-import sys, os, readline, code, binascii;
-import rlcompleter;
+import sys, os, code, binascii;
+#import rlcompleter, readline;
 
-import GoodFET;
-from GoodFET.GoodFETConsole import GoodFETConsole;
-#from GoodFET import *;
+from GoodFET import GoodFET, getClient;
+from GoodFETConsole import GoodFETConsole;
 
 from intelhex import IntelHex;
 
 if(len(sys.argv)==1):
-    print "Usage: %s driver\n" % sys.argv[0];
-    print "driver:= GoodFETCC GoodFETMSP430";
-    print;
+    print "Usage: %s [driver|verb]\n" % sys.argv[0];
+    print "driver:= monitor | cc | avr | spi | msp430 | nrf";
+    print "verb:=   scan";
+    print "";
     print "This is an unfinished client.  You probably want goodfet.$chip instead.";
     sys.exit(1);
 
+verb=sys.argv[1];
+if verb=="scan":
+    from scanwin32 import *;
+    # INIT COMPORT SCAN
+    scan=winScan();
+    #scan.comports();
+    
+    for order, port, desc, hwid in sorted(scan.comports()):
+        # Look for FTDIBUS
+        try:
+            #hwid.index('FTDI')
+            #print "*************"
+            #print "GOODFET FOUND"
+            #print "*************"
+            if hwid.index('FTDI')!=0: continue;
+            print "%s: (%s)" % (port, hwid),
+            try:
+                serial.Serial(port)
+            except serial.serialutil.SerialException:
+                print "Busy"
+            else:
+                print "Ready"
+        except:
+            pass
+    sys.exit(0);
+
 driver=sys.argv[1];
 print "Using driver %s" % driver;
 #client=eval("%s()" % driver);
-client=GoodFET.getClient(driver);
+client=getClient(driver);
 console=client.getConsole();
 console.run();