From 687b35985af45434471249e44e28b3e37ca34fcc Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Sun, 13 May 2018 18:33:58 +0100 Subject: [PATCH] ubee: more preparation for mode setting Also clean up reboot --- Kernel/platform-ubee/devtty.h | 3 +++ Kernel/platform-ubee/ubee.s | 35 ++++------------------------------- 2 files changed, 7 insertions(+), 31 deletions(-) diff --git a/Kernel/platform-ubee/devtty.h b/Kernel/platform-ubee/devtty.h index 4eb794be..07975b70 100644 --- a/Kernel/platform-ubee/devtty.h +++ b/Kernel/platform-ubee/devtty.h @@ -22,4 +22,7 @@ extern int gfx_ioctl(uint8_t minor, uarg_t arg, char *ptr); extern void map_video_font(void); extern void unmap_video_font(void); +extern void ctc_load(uint8_t *map); +extern uint8_t ctc6545[48]; + #endif diff --git a/Kernel/platform-ubee/ubee.s b/Kernel/platform-ubee/ubee.s index 2345fc6c..01d8911f 100644 --- a/Kernel/platform-ubee/ubee.s +++ b/Kernel/platform-ubee/ubee.s @@ -60,20 +60,14 @@ _bufpool: ; .area _COMMONMEM -_platform_monitor: - di - call map_kernel - jp to_monitor - platform_interrupt_all: in a,(0xef) ; FIXME: remove this line once debugged ret +_platform_monitor: _platform_reboot: di - call map_kernel - jp to_reboot - + halt ; ; Sit in common and play with the banks to see what we have ; @@ -119,29 +113,8 @@ page_codes: ; ----------------------------------------------------------------------------- .area _CODE -; These two must be below 32K and not use the stack until they hit ROM -; space. -; -; Not sure we can do this for most cases because not everyone has all that -; ROM -; -to_monitor: - ; Until we figure out how/if we can fix this - di - halt - jr to_monitor; - - xor a ; 0 or 1 to keep low 32K right ? */ - out (0x50), a ; ROMS please - jp 0x8000 ; Monitor - -to_reboot: - di - halt - jr to_reboot - xor a - out (0x50), a - jp 0xE000 + .globl _ctc_load + .globl _ctc6545 _ctc_load: pop de -- 2.34.1