X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=ROM2%2Fsci.c;h=646e443ca4cb4077226b394836fe27e2f321b582;hb=74fa3423b3feafe4877c3bfc819462e80797ed3a;hp=739d706069a49c0ca5a061f06c9a3f4040947164;hpb=8209e6e9a79982684e617d386505952a338b15f2;p=uccvend-snackrom.git

diff --git a/ROM2/sci.c b/ROM2/sci.c
index 739d706..646e443 100644
--- a/ROM2/sci.c
+++ b/ROM2/sci.c
@@ -1,11 +1,13 @@
 #include "vend.h"
-#include "chime.h"
 #include "sci.h"
 
 char sci_tx_buf[BUFFER_LEN];
 volatile char sci_rx_buf[BUFFER_LEN];
 volatile bool sci_have_packet;
 volatile u8 sci_rx_buf_ptr;
+volatile u8 sci_rx_buf_ptr_start;
+volatile bool sci_echo;
+bool sci_doing_xmodem;
 
 void sci_init() {
 	/* assumes clock of 4.91Mhz */
@@ -19,9 +21,12 @@ void sci_init() {
 
 	sci_have_packet = 0;
 	sci_rx_buf_ptr = 0;
+	sci_rx_buf_ptr_start = 0;
+	sci_echo = 0;
+	sci_doing_xmodem = 0;
 }
 
-void send_packet() {
+void send_buffer(bool crlf) {
 	char* c;
 	for (c = sci_tx_buf; *c; c++) {
 		/* wait for TX ready */
@@ -30,34 +35,58 @@ void send_packet() {
 		/* send byte */
 		_io_ports[M6811_SCDR] = *c;
 	}
+	if (!crlf) return;
+	/* send CRLF */
+	while (!(_io_ports[M6811_SCSR] & M6811_TDRE));
+	_io_ports[M6811_SCDR] = '\r';
+	while (!(_io_ports[M6811_SCSR] & M6811_TDRE));
+	_io_ports[M6811_SCDR] = '\n';
+}
+
+void send_string(char* c) {
+	for (; *c; c++) {
+		while (!(_io_ports[M6811_SCSR] & M6811_TDRE)); /* wait for TX ready */
+		_io_ports[M6811_SCDR] = *c; /* send byte */
+	}
 }
 
 void sci_rx_int() {
+	char buf = _io_ports[M6811_SCDR];
+	if (sci_doing_xmodem) {
+		if ((sci_rx_buf_ptr+1)%BUFFER_LEN == sci_rx_buf_ptr_start) {
+			/* we drop following bytes :( */
+			return;
+		}
+		sci_rx_buf[sci_rx_buf_ptr] = buf;
+		sci_rx_buf_ptr++;
+		sci_rx_buf_ptr %= BUFFER_LEN;
+		return;
+	}
+	if (sci_echo) {
+		while (!(_io_ports[M6811_SCSR] & M6811_TDRE)); /* wait for TX ready */
+		_io_ports[M6811_SCDR] = buf; /* send byte */
+	}
+
 	/* XXX FIXME we should do something about errors. nack? */
 	if (sci_have_packet) {
 		/* overrun :( */
-		_io_ports[M6811_SCDR]; /* read it anyway */
 		return;
 	}
-	sci_rx_buf[sci_rx_buf_ptr] = _io_ports[M6811_SCDR];
-	if (sci_rx_buf[sci_rx_buf_ptr] == '\n' ||
-			sci_rx_buf[sci_rx_buf_ptr] == '\r') {
-		if (sci_rx_buf_ptr == 0) return; /* we've read a blank packet in */
+	sci_rx_buf[sci_rx_buf_ptr] = buf;
+
+	if (buf == '\n' || buf == '\r') {
 		sci_rx_buf[sci_rx_buf_ptr] = '\0';
 		sci_have_packet = 1;
-		sci_rx_buf_ptr = 0;
 	}
-	sci_rx_buf_ptr++;
-	if (sci_rx_buf_ptr >= BUFFER_LEN) {
-		sci_rx_buf[BUFFER_LEN] = '\0'; /* this is as much as we could fit */
-		sci_have_packet = 1;
-		sci_rx_buf_ptr = 0;
+
+	if (sci_rx_buf_ptr+1 < BUFFER_LEN)
+		sci_rx_buf_ptr++;
+	else {
+		sci_rx_buf[BUFFER_LEN-1] = '\0'; /* this is as much as we could fit */
 	}
 }
 
 void sci_interrupt_serial() {
-	chime_start();
-
 	if (_io_ports[M6811_SCSR] & M6811_RDRF) sci_rx_int();
 
 	if (_io_ports[M6811_SCSR] & M6811_OR)
@@ -70,11 +99,36 @@ void msg_clr() {
 }
 
 void send_ack() {
-	my_strncpy(sci_tx_buf, "!\n", BUFFER_LEN);
-	send_packet();
+	send_string("!" CRLF);
 }
 
 void send_nack() {
-	my_strncpy(sci_tx_buf, "?\n", BUFFER_LEN);
-	send_packet();
+	send_string("?" CRLF);
+}
+
+u16 sci_timer;
+void serial_rti() { /* called every 6.6 ms */
+	if (sci_timer) sci_timer--;
+}
+
+/* for gdb compatibility */
+int serial_readchar(u8 timeout) {
+	int ret;
+	sci_timer = timeout * 152;
+	while (sci_timer && sci_rx_buf_ptr_start == sci_rx_buf_ptr); /* spin */
+	if (sci_timer == 0) return SERIAL_TIMEOUT;
+	ret = sci_rx_buf[sci_rx_buf_ptr_start];
+	sci_rx_buf_ptr_start++;
+	sci_rx_buf_ptr_start %= BUFFER_LEN;
+	return ret;
 }
+
+void serial_write(const char *str, int len) {
+	char *c, *end;
+	end = (char*)(str + len);
+	for (c = (char*)str; c < end; c++) {
+		while (!(_io_ports[M6811_SCSR] & M6811_TDRE)); /* wait for TX ready */
+		_io_ports[M6811_SCDR] = *c; /* send byte */
+	}
+}
+