diff --git a/cores/xmen/cfg/mem.yaml b/cores/xmen/cfg/mem.yaml index cdbbdb2d0..73288d687 100644 --- a/cores/xmen/cfg/mem.yaml +++ b/cores/xmen/cfg/mem.yaml @@ -12,16 +12,17 @@ clocks: outputs: - cen_fm - cen_fm2 - - freq: 18432000 + # - freq: 18432000 + - freq: 9216000 + # - freq: 4608000 gate: [pcm] outputs: - cen_pcm audio: rsum: 1.5k channels: - # using same filtering as TMNT. Values in SSRIDERS board must be reviewed - - { name: fm, module: jt51, rsum: 1k, rc: [ { r: 609, c: 33n } ] } - - { name: k539, module: jt054539, rsum: 1k, rc: [ { r: 609, c: 33n } ] } + - { name: fm, module: jt51, rsum: 1k, rc: [ { r: 4.7k, c: 2.2n } ] } + - { name: k539, module: jt054539, rsum: 1k, rc: [ { r: 4.7k, c: 2.2n } ] } sdram: banks: - buses: diff --git a/cores/xmen/ver/xmen/sim_sndtest.sh b/cores/xmen/ver/xmen/sim_sndtest.sh new file mode 100755 index 000000000..850412824 --- /dev/null +++ b/cores/xmen/ver/xmen/sim_sndtest.sh @@ -0,0 +1,15 @@ +#!/bin/bash +jtutil sdram +LAST=540 +# voice test 1 finishes at 447 +# voice test 2 finishes at 540 +while [ $# -gt 0 ]; do + case "$1" in + 1) LAST=447;; + 2) LAST=540;; + *) echo "Unknown argument $1"; exit 1;; + esac + shift +done + + jtsim -inputs snd_test.in -video $LAST -w 332 diff --git a/cores/xmen/ver/xmen/snd_test.in b/cores/xmen/ver/xmen/snd_test.in new file mode 100644 index 000000000..8ecb8010b --- /dev/null +++ b/cores/xmen/ver/xmen/snd_test.in @@ -0,0 +1,451 @@ +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +800 +800 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +40 +40 +0 +0 +0 +0 +0 +0 +40 +40 +0 +0 +0 +0 +0 +0 +40 +40 +0 +0 +0 +0 +0 +0 +100 +100 +0 +0 +0 +0 +0 +0 +0 +0 +40 +40 +0 +0 +0 +0 +0 +0 +40 +40 +0 +0 +0 +0 +0 +0 +10 +10 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +10 +10 +0 + diff --git a/cores/xmen/ver/xmen/sndtest.gtkw b/cores/xmen/ver/xmen/sndtest.gtkw index cbf682708..8b6a7151c 100644 --- a/cores/xmen/ver/xmen/sndtest.gtkw +++ b/cores/xmen/ver/xmen/sndtest.gtkw @@ -1,78 +1,74 @@ [*] [*] GTKWave Analyzer v3.3.116 (w)1999-2023 BSI -[*] Sun Oct 6 07:11:38 2024 +[*] Mon Oct 7 05:38:15 2024 [*] [dumpfile] "/home/jtejada/jtcores/cores/xmen/ver/xmen/test.fst" -[dumpfile_mtime] "Sun Oct 6 06:33:18 2024" -[dumpfile_size] 86552967 +[dumpfile_mtime] "Sun Oct 6 17:29:17 2024" +[dumpfile_size] 161568749 [savefile] "/home/jtejada/jtcores/cores/xmen/ver/xmen/sndtest.gtkw" -[timestart] 1151000000000 -[size] 1920 1033 +[timestart] 5593185794448 +[size] 2532 1005 [pos] -1 -1 -*-37.662773 2478520437456 1228388451024 1588819631952 1699982933712 2347415328720 2478520437456 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 +*-38.799961 5801350679376 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 [treeopen] TOP. [treeopen] TOP.game_test. [treeopen] TOP.game_test.u_game. [treeopen] TOP.game_test.u_game.u_game. [treeopen] TOP.game_test.u_game.u_game.u_sound. -[treeopen] TOP.game_test.u_game.u_game.u_sound.u_k54539. [sst_width] 278 -[signals_width] 251 +[signals_width] 244 [sst_expanded] 1 -[sst_vpaned_height] 338 +[sst_vpaned_height] 327 @24 TOP.game_test.frame_cnt[31:0] -@23 -TOP.game_test.u_game.u_game.u_sound.A[15:0] @22 -TOP.game_test.u_game.u_game.u_sound.cpu_dout[7:0] -@28 -TOP.game_test.u_game.u_game.u_sound.wr_n -@200 +TOP.game_test.u_game.u_game.joystick1[6:0] +@8420 +TOP.game_test.u_game.u_game.u_sound.u_k54539.left[15:0] +@20000 +- - -@28 -TOP.game_test.u_game.u_game.u_sound.u_k54539.cs @22 +TOP.game_test.u_game.u_game.u_sound.u_k54539.cur[20:0] TOP.game_test.u_game.u_game.u_sound.u_k54539.ch_en[7:0] +@24 +TOP.game_test.u_game.u_game.u_sound.u_k54539.ch[2:0] +@22 +TOP.game_test.u_game.u_game.u_sound.u_k54539.st[4:0] +TOP.game_test.u_game.u_game.u_sound.u_k54539.rom_addr[20:0] @28 -TOP.game_test.u_game.u_game.u_sound.u_k54539.mmr_we -TOP.game_test.u_game.u_game.u_sound.rd_n -TOP.game_test.u_game.u_game.u_sound.u_k54539.test_mem_sel -@8022 -[color] 2 -TOP.game_test.u_game.u_game.u_sound.u_k54539.test_addr[16:0] +TOP.game_test.u_game.u_game.u_sound.u_k54539.rom_cs +@200 +- @28 -TOP.game_test.u_game.u_game.u_sound.u_k54539.test_we +TOP.game_test.u_game.u_game.u_sound.u_k54539.mmr_we @22 -TOP.game_test.u_game.u_game.u_sound.u_k54539.test_dout[7:0] -@c08022 -TOP.game_test.u_game.u_game.u_sound.u_k54539.u_rev.addr0[14:0] +[color] 1 +TOP.game_test.u_game.u_game.u_sound.u_k54539.addr[8:0] +@c00022 +TOP.game_test.u_game.u_game.u_sound.u_k54539.din[7:0] @28 -(0)TOP.game_test.u_game.u_game.u_sound.u_k54539.u_rev.addr0[14:0] -(1)TOP.game_test.u_game.u_game.u_sound.u_k54539.u_rev.addr0[14:0] -(2)TOP.game_test.u_game.u_game.u_sound.u_k54539.u_rev.addr0[14:0] -(3)TOP.game_test.u_game.u_game.u_sound.u_k54539.u_rev.addr0[14:0] -(4)TOP.game_test.u_game.u_game.u_sound.u_k54539.u_rev.addr0[14:0] -(5)TOP.game_test.u_game.u_game.u_sound.u_k54539.u_rev.addr0[14:0] -(6)TOP.game_test.u_game.u_game.u_sound.u_k54539.u_rev.addr0[14:0] -(7)TOP.game_test.u_game.u_game.u_sound.u_k54539.u_rev.addr0[14:0] -(8)TOP.game_test.u_game.u_game.u_sound.u_k54539.u_rev.addr0[14:0] -(9)TOP.game_test.u_game.u_game.u_sound.u_k54539.u_rev.addr0[14:0] -(10)TOP.game_test.u_game.u_game.u_sound.u_k54539.u_rev.addr0[14:0] -(11)TOP.game_test.u_game.u_game.u_sound.u_k54539.u_rev.addr0[14:0] -(12)TOP.game_test.u_game.u_game.u_sound.u_k54539.u_rev.addr0[14:0] -(13)TOP.game_test.u_game.u_game.u_sound.u_k54539.u_rev.addr0[14:0] -(14)TOP.game_test.u_game.u_game.u_sound.u_k54539.u_rev.addr0[14:0] +(0)TOP.game_test.u_game.u_game.u_sound.u_k54539.din[7:0] +(1)TOP.game_test.u_game.u_game.u_sound.u_k54539.din[7:0] +(2)TOP.game_test.u_game.u_game.u_sound.u_k54539.din[7:0] +(3)TOP.game_test.u_game.u_game.u_sound.u_k54539.din[7:0] +(4)TOP.game_test.u_game.u_game.u_sound.u_k54539.din[7:0] +(5)TOP.game_test.u_game.u_game.u_sound.u_k54539.din[7:0] +(6)TOP.game_test.u_game.u_game.u_sound.u_k54539.din[7:0] +(7)TOP.game_test.u_game.u_game.u_sound.u_k54539.din[7:0] @1401200 -group_end +@22 +TOP.game_test.u_game.u_game.u_sound.u_k54539.sim_cur7[20:0] +TOP.game_test.u_game.u_game.u_sound.u_k54539.sim_frac7[15:0] @28 -(0)TOP.game_test.u_game.u_game.u_sound.u_k54539.u_rev.addr0[14:0] +TOP.game_test.u_game.u_game.u_sound.u_k54539.rev_en @22 -TOP.game_test.u_game.u_game.u_sound.u_k54539.u_rev.data0[7:0] -TOP.game_test.u_game.u_game.u_sound.u_k54539.test_bank[3:0] +TOP.game_test.u_game.u_game.u_sound.u_k54539.reverse_en[7:0] +@29 +TOP.game_test.u_game.u_game.u_sound.u_k54539.eof +TOP.game_test.u_game.u_game.u_sound.u_k54539.cur_en @28 -TOP.game_test.u_game.u_game.u_sound.u_k54539.test_en -TOP.game_test.u_game.u_game.u_sound.u_k54539.reg_we -TOP.game_test.u_game.u_game.u_sound.u_k54539.reg_weg +TOP.game_test.u_game.u_game.u_sound.u_k54539.reread [pattern_trace] 1 [pattern_trace] 0 diff --git a/modules/jt539 b/modules/jt539 index 7f794e6dd..8ca4de711 160000 --- a/modules/jt539 +++ b/modules/jt539 @@ -1 +1 @@ -Subproject commit 7f794e6ddacc67ea465e1b507971cc4316a5dae8 +Subproject commit 8ca4de71132d616484c699cdcb95fbb5826f42aa