Ver. 1.1.6

2020-04-24 Ver. 1.1.6 -------------------------------------------------------------------------------- - Detección completa e indicación de la ubicación correcta en la pantalla de información del sistema de toda la memoria RAM, (por el momento, sin el uso de mappers), instalada en el ordenador. La detección tiene una precisión de segmentos de 4kb. - Se corrige el bug que causaba que si se cargaba el programa desde una unidad de disco, esta siguiera encendida incluso después de iniciar el programa. Este parche se ha aplicado a la librería base MSX N'gine.
knightfox75 · Apr 24, 2020 · b80f70d · b80f70d
1 parent 6906cc3
commit b80f70d
Show file tree

Hide file tree

Showing 43 changed files with 224 additions and 85 deletions.
diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -2,6 +2,17 @@
 MSX Diagnostics Changelog
 --------------------------------------------------------------------------------
 
+2020-04-24 Ver. 1.1.6
+-------------------------------------------------------------------------------- 
+- Detecci�n completa e indicaci�n de la ubicaci�n correcta en la pantalla
+  de informaci�n del sistema de toda la memoria RAM, (por el momento, sin el
+  uso de mappers), instalada en el ordenador. La detecci�n tiene una precisi�n
+  de segmentos de 4kb.
+- Se corrige el bug que causaba que si se cargaba el programa desde una unidad
+  de disco, esta siguiera encendida incluso despu�s de iniciar el programa.
+  Este parche se ha aplicado a la librer�a base MSX N'gine.
+
+
 2020-04-19 Ver. 1.1.5
 -------------------------------------------------------------------------------- 
 - Se ahorran 64 bytes de RAM usando el NGN_RAM_BUFFER en vez del array

diff --git a/source/data/bin/misc.asm b/source/data/bin/misc.asm
@@ -1,7 +1,7 @@
 ;***********************************************************
 ;
 ;	MSX DIAGNOSTICS
-;	Version 1.1.5
+;	Version 1.1.6
 ;	ASM Z80 MSX
 ;	Datos miscelaneos
 ;	(cc) 2018-2020 Cesar Rincon "NightFox"

diff --git a/source/data/txt/key_names.asm b/source/data/txt/key_names.asm
@@ -1,7 +1,7 @@
 ;***********************************************************
 ;
 ;	MSX DIAGNOSTICS
-;	Version 1.1.5
+;	Version 1.1.6
 ;	ASM Z80 MSX
 ;	Nombres de las teclas
 ;	(cc) 2018-2020 Cesar Rincon "NightFox"

diff --git a/source/data/txt/text.asm b/source/data/txt/text.asm
@@ -1,7 +1,7 @@
 ;***********************************************************
 ;
 ;	MSX DIAGNOSTICS
-;	Version 1.1.5
+;	Version 1.1.6
 ;	ASM Z80 MSX
 ;	Textos del programa
 ;	(cc) 2018-2020 Cesar Rincon "NightFox"
@@ -30,7 +30,7 @@ TEXT_DASHED_LINE:
 ; Texto de cabecera de los menus
 TEXT_MENU_HEADER:
 
-	db	" MSX DIAGNOSTICS v1.1.4", $0D, $0A, $00
+	db	" MSX DIAGNOSTICS v1.1.6", $0D, $0A, $00
 
 
 

diff --git a/source/formats/f_binary.asm b/source/formats/f_binary.asm
@@ -1,7 +1,7 @@
 ;***********************************************************
 ;
 ;   MSX DIAGNOSTICS
-;   Version 1.1.5
+;   Version 1.1.6
 ;	ASM Z80 MSX
 ;	Directivas de compilacion para BINARIO de 32kb
 ;
@@ -31,7 +31,7 @@ OUTPUT_FORMAT = 1							; Define el formato de salida
 ; Almacena las variables los ultimos 4KB
 .ORG $E380
 .INCLUDE "ngn/ngn_vars.asm"         ; 2285 bytes
-.INCLUDE "prog/vars.asm"            ; 110 bytes
+.INCLUDE "prog/vars.asm"            ; 26 bytes
 
 
 ; ----------------------------------------------------------

diff --git a/source/formats/f_cas.asm b/source/formats/f_cas.asm
@@ -1,7 +1,7 @@
 ;***********************************************************
 ;
 ;   MSX DIAGNOSTICS
-;   Version 1.1.5
+;   Version 1.1.6
 ;	ASM Z80 MSX
 ;	Directivas de compilacion para BINARIO de 32kb
 ;	Genera un archivo .CAS y .WAV
