Apple-1-Tools/Ryukojiro-apple1
1
0
Fork 0
mirror of https://github.com/RyuKojiro/apple1.git synced 2024-05-27 23:48:25 +00:00
Code Issues Projects Releases Wiki Activity

Some PIA character handling logic cleanup

Browse Source
This commit is contained in:
Daniel Loffgren 2018-12-29 12:14:49 -08:00
parent 25ea3d4d01
commit b11e9b89a3
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/pia.c
View File

@ -131,15 +131,21 @@ uint8_t keyboardReadReadyCallback(struct _v6502_memory *memory, uint16_t offset,
return 0xbf; return 0xbf;
} }
// Already have something waiting for the keyboardReadCharacterCallback
if (context->buf) { if (context->buf) {
return KEYBOARD_READY; return KEYBOARD_READY;
} }
int c;
if (context->suspended) { if (context->suspended) {
printf("Keyboard readiness register ($D011) trap read.\n"); printf("Keyboard readiness register ($D011) trap read.\n");
printf("Press a key for input to keyboard register ($D010): "); printf("Press a key for input to keyboard register ($D010): ");
fflush(stdout); fflush(stdout);
crmode(); crmode();
c = wgetch(context->screen);
printf("%c\r\n", c);
} }
else { else {
int x, y; int x, y;
@ -148,15 +154,9 @@ uint8_t keyboardReadReadyCallback(struct _v6502_memory *memory, uint16_t offset,
attroff(A_REVERSE); attroff(A_REVERSE);
wprintw(context->screen, " "); wprintw(context->screen, " ");
wmove(context->screen, y, x); wmove(context->screen, y, x);
}
int c = wgetch(context->screen); c = wgetch(context->screen);
if (context->suspended) {
printf("%c\r\n", c);
}
else {
int x, y;
getyx(context->screen, y, x);
wmove(context->screen, 0, getmaxx(context->screen) - 1); wmove(context->screen, 0, getmaxx(context->screen) - 1);
attron(A_REVERSE); attron(A_REVERSE);
wprintw(context->screen, "!"); wprintw(context->screen, "!");
@ -164,17 +164,15 @@ uint8_t keyboardReadReadyCallback(struct _v6502_memory *memory, uint16_t offset,
wmove(context->screen, y, x); wmove(context->screen, y, x);
} }
if (c == '`') { switch (c) {
context->signalled++; case '`':
return KEYBOARD_NOTREADY; context->signalled++;
case ERR:
return KEYBOARD_NOTREADY;
default:
context->buf = asciiCharFromCursesKey(c);
return KEYBOARD_READY;
} }
if (c != ERR) {
context->buf = asciiCharFromCursesKey(c);
return KEYBOARD_READY;
}
return KEYBOARD_NOTREADY;
} }
uint8_t keyboardReadCharacterCallback(struct _v6502_memory *memory, uint16_t offset, int trap, a1pia *context) { uint8_t keyboardReadCharacterCallback(struct _v6502_memory *memory, uint16_t offset, int trap, a1pia *context) {
@ -188,9 +186,12 @@ uint8_t keyboardReadCharacterCallback(struct _v6502_memory *memory, uint16_t off
if (context->buf) { if (context->buf) {
uint8_t a = a1CharFromAsciiChar(context->buf); uint8_t a = a1CharFromAsciiChar(context->buf);
// Only pop the character off the buffer if this is a trapped read
if (trap) { if (trap) {
context->buf = '\0'; context->buf = '\0';
} }
return a; return a;
} }