From 8e970129b4207c688cd7d38cc592be9a20b0a37a Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Sat, 29 Sep 2018 16:22:42 +0100 Subject: [PATCH] micropack: sync with core changes --- Kernel/platform-micropack/devtty.c | 2 +- Kernel/platform-micropack/z80pack.s | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Kernel/platform-micropack/devtty.c b/Kernel/platform-micropack/devtty.c index 9c50cf47..a5ee1aab 100644 --- a/Kernel/platform-micropack/devtty.c +++ b/Kernel/platform-micropack/devtty.c @@ -55,7 +55,7 @@ void tty_pollirq(void) } } -void tty_setup(uint8_t minor) +void tty_setup(uint8_t minor, uint8_t flags) { used(minor); } diff --git a/Kernel/platform-micropack/z80pack.s b/Kernel/platform-micropack/z80pack.s index 6ce4599a..5eb67f83 100644 --- a/Kernel/platform-micropack/z80pack.s +++ b/Kernel/platform-micropack/z80pack.s @@ -21,11 +21,15 @@ .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 platform_interrupt_all .globl bank_switch_a .globl _curbank + .globl _int_disabled ; exported debugging tools .globl _platform_monitor @@ -69,6 +73,9 @@ _platform_reboot: ld a, #1 out (29), a +_int_disabled: + .db 1 + .area _CODE init_early: @@ -149,7 +156,10 @@ _program_vectors: map_kernel: map_process: map_process_always: -map_save: +map_kernel_di: +map_process_di: +map_process_always_di: +map_save_kernel: map_restore: ret -- 2.34.1