added receivebyte with timeout. sometimes it will just hang,

unfortuanetly this isn't useful, since the MC hangs in a flashroutine...
hmpf :/

diff --git a/pkernel/kernel.py b/pkernel/kernel.py
index 3ebda56f3ad0952f12990f1d951df6ce1532b488..576c6807fa11f95d6c52418985579da38ec19eb0 100755 (executable)
--- a/pkernel/kernel.py
+++ b/pkernel/kernel.py
@@ -14,6 +14,22 @@ def recvByte():
                i = tty.read()
        return ord(i)
 
+def recvByteTO(b): #with timeout
+       j = 0
+       i = tty.read()
+       while len(i)==0 and j < 400:
+               time.sleep(0.03)
+               i = tty.read()
+               j = j + 1
+       if j == 400:
+               print "ack it!"
+               sendByte(0x23)
+               if(recvByte() != 0xaa):
+                       raise Exception #ok, something really failed
+       else:
+               if(ord(i) != b):
+                       raise Exception
+
 def sendByte(byte):
        time.sleep(0.005) # just to get sure, wait 5ms
        tty.write(chr(byte))
@@ -53,28 +69,16 @@ def pkernWRITE(address, size, data):
        print "address:", hex(address), "size:", size
        # send WRITE command
        sendByte(0x13)
-       if (recvByte() != 0x37):
-               raise Exception
+       recvByteTO(0x37)
+
        # tell desired address and size
        sendDWord(address)
        sendWord(size)
 
-       if (recvByte() != 0x04):
-               raise Exception
-       print "Received Metadata."
-
        # write binary stream of data
        for i in range(0, size):
                sendByte(data[i])
 
-       if (recvByte() != 0x08):
-               raise Exception
-       print "Received Data."
-
-       if (recvByte() != 0x28):
-               raise Exception
-       print "Flashing done."
-
 
 class FlashSequence(object):
        def __init__(self, address, data):
@@ -147,6 +151,8 @@ for seq in flashseqs:
        print "Flashing", len(seq.data), "bytes at address", hex(seq.address)
        pkernWRITE(seq.address, len(seq.data), seq.data)
 
-sendByte(0x99);
+#sendByte(0x99); #exit and wait
+#print "Reset your board now to run code from Flash"
+
 
-print "Reset your board now to run code from Flash"
+sendByte(0x97); #exit and restart

diff --git a/pkernel/main.c b/pkernel/main.c
index c40924f4b3c9c3c39e484a486734bba55491b5bb..ac9c20b9cfdc98eac7c531d4061d731700cde817 100644 (file)
--- a/pkernel/main.c
+++ b/pkernel/main.c
@@ -1,13 +1,12 @@
 #include "mb91465k.h"
 #include "flash.h"
 
-#define BUFSIZE 0x20
+#define BUFSIZE 0x10
 #define cleardata() memset(data,0,BUFSIZE)
 
 static void increaseled(void)
 {
        PDR14 = ~(((~PDR14)+1)%256);
-       HWWD_CL = 0;
 }
 
 static unsigned char recvbyte(void)
@@ -68,6 +67,7 @@ void main(void)
        while(running) {
                cleardata();
                increaseled();
+
                switch(recvbyte()) {
                        case 0x15: //chip erase
                                Putch4(0x45);
@@ -106,13 +106,11 @@ void main(void)
                                size = recvword();
                                increaseled();
 
-                               Putch4(0x04); //Received Metadata.
                                PDR14 = 0xff;
                                for(i=0; i<size; i++) { /* get data */
                                        increaseled();
                                        data[i] = recvbyte();
                                }
-                               Putch4(0x08); //Received Data.
 
                                PDR14 = 0xff;
                                for(i=0; i<size; i+=2) { /* flash the data */
@@ -122,9 +120,17 @@ void main(void)
                                                panic();
                                        }
                                }
-                               Putch4(0x28); //Flashing done.
                                break;
 
+                       case 0x23: //ack it
+                               Putch4(0xaa);
+                               break;
+
+                       case 0x97: /* exit and restart (let do this by the watchdog)! */
+                               while(1) {
+                                       increaseled();
+                               }
+
                        case 0x99: /* exit */
                                running = 0;
                                break;