X-Git-Url: http://git.joshuawise.com/fpgaboy.git/blobdiff_plain/bf3f2c5f96cdfc7629e93d810f42550349388122..e4fd7c1673a5a587a2eb8d4c2b8e22d921b949b9:/binwire.c?ds=inline

diff --git a/binwire.c b/binwire.c
index ed6b98c..cef0924 100644
--- a/binwire.c
+++ b/binwire.c
@@ -7,10 +7,13 @@
 
 void dowrite(char *s, int len)
 {
-  int i;
-  for (i=0; i<len; i++)
+  int i = 0;
+  while (i < len)
   {
-    write(1, s+i, 1);
+    int cs = ((len-i) > 1) ? 1 : (len-i);
+    
+    write(1, s+i, cs);
+    i += cs;
   }
 }
 
@@ -23,29 +26,33 @@ int waitchar(int timeout)
   return poll(&pfd, 1, timeout) == 1;
 }
 
-void expect(char *s, int len)
+int expect(char *s, int len)
 {
   int i;
   char c;
   for (i=0; i < len; i++)
   {
-    if (waitchar(100) == 0)
+    if (waitchar(1000) == 0)
     {
       fprintf(stderr, "Timeout reached in expect (expected %c)\n", s[i]);
-      return;
+      return 1;
     }
     while (read(0, &c, 1) == 0)
       fprintf(stderr, "Short read...\n");
     if (c != s[i])
+    {
       fprintf(stderr, "Expect failed: expected %d, got %d (pos %d)\n", s[i], c, i);
+      return 1;
+    }
   }
+  return 0;
 }
 
 void expect_no_chars()
 {
   int cs = 0;
   
-  while (waitchar(10) == 1)
+  while (waitchar(100) == 1)
   {
     char c;
     if (read(0, &c, 1) == 0)
@@ -55,8 +62,6 @@ void expect_no_chars()
   }
   if (cs)
     fprintf(stderr, "Expect no chars failed: got %d chars\n", cs);
-  
-  
 }
 
 void main(int argc, char **argv)
@@ -64,6 +69,7 @@ void main(int argc, char **argv)
   unsigned char buf[259];
   int sz;
   int rfd;
+  int tc = 0;
   
   if (argc < 2)
   {
@@ -77,18 +83,38 @@ void main(int argc, char **argv)
     exit(1);
   }
   
-  dowrite("\x1B" "A\x00\x00\x00...", 8);
+  dowrite("\x1B" "A\x00\x00\x00", 5);
   fprintf(stderr, "Address sent\n");
-  expect("A...", 4);
-  while ((sz = read(rfd, buf+3, 128)) > 0)
+  expect("A", 1);
+  expect_no_chars();
+  while ((sz = read(rfd, buf+3, 255)) > 0)
   {
+    int rv;
+    char abuf[5];
     buf[0] = 0x1B;
     buf[1] = 'D';
     buf[2] = sz+1;
+    abuf[0] = 0x1B;
+    abuf[1] = 'A';
+    abuf[2] = (tc >> 16) & 0xFF;
+    abuf[3] = (tc >> 8) & 0xFF;
+    abuf[4] = tc & 0xFF;
+    tc += sz;
+    retry:
+    dowrite(abuf, 5);
+    rv = expect("A", 1);
     dowrite(buf, sz + 3);
-    fprintf(stderr, "Data sent\n");
-    expect("D", 1);
+    fprintf(stderr, "Data sent (%d)\n", tc);
+    rv |= expect("D", 1);
     expect_no_chars();
+    if (rv)
+    {
+      printf("Failure to ack... retrying\n");
+      dowrite("...", 3);
+      rv = expect("...", 3);
+      expect_no_chars();
+      goto retry;
+    }
   }
   exit(0);
 }
\ No newline at end of file