From be4df516fd9f2343fab99607a71bcff28f3da56a Mon Sep 17 00:00:00 2001 From: Will Xyen Date: Mon, 29 Jun 2020 06:47:31 -0700 Subject: [PATCH] ddrio: Fix p3io and extio lighting output being swapped with one another the header, mm and smx modules had it right also fixes p3io responses being the wrong size in 2 cases --- src/main/ddrio-smx/ddrio.c | 2 +- src/main/ddrio/ddrio.c | 4 ++-- src/main/p3ioemu/uart.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/ddrio-smx/ddrio.c b/src/main/ddrio-smx/ddrio.c index def8018..9306791 100644 --- a/src/main/ddrio-smx/ddrio.c +++ b/src/main/ddrio-smx/ddrio.c @@ -168,7 +168,7 @@ void ddr_io_set_lights_p3io(uint32_t lights) { uint8_t i; - for (i = 0x0E; i <= 0x1E; i++) { + for (i = 0x00; i <= 0x07; i++) { mapper_write_light(i, lights & (1 << i) ? 255 : 0); } } diff --git a/src/main/ddrio/ddrio.c b/src/main/ddrio/ddrio.c index b83e791..e5ea8b0 100644 --- a/src/main/ddrio/ddrio.c +++ b/src/main/ddrio/ddrio.c @@ -43,7 +43,7 @@ void ddr_io_set_lights_extio(uint32_t lights) { uint8_t i; - for (i = 0x00; i <= 0x07; i++) { + for (i = 0x0E; i <= 0x1E; i++) { mapper_write_light(i, lights & (1 << i) ? 255 : 0); } } @@ -52,7 +52,7 @@ void ddr_io_set_lights_p3io(uint32_t lights) { uint8_t i; - for (i = 0x0E; i <= 0x1E; i++) { + for (i = 0x00; i <= 0x07; i++) { mapper_write_light(i, lights & (1 << i) ? 255 : 0); } } diff --git a/src/main/p3ioemu/uart.c b/src/main/p3ioemu/uart.c index 416121e..6d5093c 100644 --- a/src/main/p3ioemu/uart.c +++ b/src/main/p3ioemu/uart.c @@ -104,7 +104,7 @@ void p3io_uart_cmd_open_close( } end: - p3io_resp_init(&resp->hdr, sizeof(resp), &req->hdr); + p3io_resp_init(&resp->hdr, sizeof(*resp), &req->hdr); resp->status = 0; resp->u8 = FAILED(hr); } @@ -167,7 +167,7 @@ void p3io_uart_cmd_write( hr = p3io_uart_write(p3io_uart_fds[req->port_no], &iobuf); end: - p3io_resp_init(&resp->hdr, sizeof(resp), &req->hdr); + p3io_resp_init(&resp->hdr, sizeof(*resp), &req->hdr); resp->status = FAILED(hr); resp->nbytes = iobuf.pos; }