diff --git a/sdk/include/rst28.mac b/sdk/include/rst28.mac
deleted file mode 100644
index 68cd441..0000000
--- a/sdk/include/rst28.mac
+++ /dev/null
@@ -1,18 +0,0 @@
-; rst28.mac - macros definition for `rst28.inc'.
-;
-; SPDX-FileCopyrightText: Copyright (C) 2019, 2021 Antonio Villena
-;
-; SPDX-License-Identifier: GPL-3.0-only
-
-; Compatible compilers:
-; SJAsmPlus,
-
- ifndef rst28_mac_included
- define rst28_mac_included
-
- macro wreg dir, dato
- call rst28
- defb dir, dato
- endm
-
- endif ; !rst28_mac_included
diff --git a/sdk/include/zxuno.def b/sdk/include/zxuno.def
index 71fe832..f80c6fb 100644
--- a/sdk/include/zxuno.def
+++ b/sdk/include/zxuno.def
@@ -70,3 +70,13 @@ RADASCTRL: equ radas_ctrl
define specdrum_port $ffdf ; Specdrum I/O port in 16-bit format for DMA destination
endif ; !zxuno_def_included
+
+ ifndef rst28_mac_included
+ define rst28_mac_included
+
+ macro wreg dir, dato
+ call rst28
+ defb dir, dato
+ endm
+
+ endif ; !rst28_mac_included
diff --git a/utils/MC b/utils/MC
index a57ec2c..4d59474 100644
Binary files a/utils/MC and b/utils/MC differ
diff --git a/utils/back16m.asm b/utils/back16m.asm
index 44c1b5a..6bd7cab 100644
--- a/utils/back16m.asm
+++ b/utils/back16m.asm
@@ -22,21 +22,13 @@
; You should have received a copy of the GNU General Public License
; along with this program. If not, see .
;
-; SPDX-FileCopyrightText: Copyright (C) 2019, 2021 Antonio Villena
-;
-; SPDX-FileContributor: 2021 kounch
-; SPDX-FileContributor: 2021 Ivan Tatarinov
-;
-; SPDX-License-Identifier: GPL-3.0-only
-
; Compatible compilers:
-; SJAsmPlus,
+; SjAsmPlus,
; output BACK16M
include zxuno.def
include esxdos.def
- include rst28.mac
define VERSION "0.1"
define FLASH_FILE "FLASH.ZX1"
diff --git a/utils/corclean.asm b/utils/corclean.asm
index 4b907ca..212be94 100644
--- a/utils/corclean.asm
+++ b/utils/corclean.asm
@@ -16,14 +16,8 @@
; You should have received a copy of the GNU General Public License
; along with this program. If not, see .
;
-; SPDX-FileCopyrightText: Copyright (C) 2019, 2021 Antonio Villena
-;
-; SPDX-FileContributor: 2021 Ivan Tatarinov
-;
-; SPDX-License-Identifier: GPL-3.0-only
-
; Compatible compilers:
-; SJAsmPlus,
+; SjAsmPlus,
; output CORCLEAN
diff --git a/utils/corebios.asm b/utils/corebios.asm
index c2dca69..fdb3847 100644
--- a/utils/corebios.asm
+++ b/utils/corebios.asm
@@ -16,20 +16,13 @@
; You should have received a copy of the GNU General Public License
; along with this program. If not, see .
;
-; SPDX-FileCopyrightText: Copyright (C) 2019, 2021 Antonio Villena
-;
-; SPDX-FileContributor: 2021 Ivan Tatarinov
-;
-; SPDX-License-Identifier: GPL-3.0-only
-
; Compatible compilers:
-; SJAsmPlus,
+; SjAsmPlus,
; output COREBIOS
include zxuno.def
include esxdos.def
- include rst28.mac
define VERSION "0.1"
define CORE_FILE "SPECTRUM.ZX1"
diff --git a/utils/mc.asm b/utils/mc.asm
index 0f50ecc..2c5de7b 100644
--- a/utils/mc.asm
+++ b/utils/mc.asm
@@ -18,20 +18,17 @@
; Compatible compilers:
; SjAsmPlus,
- output MC
+; output MC
include zxuno.def
include esxdos.def
- include rst28.mac
-
- define VERSION "0.1"
org $2000 ; comienzo de la ejecución de los comandos ESXDOS
Main ld a, h
or l
jr nz, NoPrint ; si no se ha especificado nombre de fichero, imprimir uso
- call Print;567890123456789012345678901
+ call Print
dz '.mc corefile.zx1', 13, 13, 'Loads and executes a core'
ret
NoPrint ld de, FileName
@@ -59,7 +56,7 @@ Nonlock wreg flash_cs, 0 ; activamos spi, enviando un 0
in a, (c)
in a, (c)
wreg flash_cs, 1 ; desactivamos spi, enviando un 1
- sub $19
+ sub $18
jr z, Goodflsh
call Print
dz 'Incorrect flash IC'
@@ -80,21 +77,7 @@ Goodflsh ld a, scandbl_ctrl
inc b
normal ld a, 0
out (c), a
- ld bc, zxuno_port
- out (c), a
- ld bc, zxuno_port
- ld a, core_addr
- ld hl, $2f80
- ld de, core_boot
- out (c), a
- inc b
- out (c), h
- out (c), l
- out (c), d
- dec b
- out (c), e
- inc b
- out (c), a
+ ret
init xor a
esxdos M_GETSETDRV ; A = unidad actual
jr nc, SDCard
@@ -111,7 +94,7 @@ SDCard ld b, FA_READ ; B = modo de apertura
ret
FileFound call Print
db 'Writing SPI flash', 13
- dz '[', 6, ' ]', 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8
+ dz '[', 6, ' ]', 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8
ld ixl, $15
ld de, $2f80
exx
@@ -137,11 +120,19 @@ ReadOK ld a, $40
exx
dec ixl
jr nz, Bucle
- ld a, (handle+1)
- esxdos F_CLOSE
- call Print
- dz 13, 'Launching core'
- ret
+ ld bc, zxuno_port
+ ld hl, $2f80
+ ld a, core_addr
+ out (c), a
+ inc a
+ inc b
+ out (c), h
+ out (c), l
+ out (c), 0
+ dec b
+ out (c), a
+ inc b
+ out (c), a
include Print.inc
include wrflsh.inc
include rst28.inc
diff --git a/utils/romsback.asm b/utils/romsback.asm
index f52eb23..5a75236 100644
--- a/utils/romsback.asm
+++ b/utils/romsback.asm
@@ -24,19 +24,13 @@
;
; SPDX-FileCopyrightText: Copyright (C) 2019, 2021 Antonio Villena
;
-; SPDX-FileContributor: 2021 Ivan Tatarinov
-; SPDX-FileContributor: 2021 kounch
-;
-; SPDX-License-Identifier: GPL-3.0-only
-
; Compatible compilers:
-; SJAsmPlus,
+; SjAsmPlus,
; output ROMSBACK
include zxuno.def
include esxdos.def
- include rst28.mac
define VERSION "0.1"
define ROMS_FILE "ROMS.ZX1"
diff --git a/utils/romsupgr.asm b/utils/romsupgr.asm
index 0e3d3ee..57263c4 100644
--- a/utils/romsupgr.asm
+++ b/utils/romsupgr.asm
@@ -20,20 +20,13 @@
; You should have received a copy of the GNU General Public License
; along with this program. If not, see .
;
-; SPDX-FileCopyrightText: Copyright (C) 2019, 2021 Antonio Villena
-;
-; SPDX-FileContributor: 2021 Ivan Tatarinov
-;
-; SPDX-License-Identifier: GPL-3.0-only
-
; Compatible compilers:
-; SJAsmPlus,
+; SjAsmPlus,
; output ROMSUPGR
include zxuno.def
include esxdos.def
- include rst28.mac
define VERSION "0.1"
define ROMS_FILE "ROMS.ZX1"
diff --git a/utils/upgr16m.asm b/utils/upgr16m.asm
index 212f65b..985b4c3 100644
--- a/utils/upgr16m.asm
+++ b/utils/upgr16m.asm
@@ -19,20 +19,13 @@
; You should have received a copy of the GNU General Public License
; along with this program. If not, see .
;
-; SPDX-FileCopyrightText: Copyright (C) 2019, 2021 Antonio Villena
-;
-; SPDX-FileContributor: 2021 Ivan Tatarinov
-;
-; SPDX-License-Identifier: GPL-3.0-only
-
; Compatible compilers:
-; SJAsmPlus,
+; SjAsmPlus,
; output UPGR16M
include zxuno.def
include esxdos.def
- include rst28.mac
define VERSION "0.1"
define FLASH_FILE "FLASH.ZX1"
diff --git a/utils/upgr32m.asm b/utils/upgr32m.asm
index 363da9f..0d03600 100644
--- a/utils/upgr32m.asm
+++ b/utils/upgr32m.asm
@@ -20,15 +20,8 @@
; You should have received a copy of the GNU General Public License
; along with this program. If not, see .
;
-; SPDX-FileCopyrightText: Copyright (C) 2019, 2021 Antonio Villena
-;
-; SPDX-FileContributor: 2021 Ivan Tatarinov
-; SPDX-FileContributor: 2021 kounch
-;
-; SPDX-License-Identifier: GPL-3.0-only
-
; Compatible compilers:
-; SJAsmPlus,
+; SjAsmPlus,
; definition of "zxdos" flag
include upgr32m.def
@@ -41,7 +34,6 @@
include zxuno.def
include esxdos.def
- include rst28.mac
define VERSION "0.1.1"
IF zxdos=1
diff --git a/utils/upgrade.asm b/utils/upgrade.asm
index d784f4a..5a5470e 100644
--- a/utils/upgrade.asm
+++ b/utils/upgrade.asm
@@ -16,14 +16,8 @@
; You should have received a copy of the GNU General Public License
; along with this program. If not, see .
;
-; SPDX-FileCopyrightText: Copyright (C) 2019, 2021 Antonio Villena
-;
-; SPDX-FileContributor: 2021 Ivan Tatarinov
-;
-; SPDX-License-Identifier: GPL-3.0-only
-
; Compatible compilers:
-; SJAsmPlus,
+; SjAsmPlus,
; output UPGRADE