mirror of
https://github.com/Gehstock/Mist_FPGA.git
synced 2026-02-11 10:34:39 +00:00
Update jt51
This commit is contained in:
@@ -441,7 +441,8 @@ dpram_dc #(.widthad_a(8)) u14H
|
||||
//Sound chip - Yamaha YM2151 (uses JT51 implementation by Jotego)
|
||||
wire [7:0] ym2151_Dout;
|
||||
wire signed [15:0] sound_l_raw, sound_r_raw;
|
||||
wire [15:0] unsgined_sound_l_raw, unsgined_sound_r_raw;
|
||||
wire [15:0] unsgined_sound_l_raw = {~sound_l_raw[15], sound_l_raw[14:0]};
|
||||
wire [15:0] unsgined_sound_r_raw = {~sound_r_raw[15], sound_r_raw[14:0]};
|
||||
jt51 u8C
|
||||
(
|
||||
.rst(~reset),
|
||||
@@ -454,9 +455,7 @@ jt51 u8C
|
||||
.din(soundcpu_Dout),
|
||||
.dout(ym2151_Dout),
|
||||
.xleft(sound_l_raw),
|
||||
.xright(sound_r_raw),
|
||||
.dacleft(unsgined_sound_l_raw),
|
||||
.dacright(unsgined_sound_r_raw)
|
||||
.xright(sound_r_raw)
|
||||
);
|
||||
|
||||
//----------------------------------------------------- Final video output -----------------------------------------------------//
|
||||
|
||||
@@ -294,8 +294,8 @@ architecture struct of williams2 is
|
||||
signal audio : std_logic_vector( 7 downto 0);
|
||||
signal pia_audio : std_logic_vector( 7 downto 0);
|
||||
signal speech_out : std_logic_vector(15 downto 0);
|
||||
signal fm_left : unsigned(15 downto 0);
|
||||
signal fm_right : unsigned(15 downto 0);
|
||||
signal fm_left : signed(15 downto 0);
|
||||
signal fm_right : signed(15 downto 0);
|
||||
|
||||
signal ic79_a : std_logic_vector(3 downto 0);
|
||||
signal ic79_b : std_logic_vector(3 downto 0);
|
||||
@@ -1197,7 +1197,7 @@ port map(
|
||||
snd_rom_do => snd2_rom_do
|
||||
);
|
||||
|
||||
audio_left <= "00000000000000000" + unsigned(audio&"00000") + unsigned(pia_audio&"00000") + unsigned(speech_out(15 downto 1)) + fm_left;
|
||||
audio_right <= "00000000000000000" + unsigned(audio&"00000") + unsigned(pia_audio&"00000") + unsigned(speech_out(15 downto 1)) + fm_right;
|
||||
audio_left <= "00000000000000000" + unsigned(audio&"00000") + unsigned(pia_audio&"00000") + unsigned(speech_out(15 downto 1)) + unsigned(not fm_left(15)&fm_left(14 downto 0));
|
||||
audio_right <= "00000000000000000" + unsigned(audio&"00000") + unsigned(pia_audio&"00000") + unsigned(speech_out(15 downto 1)) + unsigned(not fm_right(15)&fm_right(14 downto 0));
|
||||
|
||||
end struct;
|
||||
@@ -58,8 +58,8 @@ port(
|
||||
|
||||
pia_audio : out std_logic_vector( 7 downto 0);
|
||||
speech_out : out std_logic_vector(15 downto 0);
|
||||
ym2151_left : out unsigned (15 downto 0);
|
||||
ym2151_right : out unsigned (15 downto 0);
|
||||
ym2151_left : out signed (15 downto 0);
|
||||
ym2151_right : out signed (15 downto 0);
|
||||
|
||||
snd_rom_addr : buffer std_logic_vector(16 downto 0);
|
||||
snd_rom_do : in std_logic_vector( 7 downto 0);
|
||||
@@ -94,10 +94,7 @@ port (
|
||||
right : out signed (15 downto 0);
|
||||
-- Full resolution output
|
||||
xleft : out signed (15 downto 0);
|
||||
xright : out signed (15 downto 0);
|
||||
-- unsigned outputs for sigma delta converters, full resolution
|
||||
dacleft : out unsigned (15 downto 0);
|
||||
dacright : out unsigned (15 downto 0)
|
||||
xright : out signed (15 downto 0)
|
||||
); end component jt51;
|
||||
|
||||
|
||||
@@ -488,11 +485,8 @@ port map (
|
||||
left => open,
|
||||
right => open,
|
||||
-- Full resolution output
|
||||
xleft => open,
|
||||
xright => open,
|
||||
-- unsigned outputs for sigma delta converters, full resolution
|
||||
dacleft => ym2151_left,
|
||||
dacright => ym2151_right
|
||||
xleft => ym2151_left,
|
||||
xright => ym2151_right
|
||||
);
|
||||
|
||||
end struct;
|
||||
|
||||
Reference in New Issue
Block a user