X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2Fgoodfet;h=ba43730ffe6bcabb711639bc8884bc41e1dfd9df;hp=ebcbec836b630f0526e72d4226f5d06b07e67a8a;hb=b771c2916387dd3d14716e0f006e1966cb0de6d6;hpb=d941137f767ad40f7bf253f6828735b641b52dca

diff --git a/client/goodfet b/client/goodfet
index ebcbec8..ba43730 100755
--- a/client/goodfet
+++ b/client/goodfet
@@ -6,26 +6,25 @@
 # This code is being rewritten and refactored.  You've been warned!
 
 import sys, os, readline, code, binascii;
-import rlcompleter;
+#import rlcompleter;
 
+from GoodFET import GoodFET, getClient;
 from GoodFETConsole import GoodFETConsole;
-from GoodFETCC import GoodFETCC;
-from GoodFETMSP430 import GoodFETMSP430;
-from GoodFET import GoodFET;
 
 from intelhex import IntelHex;
 
 if(len(sys.argv)==1):
     print "Usage: %s driver\n" % sys.argv[0];
-    print "driver:= GoodFETCC GoodFETMSP430";
+    print "driver:= monitor | cc | avr | spi | msp430";
     print;
     print "This is an unfinished client.  You probably want goodfet.$chip instead.";
     sys.exit(1);
 
 driver=sys.argv[1];
 print "Using driver %s" % driver;
-client=eval("%s()" % driver);
-console=GoodFETConsole(client);
+#client=eval("%s()" % driver);
+client=getClient(driver);
+console=client.getConsole();
 console.run();
 
 sys.exit(0);