@@ -31,7 +31,7 @@ OUTPUT_FORMAT = 4		; Define el formato de salida
 ; Almacena las variables los ultimos 4KB
 .ORG $E380
 .INCLUDE "ngn/ngn_vars.asm"         ; 2285 bytes
-.INCLUDE "prog/vars.asm"            ; 110 bytes
+.INCLUDE "prog/vars.asm"            ; 26 bytes
 
 
 ; ----------------------------------------------------------

diff --git a/source/formats/f_com.asm b/source/formats/f_com.asm
@@ -1,7 +1,7 @@
 ;***********************************************************
 ;
 ;   MSX DIAGNOSTICS
-;   Version 1.1.5
+;   Version 1.1.6
 ;	ASM Z80 MSX
 ;	Directivas de compilacion para .COM de MSX-DOS
 ;
@@ -31,7 +31,7 @@ OUTPUT_FORMAT = 3							; Define el formato de salida
 ; Almacena las variables los ultimos 4KB
 .ORG $E380
 .INCLUDE "ngn/ngn_vars.asm"         ; 2285 bytes
-.INCLUDE "prog/vars.asm"            ; 110 bytes
+.INCLUDE "prog/vars.asm"            ; 26 bytes
 
 
 ; ----------------------------------------------------------

diff --git a/source/formats/f_rom.asm b/source/formats/f_rom.asm
@@ -1,7 +1,7 @@
 ;***********************************************************
 ;
 ;   MSX DIAGNOSTICS
-;   Version 1.1.5
+;   Version 1.1.6
 ;	ASM Z80 MSX
 ;	Directivas de compilacion para ROM de 32kb
 ;
@@ -31,7 +31,7 @@ OUTPUT_FORMAT = 2									; Define el formato de salida
 ; Almacena las variables los ultimos 4KB
 .ORG $E380
 .INCLUDE "ngn/ngn_vars.asm"         ; 2285 bytes
-.INCLUDE "prog/vars.asm"            ; 110 bytes
+.INCLUDE "prog/vars.asm"            ; 26 bytes
 
 
 ; ----------------------------------------------------------

diff --git a/source/msxdiag.asm b/source/msxdiag.asm
@@ -1,7 +1,7 @@
 ;***********************************************************
 ;
 ;   MSX DIAGNOSTICS
-;   Version 1.1.5
+;   Version 1.1.6
 ;	ASM Z80 MSX
 ;
 ;	(cc) 2018-2020 Cesar Rincon "NightFox"
@@ -37,7 +37,7 @@ OUTPUT_FORMAT_COM = 3					; Formato de salida COM para MSX-DOS
 OUTPUT_FORMAT_CAS = 4					; Formato de salida binario de BASIC (Salida en formato .CAS y .WAV)
 
 ;.INCLUDE "formats/f_binary.asm"		; Binario de BASIC
-INCLUDE "formats/f_rom.asm"			; Cartucho ROM
+.INCLUDE "formats/f_rom.asm"			; Cartucho ROM
 ;.INCLUDE "formats/f_com.asm"			; Binario en formato .COM para MSX-DOS
 ;.INCLUDE "formats/f_cas.asm"			; Imagen .CAS y archivo de audio .WAV
 

diff --git a/source/ngn/ngn.asm b/source/ngn/ngn.asm
@@ -1,7 +1,7 @@
 ;***********************************************************
 ;
 ;	N'gine para MSX Asm Z80
-;	Version 0.3.1
+;	Version 0.3.2
 ;
 ;	(cc) 2018-2020 Cesar Rincon "NightFox"
 ;	https://nightfoxandco.com

diff --git a/source/ngn/ngn_background.asm b/source/ngn/ngn_background.asm
@@ -1,7 +1,7 @@
 ;***********************************************************
 ;
 ;	N'gine para MSX Asm Z80
-;	Version 0.3.1
+;	Version 0.3.2
 ;
 ;	(cc) 2018-2020 Cesar Rincon "NightFox"
 ;	https://nightfoxandco.com

diff --git a/source/ngn/ngn_consts.asm b/source/ngn/ngn_consts.asm
@@ -1,7 +1,7 @@
 ;***********************************************************
 ;
 ;	N'gine para MSX Asm Z80
-;	Version 0.3.1
+;	Version 0.3.2
 ;
 ;	(cc) 2018-2020 Cesar Rincon "NightFox"
 ;	https://nightfoxandco.com

diff --git a/source/ngn/ngn_keyboard.asm b/source/ngn/ngn_keyboard.asm
@@ -1,7 +1,7 @@
 ;***********************************************************
 ;
 ;	N'gine para MSX Asm Z80
-;	Version 0.3.1
+;	Version 0.3.2
 ;
 ;	(cc) 2018-2020 Cesar Rincon "NightFox"
 ;	https://nightfoxandco.com

diff --git a/source/ngn/ngn_math.asm b/source/ngn/ngn_math.asm
@@ -1,7 +1,7 @@
 ;***********************************************************
 ;
 ;	N'gine para MSX Asm Z80
-;	Version 0.3.1
+;	Version 0.3.2
 ;
 ;	(cc) 2018-2020 Cesar Rincon "NightFox"
 ;	https://nightfoxandco.com

diff --git a/source/ngn/ngn_psg.asm b/source/ngn/ngn_psg.asm
@@ -1,7 +1,7 @@
 ;***********************************************************
 ;
 ;	N'gine para MSX Asm Z80
-;	Version 0.3.1
+;	Version 0.3.2
 ;
 ;	(cc) 2018-2020 Cesar Rincon "NightFox"
 ;	https://nightfoxandco.com

diff --git a/source/ngn/ngn_rle.asm b/source/ngn/ngn_rle.asm
@@ -1,7 +1,7 @@
 ;***********************************************************
 ;
 ;	N'gine para MSX Asm Z80
-;	Version 0.3.1
+;	Version 0.3.2
 ;
 ;	(cc) 2018-2020 Cesar Rincon "NightFox"
 ;	https://nightfoxandco.com

diff --git a/source/ngn/ngn_screen.asm b/source/ngn/ngn_screen.asm
@@ -1,7 +1,7 @@
 ;***********************************************************
 ;
 ;	N'gine para MSX Asm Z80
-;	Version 0.3.1
+;	Version 0.3.2
 ;
 ;	(cc) 2018-2020 Cesar Rincon "NightFox"
 ;	https://nightfoxandco.com

diff --git a/source/ngn/ngn_sprite.asm b/source/ngn/ngn_sprite.asm
@@ -1,7 +1,7 @@
 ;***********************************************************
 ;
 ;	N'gine para MSX Asm Z80
-;	Version 0.3.1
+;	Version 0.3.2
 ;
 ;	(cc) 2018-2020 Cesar Rincon "NightFox"
 ;	https://nightfoxandco.com

diff --git a/source/ngn/ngn_start.asm b/source/ngn/ngn_start.asm
@@ -1,7 +1,7 @@
 ;***********************************************************
 ;
 ;	N'gine para MSX Asm Z80
-;	Version 0.3.1
+;	Version 0.3.2
 ;
 ;	(cc) 2018-2020 Cesar Rincon "NightFox"
 ;	https://nightfoxandco.com
@@ -20,6 +20,9 @@
 
 NGN_START:
 
+	; Espera a que se limpien las interrupciones iniciales
+	call NGN_WAIT_FOR_START_UP_INTERRUPTS
+
 	; Habilita el parche de las interrupciones
 	call NGN_SYSTEM_FD9A_PATCH_ON
 

diff --git a/source/ngn/ngn_system.asm b/source/ngn/ngn_system.asm
@@ -1,7 +1,7 @@
 ;***********************************************************
 ;
 ;	N'gine para MSX Asm Z80
-;	Version 0.3.1
+;	Version 0.3.2
 ;
 ;	(cc) 2018-2020 Cesar Rincon "NightFox"
 ;	https://nightfoxandco.com
@@ -12,6 +12,30 @@
 
 
 
+; ----------------------------------------------------------
+; NGN_WAIT_FOR_START_UP_INTERRUPTS:
+; Espera a que se resuelvan todas las interrupciones
+; antes de iniciar la libreria
+; ----------------------------------------------------------
+
+NGN_WAIT_FOR_START_UP_INTERRUPTS:
+
+	ld b, 120		; Espera las siguientes 120 interrupciones (2 segundos?)
+	@@LOOP:			; Esto evita que la unidad de disco siga girando
+		ei			; Despues de iniciar el programa
+		nop
+		nop
+		halt
+		nop
+		nop
+		djnz @@LOOP
+
+	; Sal de la rutina
+	ret
+
+
+
+
 ; ----------------------------------------------------------
 ; NGN_SYSTEM_FD9A_PATCH_ON
 ; NGN_SYSTEM_FD9A_PATCH_OFF

diff --git a/source/ngn/ngn_text.asm b/source/ngn/ngn_text.asm
@@ -1,7 +1,7 @@
 ;***********************************************************
 ;
 ;	N'gine para MSX Asm Z80
-;	Version 0.3.1
+;	Version 0.3.2
 ;
 ;	(cc) 2018-2020 Cesar Rincon "NightFox"
 ;	https://nightfoxandco.com

diff --git a/source/ngn/ngn_vars.asm b/source/ngn/ngn_vars.asm
@@ -1,7 +1,7 @@
 ;***********************************************************
 ;
 ;	N'gine para MSX Asm Z80
-;	Version 0.3.1
+;	Version 0.3.2
 ;
 ;	(cc) 2018-2020 Cesar Rincon "NightFox"
 ;	https://nightfoxandco.com
@@ -204,13 +204,21 @@ NGN_SCREEN_MODE:    ds  1       ; Modo de pantalla actual
 
 ; -----------------------------------------------------------------------
 ;	Descompresion RLE
-;   Total: 2054
+;   Total: 6
 ; -----------------------------------------------------------------------
 
 ; Gestion de la descompresion RLE
 NGN_RLE_NORMAL_SIZE:		ds	2
 NGN_RLE_COMPRESSED_SIZE:	ds	2
 NGN_RLE_POINTER:		    ds	2
+
+
+
+; -----------------------------------------------------------------------
+;	Memory Pool
+;   Total: 2048
+; -----------------------------------------------------------------------
+
 ; Buffer de RAM
 NGN_RAM_BUFFER:			    ds	2048
 

diff --git a/source/prog/consts.asm b/source/prog/consts.asm
@@ -1,7 +1,7 @@
 ;***********************************************************
 ;
 ;   MSX DIAGNOSTICS
-;   Version 1.1.5
+;   Version 1.1.6
 ;   ASM Z80 MSX
 ;   Definicion de constantes
 ;   (cc) 2018-2020 Cesar Rincon "NightFox"
@@ -35,13 +35,6 @@ MEMORY_SLOT_ID            .EQU    $82    ; ID de slot en formato (ExxxSSPP)
                                             ; bit 4-6 = Unused
                                             ; bit 7 = 1 if Slot is Expanded
 
-MEMORY_SLOT_BACKUP        .EQU    $83    ; Backup de la configuracion del slot       1 byte     ($A8)
-MEMORY_SUBSLOT_BACKUP     .EQU    $84    ; Backup de la configuracion del sub-slot   1 byte     ($FFFF)
-
-MEMORY_SLOT_LAYOUT        .EQU    $85    ; Layout de cada (sub)slot  (byte)          4 bytes x4
-                                            ; $00 Vacio
-                                            ; $01 ROM
-                                            ; $02 RAM
 
 
 

diff --git a/source/prog/joystick_test.asm b/source/prog/joystick_test.asm
@@ -1,7 +1,7 @@
 ;***********************************************************
 ;
 ;	MSX DIAGNOSTICS
-;	Version 1.1.5
+;	Version 1.1.6
 ;	ASM Z80 MSX
 ;	Test de los Joysticks
 ;	(cc) 2018-2020 Cesar Rincon "NightFox"

diff --git a/source/prog/keyboard_test.asm b/source/prog/keyboard_test.asm
@@ -1,7 +1,7 @@
 ;***********************************************************
 ;
 ;	MSX DIAGNOSTICS
-;	Version 1.1.5
+;	Version 1.1.6
 ;	ASM Z80 MSX
 ;	Test del teclado
 ;	(cc) 2018-2020 Cesar Rincon "NightFox"

diff --git a/source/prog/main.asm b/source/prog/main.asm
@@ -1,7 +1,7 @@
 ;***********************************************************
 ;
 ;	MSX DIAGNOSTICS
-;	Version 1.1.5
+;	Version 1.1.6
 ;	ASM Z80 MSX
 ;	Archivo principal
 ;	(cc) 2018-2020 Cesar Rincon "NightFox"

diff --git a/source/prog/main_menu_common.asm b/source/prog/main_menu_common.asm
@@ -1,7 +1,7 @@
 ;***********************************************************
 ;
 ;	MSX DIAGNOSTICS
-;	Version 1.1.5
+;	Version 1.1.6
 ;	ASM Z80 MSX
 ;	Menu Principal (Funciones comunes)
 ;	(cc) 2018-2020 Cesar Rincon "NightFox"

diff --git a/source/prog/main_menu_p1.asm b/source/prog/main_menu_p1.asm
@@ -1,7 +1,7 @@
 ;***********************************************************
 ;
 ;	MSX DIAGNOSTICS
-;	Version 1.1.5
+;	Version 1.1.6
 ;	ASM Z80 MSX
 ;	Menu Principal (Pagina 1)
 ;	(cc) 2018-2020 Cesar Rincon "NightFox"