From 458bd6b9f8173ec53266a567c8dc43d10d43e0a9 Mon Sep 17 00:00:00 2001 From: agranlund Date: Sun, 5 Apr 2026 16:17:15 +0200 Subject: [PATCH 1/3] fix blitter status --- kernel/vdi/mxvdiknl.s | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/vdi/mxvdiknl.s b/kernel/vdi/mxvdiknl.s index bfa6196..4f1c5a5 100644 --- a/kernel/vdi/mxvdiknl.s +++ b/kernel/vdi/mxvdiknl.s @@ -564,8 +564,10 @@ chk_blitter: movem.l d1/a0-a1,-(sp) movea.l 8.w,a1 ;Busfehler-Vektor sichern move.l #bus_err_tst,8.w ;eigenen Vektor eintragen moveq.l #0,d0 +IFEQ RAVEN tst.w ($ffff8a00).w ;auf Hardware zugreifen moveq.l #2,d0 ;Blitter ist vorhanden +ENDIF bus_err_tst: move.l a1,8.w ;Busfehler-Vektor zurueck movea.l a0,sp ;Stackpointer zurueck move.w d1,sr ;Statusregister zurueck From 526e074206fcaadd470123a5c1ff383b1dab14bb Mon Sep 17 00:00:00 2001 From: agranlund Date: Sun, 5 Apr 2026 16:17:58 +0200 Subject: [PATCH 2/3] hardware poweroff --- apps/shutdown/shutdown.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/apps/shutdown/shutdown.c b/apps/shutdown/shutdown.c index 948a398..92cda80 100644 --- a/apps/shutdown/shutdown.c +++ b/apps/shutdown/shutdown.c @@ -558,7 +558,8 @@ int main(int argc, char *argv[]) char apname[16]; char s[256]; int i; - int dev, xdv, txt, isfalcon, ct60; + int dev, xdv, txt, isfalcon; + int have_poweroff; int doex, isgr, isover; int msgtyp; int iteration; @@ -609,7 +610,8 @@ int main(int argc, char *argv[]) break; } - ct60 = xbios(39, 'AnKr', 4, 0x43543630L) != 0; + have_poweroff = xbios(39, 'AnKr', 4, 0x43543630L) != 0; /* ct60 */ + have_poweroff |= xbios(39, 'AnKr', 4, 0x5241564EL) != 0; /* raven */ /* -w oder -c */ @@ -620,7 +622,7 @@ int main(int argc, char *argv[]) bootmode = coldboot; else if (c == 'W') bootmode = warmboot; - else if (c == 'P' && ct60) + else if (c == 'P' && have_poweroff) bootmode = poweroff; argv++; argc--; @@ -865,7 +867,7 @@ int main(int argc, char *argv[]) */ if (bootmode == ask) { - sprintf(s, s_successful, ct60 ? s_poweroff : ""); + sprintf(s, s_successful, have_poweroff ? s_poweroff : ""); dev = form_alert(1, s); /* shel_write(SHW_SHUTDOWN, FALSE, 0, NULL, NULL); */ if (dev == 1) From aa8558f21b03579782ddf254068b72c090965430 Mon Sep 17 00:00:00 2001 From: agranlund Date: Sun, 5 Apr 2026 16:33:44 +0200 Subject: [PATCH 3/3] raven should not exclude cartscan yes, these ifdefs were already commented out but in the interest of code clarity, that commented out ifdef now does the right thing. --- kernel/bios/atari/magibios.s | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/bios/atari/magibios.s b/kernel/bios/atari/magibios.s index 4fea461..aaee2ce 100644 --- a/kernel/bios/atari/magibios.s +++ b/kernel/bios/atari/magibios.s @@ -886,7 +886,7 @@ bot_l3: * Cartridge testen -; IFEQ HADES | RAVEN +; IFEQ HADES moveq #2,d0 bsr cartscan ; ENDIF @@ -948,7 +948,7 @@ bot_l4: * Cartridge testen -; IFEQ HADES | RAVEN +; IFEQ HADES clr.w d0 bsr cartscan ; ENDIF @@ -965,7 +965,7 @@ bot_l4: ; FIXME: boot loader for CTPCI invokes trap #0 here -; IFEQ HADES | RAVEN +; IFEQ HADES moveq #1,d0 bsr cartscan ; ENDIF