From 91f7c94d587f5735bd53b68828c3810e0d6de245 Mon Sep 17 00:00:00 2001
From: dschmenk <l3matinracing>
Date: Thu, 13 Jun 2013 10:32:31 -0700
Subject: [PATCH] Attempt re-sync when RPi reboots and Apple II doesn't

---
 src/A2PI.PO | Bin 143360 -> 143360 bytes
 src/a2pid.c |  99 +++++++++++++++++++++++++++++-----------------------
 2 files changed, 55 insertions(+), 44 deletions(-)

diff --git a/src/A2PI.PO b/src/A2PI.PO
index 010a079f7e8073526270046911858f749bbe1189..e23c0e75c6c8195c48424e78ae5fa734f6f4728f 100755
GIT binary patch
delta 475
zcmZ9GO-LI-6vy+mAFW!mkG6<j=1_{E9xPI5&q`b9&{GTIMQ<t;dd+dAM658P9eWbC
zvy*I^wTUEpXr!048psOSj!_Un#6k%rk&;6RJrvrBz4;E0H^2YyJ;prK%`-h8R)Qxq
zqTCLyZ{1N&zxP-`-T`4iY#^N8Y}~qMK};hYuF8^J^t0}Q>fIIKXwtl(HY9Ynl(<sY
z9L=kU593)*Up9t=Hf0Swk%nBfR84~zWv>f*OmBtpvEjc5@q=AQMI-+$%V9enAxYT&
z9U&=THzds^p(iC*E;21<Rvl;+v1zPFb=O3hKO51~Qkp(&4h<v$Sw=3^={RN(2i$o%
zqE#d3P|_TFWI?NcUVH2Y5^6zBs2dh!8O-Q$v<8EHQ}?IXLP7UT5yqQQZ&`Hl6*L0q
zDd1`F-iU5a|3Ak!&!2}z*iKcjWU82FpHQuQaP04(Bk!<+Dqjx{3H#!gS*`qew^rUK
zY)_gUVe8q?xWa#huHiZGR>c5++c~&Kwf5MP4D`+ZUF`feYs?0S3yat?c)(UAs;eSY
l*Zd5KmhXaS;$GkZ>CLH^l6{%HP+!^Yk9Ipa`GA^A<R6AH(S!g1

delta 420
zcmZ9FKS%;$7{>i~cVB<;UMj?v8zPb%3JPj2GU(PoT5>E18jGfjP%`+U`V8~md3Pab
zsb~$==GYC%*VqyTA)yftAq_!&*48_`yzlRM9v<ZhDNm?m=d4-c;D)WIm!sU{OHUN=
z3E&vuIN$^ss1Hp>!6V=Vbh2Tby0z{yZ;n&Q2+a9Q;}Ar-O0c6QWCZh;p8N9&vR)sv
z#)(#!m(oyhR_@Y3XS8q`c~H|XKZsQg=&RNzU5lmXd;)GZ9XJU$pAMV?t)J0C5_(cB
z@~a6R<xYj>wXBF|PLxxm>{roQ*-w+XhIcRtk}4Kb?JavmtU@ltPAMW5RDv5`Ulf||
zkT9RK1o<)_<cm?r$6y6*N)Z@w1*QVpZW);ew97b@yde2N4uE+?yAAU9`sFP!BXscM
zZP9iae&67T!c7<-Ho-V<8zQ8)HM^jLYxR4tU7HtIE!coPSrrY7&NEcwsjVhdb)e0v
e0kk0_Ff7cs&Hq#GnX<<3=&dWgWnG?TJzYO&D5<*u

diff --git a/src/a2pid.c b/src/a2pid.c
index 3bc834a..019f67d 100755
--- a/src/a2pid.c
+++ b/src/a2pid.c
@@ -614,7 +614,7 @@ void main(int argc, char **argv)
                 die("error: REP_DELAY");
         evkey.type  = EV_REP;
         evkey.code  = REP_PERIOD;
-        evkey.value = 100;      /* 10 reps/sec */
+        evkey.value = 67;      /* 15 reps/sec */
         if (write(kbdfd, &evkey, sizeof(evkey)) < 0)
                 die("error: REP_PERIOD");
         /*
@@ -652,48 +652,16 @@ void main(int argc, char **argv)
         /*
          * Initialize event structures.
          */
-         bzero(&evkey,  sizeof(evkey));
-         bzero(&evsync, sizeof(evsync));
-         bzero(&evrelx, sizeof(evrelx));
-         bzero(&evrely, sizeof(evrely));
-         evkey.type  = EV_KEY;
-         evrelx.type = EV_REL;
-         evrelx.code = REL_X;
-         evrely.type = EV_REL;
-         evrely.code = REL_Y;
-         evsync.type = EV_SYN;
-        /*
-         * Open serial port.
-         */
-        prlog("a2pid: Open serial port\n");
-        a2fd = open(devtty, O_RDWR | O_NOCTTY);
-        if (a2fd < 0)
-                die("error: serial port open");
-        tcgetattr(a2fd, &oldtio); /* save current port settings */
-        bzero(&newtio, sizeof(newtio));
-        newtio.c_cflag     = BAUDRATE /*| CRTSCTS*/ | CS8 | CLOCAL | CREAD;
-        newtio.c_iflag     = IGNPAR;
-        newtio.c_oflag     = 0;
-        newtio.c_lflag     = 0; /* set input mode (non-canonical, no echo,...) */
-        newtio.c_cc[VTIME] = 0; /* inter-character timer unused */
-        newtio.c_cc[VMIN]  = 1; /* blocking read until 1 char received */
-        tcsetattr(a2fd, TCSANOW, &newtio);
-        prlog("a2pid: Waiting...\n");
-        tcflush(a2fd, TCIFLUSH);
-        newtio.c_cc[VMIN]  = 3; /* blocking read until 3 chars received */
-        tcsetattr(a2fd, TCSANOW, &newtio);
-        if (read(a2fd, iopkt, 1) == 1)
-        {
-                if (iopkt[0] == 0x80)     /* receive sync */
-                {
-                        prlog("a2pid: Connected.\n");
-                        iopkt[0] = 0x81;  /* acknowledge */
-                        write(a2fd, iopkt, 1);
-                        tcflush(a2fd, TCIFLUSH);
-                }
-                else
-                        stop = TRUE;
-        }
+        bzero(&evkey,  sizeof(evkey));
+        bzero(&evsync, sizeof(evsync));
+        bzero(&evrelx, sizeof(evrelx));
+        bzero(&evrely, sizeof(evrely));
+        evkey.type  = EV_KEY;
+        evrelx.type = EV_REL;
+        evrelx.code = REL_X;
+        evrely.type = EV_REL;
+        evrely.code = REL_Y;
+        evsync.type = EV_SYN;
         /*
          * Open socket.
          */
@@ -710,6 +678,48 @@ void main(int argc, char **argv)
         if (listen(srvfd, 1) < 0)
                 die("error: listen socket");
         reqfd = 0;
+        /*
+         * Open serial port.
+         */
+        prlog("a2pid: Open serial port\n");
+        a2fd = open(devtty, O_RDWR | O_NOCTTY);
+        if (a2fd < 0)
+                die("error: serial port open");
+        tcflush(a2fd, TCIFLUSH);
+        tcgetattr(a2fd, &oldtio); /* save current port settings */
+        bzero(&newtio, sizeof(newtio));
+        newtio.c_cflag     = BAUDRATE /*| CRTSCTS*/ | CS8 | CLOCAL | CREAD;
+        newtio.c_iflag     = IGNPAR;
+        newtio.c_oflag     = 0;
+        newtio.c_lflag     = 0; /* set input mode (non-canonical, no echo,...) */
+        newtio.c_cc[VTIME] = 0; /* inter-character timer unused */
+        newtio.c_cc[VMIN]  = 1; /* blocking read until 1 char received */
+        tcsetattr(a2fd, TCSANOW, &newtio);
+        prlog("a2pid: Waiting...\n");
+        iopkt[0] = 0x80;  /* request re-sync if Apple II already running */
+        write(a2fd, iopkt, 1);        
+        if (read(a2fd, iopkt, 1) == 1)
+        {
+                if (iopkt[0] == 0x80)   /* receive sync */
+                {
+                        prlog("a2pid: Connected.\n");
+                        iopkt[0] = 0x81;  /* acknowledge */
+                        write(a2fd, iopkt, 1);
+                        tcflush(a2fd, TCIFLUSH);
+                }
+                else if (iopkt[0] == 0x9F)     /* bad request from Apple II */
+                {
+                        prlog("a2pi: Bad Connect Request.\n");
+                        tcflush(a2fd, TCIFLUSH);
+                }
+                else
+                {
+                        printf("a2pi: Bad Sync ACK [0x%02X]\n", iopkt[0]);
+                        stop = TRUE;
+                }
+        }
+        newtio.c_cc[VMIN] = 3; /* blocking read until 3 chars received */
+        tcsetattr(a2fd, TCSANOW, &newtio);
         FD_ZERO(&openset);
         FD_SET(a2fd,  &openset);
         FD_SET(srvfd, &openset);
@@ -843,7 +853,8 @@ void main(int argc, char **argv)
                                                         break;
                                                 default:
                                                         prlog("a2pid: Unknown Event\n");
-                                                        stop = TRUE;
+                                                        tcflush(a2fd, TCIFLUSH);
+                                                        //stop = TRUE;
                                         }
                                 }
                                 else