From 3fc3bb9f4ffe4e8ac655555e7177963ceb9719b9 Mon Sep 17 00:00:00 2001 From: Daniel Loffgren Date: Sun, 20 Sep 2015 02:17:09 +0000 Subject: [PATCH] Utilize new v6502_map return codes and assert on failure to map git-svn-id: svn+ssh://svn.phoenixbox.net/svn/apple1/trunk@46 64f78de7-aa59-e511-a0e8-0002a5492df0 --- apple1/pia.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/apple1/pia.c b/apple1/pia.c index d9d5491..5cf7dcb 100644 --- a/apple1/pia.c +++ b/apple1/pia.c @@ -11,6 +11,7 @@ #include #include #include +#include #define FIXME_I_SHOULDNT_BE_NULL NULL #define KEYBOARD_READY 0xFF // This just needs to meet the requirements of being a negative number in the eyes of the 6502 @@ -127,10 +128,10 @@ a1pia *pia_create(v6502_memory *mem) { pia->memory = mem; pia->screen = NULL; - v6502_map(mem, A1PIA_KEYBOARD_INPUT, 1, (v6502_readFunction *)keyboardReadCharacterCallback, NULL, pia); - v6502_map(mem, A1PIA_KEYBOARD_CRLF_REG, 1, (v6502_readFunction *)keyboardReadReadyCallback, NULL, pia); - v6502_map(mem, A1PIA_VIDEO_OUTPUT, 1, FIXME_I_SHOULDNT_BE_NULL, (v6502_writeFunction *)videoWriteCharCallback, pia); - v6502_map(mem, A1PIA_VIDEO_CRLF_REG, 1, FIXME_I_SHOULDNT_BE_NULL, (v6502_writeFunction *)videoWriteNewlineCallback, pia); + assert(v6502_map(mem, A1PIA_KEYBOARD_INPUT, 1, (v6502_readFunction *)keyboardReadCharacterCallback, NULL, pia)); + assert(v6502_map(mem, A1PIA_KEYBOARD_CRLF_REG, 1, (v6502_readFunction *)keyboardReadReadyCallback, NULL, pia)); + assert(v6502_map(mem, A1PIA_VIDEO_OUTPUT, 1, FIXME_I_SHOULDNT_BE_NULL, (v6502_writeFunction *)videoWriteCharCallback, pia)); + assert(v6502_map(mem, A1PIA_VIDEO_CRLF_REG, 1, FIXME_I_SHOULDNT_BE_NULL, (v6502_writeFunction *)videoWriteNewlineCallback, pia)); return pia; }