Skip to content

Commit 646ac6e

Browse files
committed
- 6.2.0.1 Fixed OPNB wait for MSXπ UART(i8251).
1 parent 28645ed commit 646ac6e

File tree

13 files changed

+770
-854
lines changed

13 files changed

+770
-854
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,3 +194,4 @@ bin
194194
/src/VSIF/VGMPlay_SegaCD/out
195195
/src/Praat2Lpc/.vs
196196
/src/VSIF/VGMPlay_MSX_pi/.vscode
197+
/src/VSIF/VGMPlay_MSX_pi - tR

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
MAmidiMEmo 6.2.0.0 Itoken (c)2019, 2025 / GPL-2.0
1+
MAmidiMEmo 6.2.0.1 Itoken (c)2019, 2025 / GPL-2.0
22

33
*** What is the MAmidiMEmo? ***
44

@@ -278,10 +278,12 @@ e.g.) YM2151 has 8ch FM sounds, so you can play 8 chords on MIDI 1ch or sharing
278278
[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=SNQ9JE3JAQMNQ)
279279

280280
*** Changes
281+
- 6.2.0.1 Fixed OPNB wait for MSXπ UART(i8251).
281282
- 6.2.0.0 Supported MSXπ UART(i8251).
282283
- Use VGMPlay_mpi.rom (or VGMPlay_mpi_Vkey.rom)
283284
- Use MSXπ i8251 firmware(https://github.com/piigaa-densetu-two-dai/MSXpi_typeA/tree/main/i8251)
284-
- 6.1.7.0 Improved performance fo Piano pane rendering.
285+
- Supported NEOTRON(for VGMPlayer )
286+
- - 6.1.7.0 Improved performance fo Piano pane rendering.
285287
- Fixed SSG Envelope does not sound on YM2608.
286288
- 6.1.6.1 Fixed an issue where sound would not stop on HuC6280.
287289
- 6.1.6.0 Updated VST Host libraries to the latest version. No need to install VC++ runtime 2012.

src/VSIF/VGMPlay_MSX_pi/Makefile

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22

33
PROGRAM = VGM_mpi.rom
44
PROGRAMV = VGM_mpi_VKey.rom
5-
# for tR-nization kit(tentative)
6-
PROGRAMtR = VGM_mpitr.rom
7-
# for tR-nization kit(tentative)
8-
PROGRAMVtR = VGM_mpitr_VKey.rom
5+
96
CC = sdcc
107
CFLAGS = -c -mz80 --std-c2x --opt-code-speed --debug
118
OBJS = main.rel player_code.rel
@@ -29,16 +26,6 @@ $(PROGRAMV): $(OBJSV) uart-4800.rel uart-4800_p2.rel SARCHFM.rel start.rel
2926
makebin.exe -s 65536 VGM_mpi_VKey.hex > VGM_mpi_VKey.bin
3027
perl romout.pl VGM_mpi_VKey.bin > VGM_mpi_VKey.rom
3128

32-
$(PROGRAMtR): $(OBJS) uart-4800tR.rel uart-4800_p2tR.rel SARCHFM.rel start.rel
33-
$(CC) -o VGM_mpitr.hex -mz80 --no-std-crt0 --code-loc 0x4100 --data-loc 0x5000 $^
34-
makebin.exe -s 65536 VGM_mpitr.hex > VGM_mpitr.bin
35-
perl romout.pl VGM_mpitr.bin > VGM_mpitr.rom
36-
37-
$(PROGRAMVtR): $(OBJSV) uart-4800tR.rel uart-4800_p2tR.rel SARCHFM.rel start.rel
38-
$(CC) -o VGM_mpitr_VKey.hex -mz80 --no-std-crt0 --code-loc 0x4100 --data-loc 0x5000 $^
39-
makebin.exe -s 65536 VGM_mpitr_VKey.hex > VGM_mpitr_VKey.bin
40-
perl romout.pl VGM_mpitr_VKey.bin > VGM_mpitr_VKey.rom
41-
4229
# /mnt/e/Emu/blueMSX/blueMSX.exe VGM_msx.rom
4330

4431
.PHONY: run
@@ -49,18 +36,12 @@ run:
4936
start.rel: start.asm
5037
sdasz80 -y -o start.rel start.asm
5138

52-
uart-4800.rel: uart-4800.asm const.inc macro.inc page1.asm
39+
uart-4800.rel: uart-4800.asm const.inc macro.inc
5340
sdasz80 -y -o uart-4800.rel uart-4800.asm
5441

55-
uart-4800_p2.rel: uart-4800_p2.asm const.inc macro.inc page2.asm
42+
uart-4800_p2.rel: uart-4800_p2.asm const.inc macro.inc
5643
sdasz80 -y -o uart-4800_p2.rel uart-4800_p2.asm
5744

58-
uart-4800tR.rel: uart-4800tR.asm uart-4800.asm const.inc macro.inc page1.asm
59-
sdasz80 -y -o uart-4800tR.rel uart-4800tR.asm
60-
61-
uart-4800_p2tR.rel: uart-4800_p2tR.asm uart-4800_p2.asm const.inc macro.inc page2.asm
62-
sdasz80 -y -o uart-4800_p2tR.rel uart-4800_p2tR.asm
63-
6445
SARCHFM.rel: SARCHFM.asm const.inc macro.inc
6546
sdasz80 -y -o SARCHFM.rel SARCHFM.asm
6647

src/VSIF/VGMPlay_MSX_pi/const.inc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
UART_READ = #0x42
22
UART_WRITE = #0x42
33
UART_STAT = #0x41
4-
UART_MODE_135 = 0
54

65
PSGAD = #0xA0
76
PSGWR = #0xA1

src/VSIF/VGMPlay_MSX_pi/macro.inc

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,13 @@
11
;=======================================================
22
.macro READ_UART_STAT
33
IN A,(UART_STAT) ; 12
4-
.if tR
5-
IN A,(UART_STAT) ; 12
6-
.endif
74
.endm
85

96
.macro READ_ADRS
107
5$:
118
READ_UART_STAT
12-
.if UART_MODE_135
13-
CP E ; 5
14-
JP NZ, 5$ ; 11 28
15-
.else
169
AND E ; 5
1710
JP Z, 5$ ; 11
18-
.endif
1911
IN A,(UART_READ) ; 12 40
2012
LD B, A ; 5 45
2113
.endm
@@ -24,13 +16,8 @@
2416
.macro READ_DATA
2517
3$:
2618
READ_UART_STAT
27-
.if UART_MODE_135
28-
CP E ; 5
29-
JP NZ, 3$ ; 11 28
30-
.else
3119
AND E ; 5
3220
JP Z, 3$ ; 11
33-
.endif
3421
IN A,(UART_READ) ; 12 40
3522
.endm
3623
;=======================================================
@@ -40,13 +27,8 @@
4027
;=======================
4128
1$:
4229
READ_UART_STAT
43-
.if UART_MODE_135
44-
CP E ; 5
45-
JP NZ, 1$ ; 11 28
46-
.else
4730
AND E ; 5
4831
JP Z, 1$ ; 11
49-
.endif
5032
IN A,(UART_READ) ; 12 40
5133
AND #0x1F ; 8 48
5234
JP Z,0$ ; 11 59 ; Continuous Write
@@ -105,13 +87,8 @@ __WRITE_OPLL_IO:
10587
.macro WRITE_SCC_2BYTES
10688
1$:
10789
READ_UART_STAT
108-
.if UART_MODE_135
109-
CP E ; 5
110-
JP NZ, 1$ ; 11 28
111-
.else
11290
AND E ; 5
11391
JP Z, 1$ ; 11
114-
.endif
11592
IN A,(UART_READ) ; 12 40
11693

11794
;WRITE BOTH 1st BYTE AND 2nd BYTE
@@ -186,13 +163,8 @@ __WRITE_SCC_2BYTES:
186163
LD B,#31 ; 8 8
187164
1$:
188165
READ_UART_STAT
189-
.if UART_MODE_135
190-
CP E ; 5
191-
JP NZ, 1$ ; 11 28
192-
.else
193166
AND E ; 5
194167
JP Z, 1$ ; 11
195-
.endif
196168
IN A,(UART_READ) ; 12 40
197169

198170
;WRITE NEXT BYTE

0 commit comments

Comments
 (0)