diff --git a/SD/BIN/MC b/SD/BIN/MC
index 4d59474..8e52151 100644
Binary files a/SD/BIN/MC and b/SD/BIN/MC differ
diff --git a/utils/Makefile b/utils/Makefile
index 8d7dd69..5ba65bf 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -72,7 +72,6 @@ $(DESTDIR)$(bindir):
build/BACK16M: $(srcdir)/back16m.asm\
$(INCLUDEDIR)/zxuno.def\
$(INCLUDEDIR)/esxdos.def\
- $(INCLUDEDIR)/rst28.mac\
$(INCLUDEDIR)/Print.inc\
$(INCLUDEDIR)/rdflsh.inc\
$(INCLUDEDIR)/rst28.inc\
@@ -82,7 +81,6 @@ build/BACK16M: $(srcdir)/back16m.asm\
build/BACKZX2: $(srcdir)/back32m.asm\
$(INCLUDEDIR)/zxuno.def\
$(INCLUDEDIR)/esxdos.def\
- $(INCLUDEDIR)/rst28.mac\
$(INCLUDEDIR)/Print.inc\
$(INCLUDEDIR)/rdflsh.inc\
$(INCLUDEDIR)/rst28.inc\
@@ -94,7 +92,6 @@ build/BACKZX2: $(srcdir)/back32m.asm\
build/BACKZXD: $(srcdir)/back32m.asm\
$(INCLUDEDIR)/zxuno.def\
$(INCLUDEDIR)/esxdos.def\
- $(INCLUDEDIR)/rst28.mac\
$(INCLUDEDIR)/Print.inc\
$(INCLUDEDIR)/rdflsh.inc\
$(INCLUDEDIR)/rst28.inc\
@@ -106,7 +103,6 @@ build/BACKZXD: $(srcdir)/back32m.asm\
build/BACKUP: $(srcdir)/backup.asm\
$(INCLUDEDIR)/zxuno.def\
$(INCLUDEDIR)/esxdos.def\
- $(INCLUDEDIR)/rst28.mac\
$(INCLUDEDIR)/Print.inc\
$(INCLUDEDIR)/rdflsh.inc\
$(INCLUDEDIR)/rst28.inc\
@@ -115,7 +111,6 @@ build/BACKUP: $(srcdir)/backup.asm\
build/CORCLEAN: $(srcdir)/corclean.asm\
$(INCLUDEDIR)/zxuno.def\
- $(INCLUDEDIR)/rst28.mac\
$(INCLUDEDIR)/Print.inc\
$(INCLUDEDIR)/rdflsh.inc\
$(INCLUDEDIR)/wrflsh.inc\
@@ -126,7 +121,6 @@ build/CORCLEAN: $(srcdir)/corclean.asm\
build/COREBIOS: $(srcdir)/corebios.asm\
$(INCLUDEDIR)/zxuno.def\
$(INCLUDEDIR)/esxdos.def\
- $(INCLUDEDIR)/rst28.mac\
$(INCLUDEDIR)/Print.inc\
$(INCLUDEDIR)/rdflsh.inc\
$(INCLUDEDIR)/wrflsh.inc\
@@ -137,7 +131,6 @@ build/COREBIOS: $(srcdir)/corebios.asm\
build/ROMSBACK: $(srcdir)/romsback.asm\
$(INCLUDEDIR)/zxuno.def\
$(INCLUDEDIR)/esxdos.def\
- $(INCLUDEDIR)/rst28.mac\
$(INCLUDEDIR)/Print.inc\
$(INCLUDEDIR)/rdflsh.inc\
$(INCLUDEDIR)/rst28.inc\
@@ -147,7 +140,6 @@ build/ROMSBACK: $(srcdir)/romsback.asm\
build/ROMSUPGR: $(srcdir)/romsupgr.asm\
$(INCLUDEDIR)/zxuno.def\
$(INCLUDEDIR)/esxdos.def\
- $(INCLUDEDIR)/rst28.mac\
$(INCLUDEDIR)/Print.inc\
$(INCLUDEDIR)/rdflsh.inc\
$(INCLUDEDIR)/wrflsh.inc\
@@ -158,7 +150,6 @@ build/ROMSUPGR: $(srcdir)/romsupgr.asm\
build/UPGR16M: $(srcdir)/upgr16m.asm\
$(INCLUDEDIR)/zxuno.def\
$(INCLUDEDIR)/esxdos.def\
- $(INCLUDEDIR)/rst28.mac\
$(INCLUDEDIR)/Print.inc\
$(INCLUDEDIR)/wrflsh.inc\
$(INCLUDEDIR)/rst28.inc\
@@ -168,7 +159,6 @@ build/UPGR16M: $(srcdir)/upgr16m.asm\
build/UPGRZX2: $(srcdir)/upgr32m.asm\
$(INCLUDEDIR)/zxuno.def\
$(INCLUDEDIR)/esxdos.def\
- $(INCLUDEDIR)/rst28.mac\
$(INCLUDEDIR)/Print.inc\
$(INCLUDEDIR)/wrflsh.inc\
$(INCLUDEDIR)/rst28.inc\
@@ -191,7 +181,6 @@ build/UPGRZXD: $(srcdir)/upgr32m.asm\
build/UPGRADE: $(srcdir)/upgrade.asm\
$(INCLUDEDIR)/zxuno.def\
$(INCLUDEDIR)/esxdos.def\
- $(INCLUDEDIR)/rst28.mac\
$(INCLUDEDIR)/Print.inc\
$(INCLUDEDIR)/wrflsh.inc\
$(INCLUDEDIR)/rst28.inc\
@@ -202,7 +191,6 @@ build/UPGRADE: $(srcdir)/upgrade.asm\
build/MC: $(srcdir)/mc.asm\
$(INCLUDEDIR)/zxuno.def\
$(INCLUDEDIR)/esxdos.def\
- $(INCLUDEDIR)/rst28.mac\
$(INCLUDEDIR)/Print.inc\
$(INCLUDEDIR)/wrflsh.inc\
$(INCLUDEDIR)/rst28.inc\
diff --git a/utils/back32m.asm b/utils/back32m.asm
index 7240c67..6de6b6c 100644
--- a/utils/back32m.asm
+++ b/utils/back32m.asm
@@ -23,15 +23,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 back32m.def
@@ -44,7 +37,6 @@
include zxuno.def
include esxdos.def
- include rst28.mac
define VERSION "0.1.1"
IF zxdos=1
diff --git a/utils/backup.asm b/utils/backup.asm
index f71ca38..2523c6c 100644
--- a/utils/backup.asm
+++ b/utils/backup.asm
@@ -17,21 +17,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-FileContributor: 2021 kounch
-;
-; SPDX-License-Identifier: GPL-3.0-only
-
; Compatible compilers:
-; SJAsmPlus,
+; SjAsmPlus,
; output BACKUP
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 212be94..9890573 100644
--- a/utils/corclean.asm
+++ b/utils/corclean.asm
@@ -22,7 +22,6 @@
; output CORCLEAN
include zxuno.def
- include rst28.mac
define VERSION "0.1"
; define ROMS_FILE "ROMS.ZX1"
diff --git a/utils/mc.asm b/utils/mc.asm
index 2c5de7b..c7e15db 100644
--- a/utils/mc.asm
+++ b/utils/mc.asm
@@ -1,4 +1,4 @@
-; mc.asm - multicore load any .ZX1 core on slot 9.
+; mc.asm - multicore load any .ZX1 core on slot 9 or 45.
; File must exists in current directory. It must be run while using a "root" mode ROM.
;
; Copyright (C) 2022 Antonio Villena
@@ -58,6 +58,11 @@ Nonlock wreg flash_cs, 0 ; activamos spi, enviando un 0
wreg flash_cs, 1 ; desactivamos spi, enviando un 1
sub $18
jr z, Goodflsh
+ ld hl, $2f80
+ ld (Slot+1), hl
+ inc a
+ inc a
+ jr z, Goodflsh
call Print
dz 'Incorrect flash IC'
ret
@@ -96,7 +101,7 @@ 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, 8
ld ixl, $15
- ld de, $2f80
+Slot ld de, $f7c0
exx
Bucle ld a, 'o'
exx
@@ -121,7 +126,7 @@ ReadOK ld a, $40
dec ixl
jr nz, Bucle
ld bc, zxuno_port
- ld hl, $2f80
+ ld hl, (Slot+1)
ld a, core_addr
out (c), a
inc a
diff --git a/utils/upgrade.asm b/utils/upgrade.asm
index 5a5470e..9f90c1f 100644
--- a/utils/upgrade.asm
+++ b/utils/upgrade.asm
@@ -23,7 +23,6 @@
include zxuno.def
include esxdos.def
- include rst28.mac
define VERSION "0.1"
define FLASH_FILE "FLASH.ZX1"