From f45f4193f221d3ede706e02fc6b67916f90adf36 Mon Sep 17 00:00:00 2001 From: tmk Date: Fri, 21 Jun 2013 21:48:18 +0900 Subject: Use serial_uart.c instead of x68k.c now --- converter/x68k_usb/matrix.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'converter/x68k_usb/matrix.c') diff --git a/converter/x68k_usb/matrix.c b/converter/x68k_usb/matrix.c index 954e7ef12..2d5a1e116 100644 --- a/converter/x68k_usb/matrix.c +++ b/converter/x68k_usb/matrix.c @@ -21,8 +21,9 @@ along with this program. If not, see . #include #include "print.h" #include "util.h" -#include "x68k.h" +#include "serial.h" #include "matrix.h" +#include "debug.h" /* @@ -63,7 +64,7 @@ uint8_t matrix_cols(void) void matrix_init(void) { - x68k_init(); + serial_init(); // initialize matrix state: all keys off for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00; @@ -75,13 +76,13 @@ uint8_t matrix_scan(void) { is_modified = false; - uint8_t code; - code = x68k_recv(); - if (code == 0) { + uint16_t code; + code = serial_recv2(); + if (code == -1) { return 0; } - phex(code); print(" "); + dprintf("%02X\n", code); if (code&0x80) { // break code if (matrix_is_on(ROW(code), COL(code))) { -- cgit v1.2.3