Skip to content

Raven fixes #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
agranlund wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Raven fixes #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
458bd6b
fix blitter status
agranlund Apr 5, 2026
526e074
hardware poweroff
agranlund Apr 5, 2026
aa8558f
raven should not exclude cartscan
agranlund Apr 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions apps/shutdown/shutdown.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 */

Expand All @@ -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--;
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions kernel/bios/atari/magibios.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,7 @@ bot_l3:

* Cartridge testen

; IFEQ HADES | RAVEN
; IFEQ HADES
moveq #2,d0
bsr cartscan
; ENDIF
Expand Down Expand Up @@ -948,7 +948,7 @@ bot_l4:

* Cartridge testen

; IFEQ HADES | RAVEN
; IFEQ HADES
clr.w d0
bsr cartscan
; ENDIF
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions kernel/vdi/mxvdiknl.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading