From e9d39c0a688e564d9a3f6897d7033accadf528f5 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Fri, 28 Sep 2018 23:37:25 +0100 Subject: [PATCH] rc2014-tiny: update to new behaviours --- Kernel/platform-rc2014-tiny/devtty.c | 2 +- Kernel/platform-rc2014-tiny/rc2014.s | 23 +++++++++++++++-------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Kernel/platform-rc2014-tiny/devtty.c b/Kernel/platform-rc2014-tiny/devtty.c index 200652bc..b5ff0f67 100644 --- a/Kernel/platform-rc2014-tiny/devtty.c +++ b/Kernel/platform-rc2014-tiny/devtty.c @@ -17,7 +17,7 @@ struct s_queue ttyinq[NUM_DEV_TTY + 1] = { /* ttyinq[0] is never used */ {tbuf2, tbuf2, tbuf2, TTYSIZ, 0, TTYSIZ / 2}, }; -void tty_setup(uint8_t minor) +void tty_setup(uint8_t minor, uint8_t flags) { if (minor == 1) { } diff --git a/Kernel/platform-rc2014-tiny/rc2014.s b/Kernel/platform-rc2014-tiny/rc2014.s index dd8f1e16..e896695c 100644 --- a/Kernel/platform-rc2014-tiny/rc2014.s +++ b/Kernel/platform-rc2014-tiny/rc2014.s @@ -9,13 +9,17 @@ .globl map_kernel .globl map_process .globl map_process_always - .globl map_save + .globl map_kernel_di + .globl map_process_di + .globl map_process_always_di + .globl map_save_kernel .globl map_restore .globl map_for_swap .globl platform_interrupt_all .globl _platform_reboot .globl _platform_monitor .globl _bufpool + .globl _int_disabled ; imported symbols .globl _ramsize @@ -155,11 +159,6 @@ init_partial_uart: ld a, #0x18;A? ; Receive int mode 11, tx int enable (was $18) out (SIOB_C),a - ld a,#0x02 - out (SIOB_C),a - ld a,#SIO_IV ; INTERRUPT VECTOR ADDRESS (needs to go) - out (SIOB_C),a - ld a,#0x03 out (SIOB_C),a ld a,#0xE1 @@ -212,12 +211,15 @@ _platform_reboot: rst 0 ;========================================================================= -; Common Memory (0xF000 upwards) +; Common Memory (0xC000 upwards) ;========================================================================= .area _COMMONMEM ;========================================================================= +_int_disabled: + .db 1 + platform_interrupt_all: ret @@ -305,6 +307,7 @@ was_di: pop hl ; Outputs: none; A and HL destroyed ;========================================================================= map_process: +map_process_di: ld a,h or l ; HL == 0? jr z,map_kernel ; HL == 0 - map the kernel @@ -329,6 +332,7 @@ map_for_swap: ; Outputs: none; all registers preserved ;========================================================================= map_process_always: +map_process_always_di: push af ld a,#1 call rom_control @@ -341,6 +345,7 @@ map_process_always: ; Outputs: none; all registers preserved ;========================================================================= map_kernel: +map_kernel_di: push af xor a call rom_control @@ -364,10 +369,12 @@ map_restore: ; Inputs: none ; Outputs: none ;========================================================================= -map_save: +map_save_kernel: push af ld a,(rom_toggle) ld (save_rom),a + xor a + call rom_control pop af ret -- 2.34.1