Skip to content

Commit

Permalink
Fix Fuzix Boot
Browse files Browse the repository at this point in the history
- Minor issue in recent updates to Boot Loader broke Fuzix loading.  This is corrected.
  • Loading branch information
wwarthen committed Oct 14, 2024
1 parent 48689b8 commit f3e0de4
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 11 deletions.
14 changes: 7 additions & 7 deletions Source/Apps/reboot/reboot.asm
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
;
;===============================================================================
;
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -271,7 +271,7 @@ upcase:
;===============================================================================
;
str_banner .db "RomWBW Reboot Utility, Version 1.0, 12-Oct-2024\r\n"
.db " Wayne Warthen ([email protected]) & MartinR",0
.db " Wayne Warthen ([email protected]) & MartinR",0
;
str_warmboot .db "\r\n\r\nWarm booting...\r\n",0
str_coldboot .db "\r\n\r\nCold booting...\r\n",0
Expand Down
3 changes: 2 additions & 1 deletion Source/HBIOS/hbios.asm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Source/HBIOS/romldr.asm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Source/ver.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Source/ver.lib
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit f3e0de4

Please sign in to comment.