git.y1.nz

commit d094af07c7d207cea6191c1bd6d7b7ea03f81686
parent ccdff22a6b3d3cfe0c89dbacefbbf6aeadb771e6
Author: Toxa <untoxa@mail.ru>
Date:   Fri, 26 Apr 2024 11:28:48 +0300

MSXDOS: implement _SYSTEM variable which tells whether system is PAL or NTSC (no real detection yet, returns NTSC), remove useless artifacts from the SMS port

Diffstat:
M
gbdk-lib/include/msx/hardware.h
45
---------------------------------------------
M
gbdk-lib/libc/targets/z80/msxdos/crt0.s
2
++
M
gbdk-lib/libc/targets/z80/msxdos/global.s
45
---------------------------------------------

3 files changed, 2 insertions(+), 90 deletions(-)
diff --git a/gbdk-lib/include/msx/hardware.h b/gbdk-lib/include/msx/hardware.h
@@ -10,26 +10,6 @@
 #define __BYTES extern UBYTE
 #define __BYTE_REG extern volatile UBYTE
 
-static volatile SFR AT(0x3E) MEMORY_CTL;
-
-#define MEMCTL_JOYON   0b00000000
-#define MEMCTL_JOYOFF  0b00000100
-#define MEMCTL_BASEON  0b00000000
-#define MEMCTL_BASEOFF 0b00001000
-#define MEMCTL_RAMON   0b00000000
-#define MEMCTL_RAMOFF  0b00010000
-#define MEMCTL_CROMON  0b00000000
-#define MEMCTL_CROMOFF 0b00100000
-#define MEMCTL_ROMON   0b00000000
-#define MEMCTL_ROMOFF  0b01000000
-#define MEMCTL_EXTON   0b00000000
-#define MEMCTL_EXTOFF  0b10000000
-
-static volatile SFR AT(0x3F) JOY_CTL;
-
-#define JOY_P1_LATCH   0b00000010
-#define JOY_P2_LATCH   0b00001000
-
 static volatile SFR AT(0x7E) VCOUNTER;
 
 static volatile SFR AT(0x7F) PSG;
@@ -139,29 +119,6 @@ extern UBYTE shadow_VDP_R10;
 #define R10_INT_OFF    0xFF
 #define R10_INT_EVERY  0x00
 
-static volatile SFR AT(0xDC) JOY_PORT1;
-
-#define JOY_P1_UP      0b00000001
-#define JOY_P1_DOWN    0b00000010
-#define JOY_P1_LEFT    0b00000100
-#define JOY_P1_RIGHT   0b00001000
-#define JOY_P1_SW1     0b00010000
-#define JOY_P1_TRIGGER 0b00010000
-#define JOY_P1_SW2     0b00100000
-#define JOY_P2_UP      0b01000000
-#define JOY_P2_DOWN    0b10000000
-
-static volatile SFR AT(0xDD) JOY_PORT2;
-
-#define JOY_P2_LEFT    0b00000001
-#define JOY_P2_RIGHT   0b00000010
-#define JOY_P2_SW1     0b00000100
-#define JOY_P2_TRIGGER 0b00000100
-#define JOY_P2_SW2     0b00001000
-#define JOY_RESET      0b00010000
-#define JOY_P1_LIGHT   0b01000000
-#define JOY_P2_LIGHT   0b10000000
-
 static volatile SFR AT(0xF0) FMADDRESS;
 static volatile SFR AT(0xF1) FMDATA;
 static volatile SFR AT(0xF2) AUDIOCTRL;
@@ -171,8 +128,6 @@ static volatile SFR AT(0xfd) MAP_FRAME1;
 static volatile SFR AT(0xfe) MAP_FRAME2;
 static volatile SFR AT(0xff) MAP_FRAME3;
 
-extern const UBYTE _BIOS;
-
 extern const UBYTE _SYSTEM;
 
 #define SYSTEM_PAL     0x00
diff --git a/gbdk-lib/libc/targets/z80/msxdos/crt0.s b/gbdk-lib/libc/targets/z80/msxdos/crt0.s
@@ -489,6 +489,8 @@ __shadow_OAM_OFF::
         .db 0
 .mode::
         .ds .T_MODE_INOUT       ; Current mode
+__SYSTEM::
+        .db .SYSTEM_NTSC        ; Detection not implemented yet
 __old_int_vector::
         .ds 5
 
diff --git a/gbdk-lib/libc/targets/z80/msxdos/global.s b/gbdk-lib/libc/targets/z80/msxdos/global.s
@@ -182,26 +182,6 @@
         .COPY           = 0x82  ; File cannot be copied onto itself
         .OVDEST         = 0x81  ; Cannot overwrite previous destination file
 
-        .MEMORY_CTL     = 0x3E
-
-        .MEMCTL_JOYON   = 0b00000000
-        .MEMCTL_JOYOFF  = 0b00000100
-        .MEMCTL_BASEON  = 0b00000000
-        .MEMCTL_BASEOFF = 0b00001000
-        .MEMCTL_RAMON   = 0b00000000
-        .MEMCTL_RAMOFF  = 0b00010000
-        .MEMCTL_CROMON  = 0b00000000
-        .MEMCTL_CROMOFF = 0b00100000
-        .MEMCTL_ROMON   = 0b00000000
-        .MEMCTL_ROMOFF  = 0b01000000
-        .MEMCTL_EXTON   = 0b00000000
-        .MEMCTL_EXTOFF  = 0b10000000
-
-        .JOY_CTL        = 0x3F
-
-        .JOY_P1_LATCH   = 0b00000010
-        .JOY_P2_LATCH   = 0b00001000
-
         .VDP_VRAM       = 0x4000
         .VDP_TILEDATA0  = 0x4000
         .VDP_TILEDATA1  = 0x4800
@@ -298,29 +278,6 @@
         .KBD_SELECT_ROW = 0xAA
         .KBD_INPUT      = 0xA9
 
-        .JOY_PORT1      = 0xDC
-
-        .JOY_P1_UP      = 0b00000001
-        .JOY_P1_DOWN    = 0b00000010
-        .JOY_P1_LEFT    = 0b00000100
-        .JOY_P1_RIGHT   = 0b00001000
-        .JOY_P1_SW1     = 0b00010000
-        .JOY_P1_TRIGGER = 0b00010000
-        .JOY_P1_SW2     = 0b00100000
-        .JOY_P2_UP      = 0b01000000
-        .JOY_P2_DOWN    = 0b10000000
-
-        .JOY_PORT2      = 0xDD
-
-        .JOY_P2_LEFT    = 0b00000001
-        .JOY_P2_RIGHT   = 0b00000010
-        .JOY_P2_SW1     = 0b00000100
-        .JOY_P2_TRIGGER = 0b00000100
-        .JOY_P2_SW2     = 0b00001000
-        .JOY_RESET      = 0b00010000
-        .JOY_P1_LIGHT   = 0b01000000
-        .JOY_P2_LIGHT   = 0b10000000
-
         .FMADDRESS      = 0xF0
         .FMDATA         = 0xF1
         .AUDIOCTRL      = 0xF2
@@ -330,8 +287,6 @@
         .MAP_FRAME2     = 0xfffe
         .MAP_FRAME3     = 0xffff
 
-        .BIOS           = 0xC000
-
         .SYSTEM_PAL     = 0x00
         .SYSTEM_NTSC    = 0x01
 

This webpage is intended to be an accessible preview of this repository. To get a fuller picture, clone it and use the git CLI.