Browse Source

Clean up

Make version include files common.
pull/109/head
Wayne Warthen 6 years ago
parent
commit
2c2df76f15
  1. 2
      Source/CBIOS/cbios.asm
  2. 2
      Source/CPM22/loader.asm
  3. 5
      Source/CPM22/ver.inc
  4. 3
      Source/CPM3/Build.cmd
  5. 2
      Source/CPM3/Makefile
  6. 2
      Source/CPM3/boot.z80
  7. 2
      Source/CPM3/loader.asm
  8. 7
      Source/CPM3/ver.inc
  9. 2
      Source/HBIOS/std.asm
  10. 5
      Source/HBIOS/ver.inc
  11. 2
      Source/ZPM3/loader.asm
  12. 2
      Source/ZSDOS/loader.asm
  13. 5
      Source/ZSDOS/ver.inc
  14. 0
      Source/ver.inc

2
Source/CBIOS/cbios.asm

@ -50,7 +50,7 @@ DEF_IOBYTE .EQU %10010100 ; DEFAULT IOBYTE VALUE
DEV_BAT .EQU $FE ; BAT: DEV_BAT .EQU $FE ; BAT:
DEV_NUL .EQU $FF ; NUL: DEV_NUL .EQU $FF ; NUL:
; ;
#INCLUDE "../HBIOS/ver.inc"
#INCLUDE "../ver.inc"
; ;
#INCLUDE "config.asm" #INCLUDE "config.asm"
; ;

2
Source/CPM22/loader.asm

@ -25,7 +25,7 @@
; ;
;=============================================================================== ;===============================================================================
; ;
#INCLUDE "ver.inc"
#INCLUDE "../ver.inc"
; ;
SYS_ENT .EQU $E600 ; SYSTEM (OS) ENTRY POINT ADDRESS SYS_ENT .EQU $E600 ; SYSTEM (OS) ENTRY POINT ADDRESS
SYS_LOC .EQU $D000 ; STARTING ADDRESS TO LOAD SYSTEM IMAGE SYS_LOC .EQU $D000 ; STARTING ADDRESS TO LOAD SYSTEM IMAGE

5
Source/CPM22/ver.inc

@ -1,5 +0,0 @@
#DEFINE RMJ 2
#DEFINE RMN 9
#DEFINE RUP 2
#DEFINE RTP 0
#DEFINE BIOSVER "2.9.2-pre.34"

3
Source/CPM3/Build.cmd

@ -9,7 +9,8 @@ set TASMTABS=%TOOLS%\tasm32
set ZXBINDIR=%TOOLS%/cpm/bin/ set ZXBINDIR=%TOOLS%/cpm/bin/
set ZXLIBDIR=%TOOLS%/cpm/lib/ set ZXLIBDIR=%TOOLS%/cpm/lib/
set ZXINCDIR=%TOOLS%/cpm/include/
rem set ZXINCDIR=%TOOLS%/cpm/include/
set ZXINCDIR=../
echo. echo.
echo. echo.

2
Source/CPM3/Makefile

@ -11,6 +11,8 @@ OTHERS += biosldrc.rel biosldrd.rel
TOOLS = ../../Tools TOOLS = ../../Tools
include $(TOOLS)/Makefile.inc include $(TOOLS)/Makefile.inc
export ZXINCDIR := ../
BIOSOBJS = bioskrnl.rel scb.rel boot.rel chario.rel BIOSOBJS = bioskrnl.rel scb.rel boot.rel chario.rel
BIOSOBJS += move.rel drvtbl.rel diskio.rel util.rel BIOSOBJS += move.rel drvtbl.rel diskio.rel util.rel
COMMA := , COMMA := ,

2
Source/CPM3/boot.z80

@ -16,7 +16,7 @@
extrn addhla, bcd2bin, bin2bcd extrn addhla, bcd2bin, bin2bcd
;extrn cout, phex8 ;extrn cout, phex8
include ver.inc
include c:ver.lib
bdos equ 5 bdos equ 5

2
Source/CPM3/loader.asm

@ -25,7 +25,7 @@
; ;
;=============================================================================== ;===============================================================================
; ;
#INCLUDE "../HBIOS/ver.inc"
#INCLUDE "../ver.inc"
; ;
SYS_ENT .EQU $0100 ; SYSTEM (OS) ENTRY POINT ADDRESS SYS_ENT .EQU $0100 ; SYSTEM (OS) ENTRY POINT ADDRESS
SYS_LOC .EQU $0100 ; STARTING ADDRESS TO LOAD SYSTEM IMAGE SYS_LOC .EQU $0100 ; STARTING ADDRESS TO LOAD SYSTEM IMAGE

7
Source/CPM3/ver.inc

@ -1,7 +0,0 @@
rmj equ 2
rmn equ 9
rup equ 2
rtp equ 0
biosver macro
db "2.9.2-pre.34"
endm

2
Source/HBIOS/std.asm

@ -18,7 +18,7 @@
; ;
; INCLUDE VERSION ; INCLUDE VERSION
; ;
#INCLUDE "ver.inc" ; ADD BIOSVER
#INCLUDE "../ver.inc" ; ADD BIOSVER
; ;
FALSE .EQU 0 FALSE .EQU 0
TRUE .EQU ~FALSE TRUE .EQU ~FALSE

5
Source/HBIOS/ver.inc

@ -1,5 +0,0 @@
#DEFINE RMJ 2
#DEFINE RMN 9
#DEFINE RUP 2
#DEFINE RTP 0
#DEFINE BIOSVER "2.9.2-pre.34"

2
Source/ZPM3/loader.asm

@ -25,7 +25,7 @@
; ;
;=============================================================================== ;===============================================================================
; ;
#INCLUDE "../HBIOS/ver.inc"
#INCLUDE "../ver.inc"
; ;
SYS_ENT .EQU $0100 ; SYSTEM (OS) ENTRY POINT ADDRESS SYS_ENT .EQU $0100 ; SYSTEM (OS) ENTRY POINT ADDRESS
SYS_LOC .EQU $0100 ; STARTING ADDRESS TO LOAD SYSTEM IMAGE SYS_LOC .EQU $0100 ; STARTING ADDRESS TO LOAD SYSTEM IMAGE

2
Source/ZSDOS/loader.asm

@ -25,7 +25,7 @@
; ;
;=============================================================================== ;===============================================================================
; ;
#INCLUDE "ver.inc"
#INCLUDE "../ver.inc"
; ;
SYS_ENT .EQU $E600 ; SYSTEM (OS) ENTRY POINT ADDRESS SYS_ENT .EQU $E600 ; SYSTEM (OS) ENTRY POINT ADDRESS
SYS_LOC .EQU $D000 ; STARTING ADDRESS TO LOAD SYSTEM IMAGE SYS_LOC .EQU $D000 ; STARTING ADDRESS TO LOAD SYSTEM IMAGE

5
Source/ZSDOS/ver.inc

@ -1,5 +0,0 @@
#DEFINE RMJ 2
#DEFINE RMN 9
#DEFINE RUP 2
#DEFINE RTP 0
#DEFINE BIOSVER "2.9.2-pre.34"

0
Source/CBIOS/ver.inc → Source/ver.inc

Loading…
Cancel
Save