From: Bernard Blackham Date: Wed, 23 Jun 2004 19:15:26 +0000 (+0000) Subject: Get rid of ack/nack code. X-Git-Tag: ROMW~5 X-Git-Url: https://git.ucc.asn.au/?p=uccvend-snackrom.git;a=commitdiff_plain;h=2e98bf59fc918f4e3d0dcfda51b381c8ef853746;ds=sidebyside Get rid of ack/nack code. Convert stuff to uppercase. --- diff --git a/ROM2/main_basic.c b/ROM2/main_basic.c index 5797318..3896b3e 100644 --- a/ROM2/main_basic.c +++ b/ROM2/main_basic.c @@ -146,7 +146,7 @@ void give_change() { (sci_rx_buf[3] < '0') || (sci_rx_buf[3] > '9') || (sci_rx_buf[4] < '0') || (sci_rx_buf[4] > '9') || (sci_rx_buf[5] < '0') || (sci_rx_buf[5] > '9')) { - send_nack(); + //send_nack(); } cost = sci_rx_buf[1] - '0'; cost *= 10; cost = sci_rx_buf[2] - '0'; @@ -155,7 +155,7 @@ void give_change() { cost *= 10; cost = sci_rx_buf[5] - '0'; coin_cost(cost); - send_ack(); + //send_ack(); } void send_keypress(u8 key) { diff --git a/ROM2/sci.c b/ROM2/sci.c index 646e443..6ef3cd3 100644 --- a/ROM2/sci.c +++ b/ROM2/sci.c @@ -50,6 +50,11 @@ void send_string(char* c) { } } +char toupper(char c) { + if (c >= 'a' && c <= 'z') c -= 'a'-'A'; + return c; +} + void sci_rx_int() { char buf = _io_ports[M6811_SCDR]; if (sci_doing_xmodem) { @@ -72,7 +77,8 @@ void sci_rx_int() { /* overrun :( */ return; } - sci_rx_buf[sci_rx_buf_ptr] = buf; + /* we upper case because no commands care that things aren't */ + sci_rx_buf[sci_rx_buf_ptr] = toupper(buf); if (buf == '\n' || buf == '\r') { sci_rx_buf[sci_rx_buf_ptr] = '\0'; @@ -98,14 +104,6 @@ void msg_clr() { sci_rx_buf_ptr = 0; } -void send_ack() { - send_string("!" CRLF); -} - -void send_nack() { - send_string("?" CRLF); -} - u16 sci_timer; void serial_rti() { /* called every 6.6 ms */ if (sci_timer) sci_timer--;