Browse Source

Fix Fuzix Boot

- Minor issue in recent updates to Boot Loader broke Fuzix loading.  This is corrected.
pull/438/head v3.5.0-dev.92
Wayne Warthen 1 year ago
parent
commit
f3e0de4a97
  1. 14
      Source/Apps/reboot/reboot.asm
  2. 3
      Source/HBIOS/hbios.asm
  3. 2
      Source/HBIOS/romldr.asm
  4. 2
      Source/ver.inc
  5. 2
      Source/ver.lib

14
Source/Apps/reboot/reboot.asm

@ -11,8 +11,8 @@
; REBOOT [/C] [/W] [/?]
; ex: REBOOT Display version and usage
; REBOOT /? Display version and usage
; REBOOT /C Cold boot RomWBW system
; REBOOT /W Warm boot RomWBW system
; REBOOT /C Cold boot RomWBW system
; REBOOT /W Warm boot RomWBW system
;
; Operation:
; Cold or warm boots a RomWBW system depending on the user option selected.
@ -37,7 +37,7 @@
#include "../../HBIOS/hbios.inc"
;#include "ver.inc" ; Used for testing purposes....
;#include "hbios.inc" ; ....during code development
;#include "hbios.inc" ; ....during code development
;
;===============================================================================
;
@ -128,11 +128,11 @@ main:
ld ix,$0081 ; point to start of parm area (past length byte)
call nonblank ; skip to next non-blank char
cp '/' ; option prefix?
jr nz,usage ; display help info & exit if nothing to do
;
jr nz,usage ; display help info & exit if nothing to do
;
; process any options
inc ix ; fetch next character and process
ld a,(ix)
ld a,(ix)
call upcase ; ensure it's an upper case character
cp 'C' ; if it's a 'C' then
jr z,cboot ; do a cold boot.
@ -271,7 +271,7 @@ upcase:
;===============================================================================
;
str_banner .db "RomWBW Reboot Utility, Version 1.0, 12-Oct-2024\r\n"
.db " Wayne Warthen (wwarthen@gmail.com) & MartinR",0
.db " Wayne Warthen (wwarthen@gmail.com) & MartinR",0
;
str_warmboot .db "\r\n\r\nWarm booting...\r\n",0
str_coldboot .db "\r\n\r\nCold booting...\r\n",0

3
Source/HBIOS/hbios.asm

@ -5089,7 +5089,8 @@ EXT_SLICE4A:
LD BC,(SLICE_SPS)
LD A,(SLICE_SLICE)
OR A ; SLICE NUMBER - SET FLAGS TO CHECK LOOP CTR
JR Z,EXT_SLICE5A ; NOTHING TO COUNT
;JR Z,EXT_SLICE5A ; NOTHING TO COUNT
JR Z,EXT_SLICE6 ; BYPASS CAPACITY CHECK IF SLICE == 0
EXT_SLICE4B:
ADD HL,BC ; ADD ONE SLICE (SPS) TO LOW WORD
JR NC,EXT_SLICE4C ; CHECK FOR CARRY

2
Source/HBIOS/romldr.asm

@ -1130,7 +1130,7 @@ diskboot:
ld a,(bootslice) ; and slice
ld e,a
rst 08 ; do it
;
; Check errors from the Function
cp ERR_NOUNIT ; compare to no unit error
jp z,err_nodisk ; handle no disk err

2
Source/ver.inc

@ -2,7 +2,7 @@
#DEFINE RMN 5
#DEFINE RUP 0
#DEFINE RTP 0
#DEFINE BIOSVER "3.5.0-dev.91"
#DEFINE BIOSVER "3.5.0-dev.92"
#define rmj RMJ
#define rmn RMN
#define rup RUP

2
Source/ver.lib

@ -3,5 +3,5 @@ rmn equ 5
rup equ 0
rtp equ 0
biosver macro
db "3.5.0-dev.91"
db "3.5.0-dev.92"
endm

Loading…
Cancel
Save