X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2Fgoodfet;h=4bf9aa30f1f711aec8a638cef44ccd9ccda9f0e7;hp=a42a2c83bd6919584afffa55dd4be5ffb712e599;hb=cf32fb0c864147d93d39d83a65700ad361c0b3a2;hpb=6097d6dc581f9331d80c8f1a04d307dd68a2fd0d

diff --git a/client/goodfet b/client/goodfet
index a42a2c8..4bf9aa3 100755
--- a/client/goodfet
+++ b/client/goodfet
@@ -8,10 +8,9 @@
 import sys, os, readline, code, binascii;
 import rlcompleter;
 
-from GoodFETConsole import GoodFETConsole;
-from GoodFETCC import GoodFETCC;
-from GoodFETMSP430 import GoodFETMSP430;
-from GoodFET import GoodFET;
+import GoodFET;
+from GoodFET.GoodFETConsole import GoodFETConsole;
+#from GoodFET import *;
 
 from intelhex import IntelHex;
 
@@ -24,13 +23,9 @@ if(len(sys.argv)==1):
 
 driver=sys.argv[1];
 print "Using driver %s" % driver;
-client=eval("%s()" % driver);
-console=GoodFETConsole(client);
-
-while 1:
-    sys.stdout.write("gf% ");
-    sys.stdout.flush();
-    cmd=sys.stdin.readline();
-    console.handle(cmd);
+#client=eval("%s()" % driver);
+client=GoodFET.getClient(driver);
+console=client.getConsole();
+console.run();
 
 sys.exit(0);