'goodfet.cc term'

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@347 12e2690d-a6be-4b82-a7b7-67c4a43b65c8

diff --git a/client/GoodFETConsole.py b/client/GoodFETConsole.py
index 72077e7..cd0045f 100644 (file)
--- a/client/GoodFETConsole.py
+++ b/client/GoodFETConsole.py
@@ -19,6 +19,13 @@ class GoodFETConsole():
         client.serInit();
         client.setup();
         client.start();
         client.serInit();
         client.setup();
         client.start();

+    def run(self):
+        while 1:
+            sys.stdout.write("gf% ");
+            sys.stdout.flush();
+            cmd=sys.stdin.readline();
+            self.handle(cmd);
+

     def handle(self, str):
         """Handle a command string.  First word is command."""
         #Lines beginning with # are comments.
     def handle(self, str):
         """Handle a command string.  First word is command."""
         #Lines beginning with # are comments.

diff --git a/client/goodfet b/client/goodfet
index a42a2c8..ebcbec8 100755 (executable)
--- a/client/goodfet
+++ b/client/goodfet
@@ -26,11 +26,6 @@ driver=sys.argv[1];
 print "Using driver %s" % driver;
 client=eval("%s()" % driver);
 console=GoodFETConsole(client);
 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);
+console.run();

 
 sys.exit(0);
 
 sys.exit(0);

diff --git a/client/goodfet.cc b/client/goodfet.cc
index a7b208f..ed093a1 100755 (executable)
--- a/client/goodfet.cc
+++ b/client/goodfet.cc
@@ -9,12 +9,14 @@ import sys;
 import binascii;
 
 from GoodFETCC import GoodFETCC;
 import binascii;
 
 from GoodFETCC import GoodFETCC;

+from GoodFETConsole import GoodFETConsole;

 from intelhex import IntelHex;
 
 
 if(len(sys.argv)==1):
     print "Usage: %s verb [objects]\n" % sys.argv[0];
     print "%s test" % sys.argv[0];
 from intelhex import IntelHex;
 
 
 if(len(sys.argv)==1):
     print "Usage: %s verb [objects]\n" % sys.argv[0];
     print "%s test" % sys.argv[0];

+    print "%s term" % sys.argv[0];

     print "%s info" % sys.argv[0];
     print "%s dumpcode $foo.hex [0x$start 0x$stop]" % sys.argv[0];
     print "%s dumpdata $foo.hex [0x$start 0x$stop]" % sys.argv[0];
     print "%s info" % sys.argv[0];
     print "%s dumpcode $foo.hex [0x$start 0x$stop]" % sys.argv[0];
     print "%s dumpdata $foo.hex [0x$start 0x$stop]" % sys.argv[0];


@@ -36,6 +38,7 @@ client.serInit()
 client.setup();
 client.start();
 
 client.setup();
 client.start();
 

+

 if(sys.argv[1]=="explore"):
     print "Exploring undefined commands."
     print "Status: %s" %client.status();
 if(sys.argv[1]=="explore"):
     print "Exploring undefined commands."
     print "Status: %s" %client.status();


@@ -46,7 +49,8 @@ if(sys.argv[1]=="explore"):
         print "Status %02x: %s" % (foo,client.status());
     for foo in range(0,3):
         print "PC: %04x" % client.CCgetPC();
         print "Status %02x: %s" % (foo,client.status());
     for foo in range(0,3):
         print "PC: %04x" % client.CCgetPC();

-        
+if(sys.argv[1]=="term"):
+    GoodFETConsole(client).run();

 if(sys.argv[1]=="test"):
     client.test();
 if(sys.argv[1]=="deadtest"):
 if(sys.argv[1]=="test"):
     client.test();
 if(sys.argv[1]=="deadtest"):