From 3013d04671d0390ebdd9891e27e495b01837f546 Mon Sep 17 00:00:00 2001 From: Ivan Tatarinov Date: Sat, 24 Apr 2021 19:50:36 +0300 Subject: [PATCH] utils: divided `zxuno.inc` into `esxdos.def` and `zxuno.def` --- utils/Makefile | 35 ++++++++++++++++++++++------------ utils/back16m.asm | 3 ++- utils/back32m.asm | 5 +++-- utils/backup.asm | 3 ++- utils/corclean.asm | 2 +- utils/corebios.asm | 3 ++- utils/esxdos.def | 23 ++++++++++++++++++++++ utils/romsback.asm | 3 ++- utils/romsupgr.asm | 3 ++- utils/upgr16m.asm | 3 ++- utils/upgr32m.asm | 3 ++- utils/upgrade.asm | 3 ++- utils/{zxuno.inc => zxuno.def} | 17 +---------------- 13 files changed, 67 insertions(+), 39 deletions(-) create mode 100644 utils/esxdos.def rename utils/{zxuno.inc => zxuno.def} (75%) diff --git a/utils/Makefile b/utils/Makefile index c26cc5e..0c2a7f2 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -38,70 +38,81 @@ $(BUILD_DIR): mkdir -p $@ $(BUILD_DIR)/BACK16M: back16m.asm\ - zxuno.inc\ + zxuno.def\ + esxdos.def\ | $(BUILD_DIR) $(AS) $(AFLAGS) --raw=$@ $< $(BUILD_DIR)/BACKZX2: back32m.asm\ - zxuno.inc\ + zxuno.def\ + esxdos.def\ | $(BUILD_DIR) echo ' define zxdos 1' >back32m.def $(AS) $(AFLAGS) --raw=$@ $< rm -f back32m.def $(BUILD_DIR)/BACKZXD: back32m.asm\ - zxuno.inc\ + zxuno.def\ + esxdos.def\ | $(BUILD_DIR) echo ' define zxdos 0' >back32m.def $(AS) $(AFLAGS) --raw=$@ $< rm -f back32m.def $(BUILD_DIR)/BACKUP: backup.asm\ - zxuno.inc\ + zxuno.def\ + esxdos.def\ | $(BUILD_DIR) $(AS) $(AFLAGS) --raw=$@ $< $(BUILD_DIR)/CORCLEAN: corclean.asm\ - zxuno.inc\ + zxuno.def\ | $(BUILD_DIR) $(AS) $(AFLAGS) --raw=$@ $< $(BUILD_DIR)/COREBIOS: corebios.asm\ - zxuno.inc\ + zxuno.def\ + esxdos.def\ | $(BUILD_DIR) $(AS) $(AFLAGS) --raw=$@ $< $(BUILD_DIR)/ROMSBACK: romsback.asm\ - zxuno.inc\ + zxuno.def\ + esxdos.def\ | $(BUILD_DIR) $(AS) $(AFLAGS) --raw=$@ $< $(BUILD_DIR)/ROMSUPGR: romsupgr.asm\ - zxuno.inc\ + zxuno.def\ + esxdos.def\ | $(BUILD_DIR) $(AS) $(AFLAGS) --raw=$@ $< $(BUILD_DIR)/UPGR16M: upgr16m.asm\ - zxuno.inc\ + zxuno.def\ + esxdos.def\ | $(BUILD_DIR) $(AS) $(AFLAGS) --raw=$@ $< $(BUILD_DIR)/UPGRZX2: upgr32m.asm\ - zxuno.inc\ + zxuno.def\ + esxdos.def\ | $(BUILD_DIR) echo ' define zxdos 1' >upgr32m.def $(AS) $(AFLAGS) --raw=$@ $< rm -f upgr32m.def $(BUILD_DIR)/UPGRZXD: upgr32m.asm\ - zxuno.inc\ + zxuno.def\ + esxdos.def\ | $(BUILD_DIR) echo ' define zxdos 0' >upgr32m.def $(AS) $(AFLAGS) --raw=$@ $< rm -f upgr32m.def $(BUILD_DIR)/UPGRADE: upgrade.asm\ - zxuno.inc\ + zxuno.def\ + esxdos.def\ | $(BUILD_DIR) $(AS) $(AFLAGS) --raw=$@ $< diff --git a/utils/back16m.asm b/utils/back16m.asm index c46d70f..7da0237 100644 --- a/utils/back16m.asm +++ b/utils/back16m.asm @@ -28,7 +28,8 @@ output BACK16M - include zxuno.inc + include zxuno.def + include esxdos.def org $2000 ; comienzo de la ejecución de los comandos ESXDOS diff --git a/utils/back32m.asm b/utils/back32m.asm index a726817..fe72f2a 100644 --- a/utils/back32m.asm +++ b/utils/back32m.asm @@ -31,7 +31,7 @@ ; SJAsmPlus, ; definition of "zxdos" flag - include back32m.def + include back32m.def IF zxdos=1 output BACKZX2 @@ -39,7 +39,8 @@ output BACKZXD ENDIF - include zxuno.inc + include zxuno.def + include esxdos.def org $2000 ; comienzo de la ejecución de los comandos ESXDOS diff --git a/utils/backup.asm b/utils/backup.asm index 5daf9ff..2640efa 100644 --- a/utils/backup.asm +++ b/utils/backup.asm @@ -23,7 +23,8 @@ output BACKUP - include zxuno.inc + include zxuno.def + include esxdos.def org $2000 ; comienzo de la ejecución de los comandos ESXDOS diff --git a/utils/corclean.asm b/utils/corclean.asm index f15fbff..f7e7356 100644 --- a/utils/corclean.asm +++ b/utils/corclean.asm @@ -23,7 +23,7 @@ output CORCLEAN - include zxuno.inc + include zxuno.def org $2000 ; comienzo de la ejecución de los comandos ESXDOS diff --git a/utils/corebios.asm b/utils/corebios.asm index dac91f1..a183acd 100644 --- a/utils/corebios.asm +++ b/utils/corebios.asm @@ -23,7 +23,8 @@ output COREBIOS - include zxuno.inc + include zxuno.def + include esxdos.def org $2000 ; comienzo de la ejecución de los comandos ESXDOS diff --git a/utils/esxdos.def b/utils/esxdos.def new file mode 100644 index 0000000..1621eda --- /dev/null +++ b/utils/esxdos.def @@ -0,0 +1,23 @@ +; esxdos.def +; +; SPDX-FileCopyrightText: Copyright (C) 2019, 2021 Antonio Villena +; +; SPDX-License-Identifier: GPL-3.0-only + +; Compatible compilers: +; SJAsmPlus, + + define FA_READ 0x01 + define FA_WRITE 0x02 + define FA_OPEN_AL 0x08 + define M_GETSETDRV 0x89 + define F_OPEN 0x9a + define F_CLOSE 0x9b + define F_READ 0x9d + define F_WRITE 0x9e + define F_FSTAT 0xa1 + + macro esxdos dato + rst $08 + defb dato + endm diff --git a/utils/romsback.asm b/utils/romsback.asm index f41ac04..3cafe05 100644 --- a/utils/romsback.asm +++ b/utils/romsback.asm @@ -28,7 +28,8 @@ output ROMSBACK - include zxuno.inc + include zxuno.def + include esxdos.def org $2000 ; comienzo de la ejecución de los comandos ESXDOS diff --git a/utils/romsupgr.asm b/utils/romsupgr.asm index fae3b8f..3db1336 100644 --- a/utils/romsupgr.asm +++ b/utils/romsupgr.asm @@ -27,7 +27,8 @@ output ROMSUPGR - include zxuno.inc + include zxuno.def + include esxdos.def org $2000 ; comienzo de la ejecución de los comandos ESXDOS diff --git a/utils/upgr16m.asm b/utils/upgr16m.asm index 3cacb19..ae6db31 100644 --- a/utils/upgr16m.asm +++ b/utils/upgr16m.asm @@ -26,7 +26,8 @@ output UPGR16M - include zxuno.inc + include zxuno.def + include esxdos.def org $2000 ; comienzo de la ejecución de los comandos ESXDOS diff --git a/utils/upgr32m.asm b/utils/upgr32m.asm index 5ab56fc..63462ce 100644 --- a/utils/upgr32m.asm +++ b/utils/upgr32m.asm @@ -36,7 +36,8 @@ output UPGRZXD ENDIF - include zxuno.inc + include zxuno.def + include esxdos.def org $2000 ; comienzo de la ejecución de los comandos ESXDOS diff --git a/utils/upgrade.asm b/utils/upgrade.asm index fb0e27d..7331817 100644 --- a/utils/upgrade.asm +++ b/utils/upgrade.asm @@ -23,7 +23,8 @@ output UPGRADE - include zxuno.inc + include zxuno.def + include esxdos.def org $2000 ; comienzo de la ejecución de los comandos ESXDOS diff --git a/utils/zxuno.inc b/utils/zxuno.def similarity index 75% rename from utils/zxuno.inc rename to utils/zxuno.def index da08002..9f0b12a 100644 --- a/utils/zxuno.inc +++ b/utils/zxuno.def @@ -1,4 +1,4 @@ -; zxuno.inc +; zxuno.def ; ; SPDX-FileCopyrightText: Copyright (C) 2019, 2021 Antonio Villena ; @@ -40,22 +40,7 @@ define CMD55 $77 define CMD58 $7a - define FA_READ 0x01 - define FA_WRITE 0x02 - define FA_OPEN_AL 0x08 - define M_GETSETDRV 0x89 - define F_OPEN 0x9a - define F_CLOSE 0x9b - define F_READ 0x9d - define F_WRITE 0x9e - define F_FSTAT 0xa1 - macro wreg dir, dato call rst28 defb dir, dato endm - - macro esxdos dato - rst $08 - defb dato - endm