X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=main.c;h=288f94db80c608418488c2bf503ebf88098c8cde;hb=c28a7c811e2c4a565acfa04f57ad02d406692b7e;hp=0a52e573221209ac5740e3bae45d63332353b33d;hpb=72ef318cfcacd741d1f8fff31b76c31f52a6b0f3;p=teensytas.git

diff --git a/main.c b/main.c
index 0a52e57..288f94d 100644
--- a/main.c
+++ b/main.c
@@ -1,3 +1,28 @@
+/*
+ * TeensyTAS, TAS input player for MegaDrive
+ * Copyright (c) 2014 notaz
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
@@ -355,10 +380,11 @@ static void do_usb(void *buf)
 
 int main(void)
 {
+	uint32_t led_time = 0;
+	uint32_t scheck_time = 0;
 	uint32_t edge_cnt_last;
 	uint32_t edge_cnt;
 	uint8_t buf[64];
-	int timeout;
 	int ret;
 
 	delay(1000); // wait for usb..
@@ -404,15 +430,21 @@ int main(void)
 	asm("mrs %0, BASEPRI" : "=r"(ret));
 	printf("BASEPRI: %d\n", ret);
 
-	timeout = 1000;
 	edge_cnt_last = g.edge_cnt;
 
 	while (1) {
 		struct tas_pkt pkt;
+		uint32_t now;
 
 		while (g.stream_enable_to && !g.stream_ended
 		  && get_space_to() > sizeof(pkt.data) / STREAM_EL_SZ)
 		{
+			if (g.t_i == g.t_o && g.frame_cnt != 0) {
+				printf("underflow detected\n");
+				g.stream_enable_to = 0;
+				break;
+			}
+
 			pkt.type = PKT_STREAM_REQ;
 			pkt.req.frame = g.frame_cnt;
 
@@ -453,31 +485,43 @@ int main(void)
 			}
 		}
 
-		if (timeout == 1000) {
+		now = millis();
+
+		// start condition check
+		if (now - scheck_time > 1000) {
 			edge_cnt = g.edge_cnt;
 			//printf("e: %d th: %d\n", edge_cnt - edge_cnt_last,
 			//      (GPIOB_PDIR >> CORE_PIN0_BIT) & 1);
-			if (edge_cnt - edge_cnt_last > 10000) {
+			if ((g.stream_enable_to || g.stream_enable_from)
+			    && !g.stream_started
+			    && edge_cnt - edge_cnt_last > 10000)
+			{
 				do_start_seq();
 				edge_cnt = g.edge_cnt;
 			}
 			edge_cnt_last = edge_cnt;
+			scheck_time = now;
 		}
 
-		ret = usb_rawhid_recv(buf, timeout);
-		if (ret == 64) {
-			CORE_PIN13_PORTSET = CORE_PIN13_BITMASK;
-
-			do_usb(buf);
-			timeout = 20;
-		}
-		else if (ret == 0) {
-			CORE_PIN13_PORTCLEAR = CORE_PIN13_BITMASK;
-			timeout = 1000;
+		// led?
+		if (CORE_PIN13_PORTREG & CORE_PIN13_BITMASK) {
+			if ((int)(now - led_time) > 10)
+				CORE_PIN13_PORTCLEAR = CORE_PIN13_BITMASK;
 		}
-		else {
-			printf("usb_rawhid_recv: %d\n", ret);
-			timeout = 1000;
+
+		// something on rawhid?
+		if (usb_rawhid_available() > 0)
+		{
+			ret = usb_rawhid_recv(buf, 20);
+			if (ret == 64) {
+				led_time = millis();
+				CORE_PIN13_PORTSET = CORE_PIN13_BITMASK;
+
+				do_usb(buf);
+			}
+			else {
+				printf("usb_rawhid_recv: %d\n", ret);
+			}
 		}
 	}