Index: atari_chips/pokeyv2/pokeymaxv1.vhd =================================================================== --- atari_chips/pokeyv2/pokeymaxv1.vhd (revision 1546) +++ atari_chips/pokeyv2/pokeymaxv1.vhd (revision 1547) @@ -38,7 +38,8 @@ adc_audio_detect : integer := 0; -- Detect 0 crossing/amplitude etc, otherwise silence adc_fir_filter_v4 : integer := 0; -- Filter out interference from keyboard scan etc - sigmadelta_implementation : integer := 4; -- 4 is dithered 2nd order (recommended if it fits), 2 is 2nd order without dithering + --sigmadelta_implementation : integer := 4; -- 4 is dithered 2nd order (recommended if it fits), 2 is 2nd order without dithering + sigmadelta_implementation : integer := 2; -- 4 is dithered 2nd order (recommended if it fits), 2 is 2nd order without dithering ext_bits : integer := 3; pll_v2 : integer := 1; @@ -270,6 +271,7 @@ -- SID signal SID_CLK_ENABLE : std_logic; signal SID_AUDIO_SIGNED : SIGNED_AUDIO_TYPE(1 downto 0); + signal SID_AUDIO_IN_SIGNED : SIGNED_AUDIO_TYPE(1 downto 0); signal SID_FLASH1_ADDR : std_logic_vector(16 downto 0); signal SID_FLASH1_ROMREQUEST : std_logic; signal SID_FLASH1_ROMREADY : std_logic; @@ -276,10 +278,10 @@ signal SID_FLASH2_ADDR : std_logic_vector(16 downto 0); signal SID_FLASH2_ROMREQUEST : std_logic; signal SID_FLASH2_ROMREADY : std_logic; - signal SID_FILTER1_REG : std_logic_vector(1 downto 0); - signal SID_FILTER1_NEXT : std_logic_vector(1 downto 0); - signal SID_FILTER2_REG : std_logic_vector(1 downto 0); - signal SID_FILTER2_NEXT : std_logic_vector(1 downto 0); + signal SID_FILTER1_REG : std_logic_vector(2 downto 0); + signal SID_FILTER1_NEXT : std_logic_vector(2 downto 0); + signal SID_FILTER2_REG : std_logic_vector(2 downto 0); + signal SID_FILTER2_NEXT : std_logic_vector(2 downto 0); signal SID1_FILTER_BP : signed(17 downto 8); signal SID1_FILTER_HP : signed(17 downto 8); signal SID1_F_RAW : std_logic_vector(12 downto 0); @@ -383,15 +385,28 @@ -- SAMPLE/COVOX signal SAMPLE_AUDIO_SIGNED : SIGNED_AUDIO_TYPE(1 downto 0); + signal SAMPLE_AUDIO_IN_SIGNED : SIGNED_AUDIO_TYPE(1 downto 0); signal SAMPLE_IRQ : std_logic; signal SAMPLE_RAM_ADDRESS : std_logic_vector(15 downto 0); signal SAMPLE_RAM_WRITE_ENABLE : std_logic; - signal SAMPLE_RAM_DATA : std_logic_vector(7 downto 0); + signal SAMPLE_RAM_READ_DATA : std_logic_vector(7 downto 0); + signal SAMPLE_RAM_WRITE_DATA : std_logic_vector(7 downto 0); signal ADPCM_STEP_ADDR : std_logic_vector(6 downto 0); signal ADPCM_STEP_REQUEST : std_logic; signal ADPCM_STEP_READY : std_logic; + -- MIXER + signal mixer_audio_out : signed(15 downto 0); + signal mixer_l_enable : std_logic; + signal mixer_r_enable : std_logic; + signal mixer_audio_out_channel : unsigned(2 downto 0); + signal mixer_mute : std_logic; + signal MIXER_SIGNED_REG : SIGNED_AUDIO_TYPE(1 downto 0); + signal MIXER_SIGNED_NEXT : SIGNED_AUDIO_TYPE(1 downto 0); + signal MIX_SEL_NEXT : std_logic_vector(4 downto 0); + signal MIX_SEL_REG : std_logic_vector(4 downto 0); + -- FLASH signal flash_do_slow : std_logic_vector(31 downto 0); --58Mhz @@ -1009,8 +1024,8 @@ AUDIO => SID_AUDIO_SIGNED(0), SIDTYPE => SID_FILTER1_REG(0), - EXT => "0"&SID_FILTER1_REG(1), - EXT_ADC => (others=>'0'), + EXT => SID_FILTER1_REG(2 downto 1), + EXT_ADC => signed_to_unsigned(SID_AUDIO_IN_SIGNED(0)), POT_X => '0', POT_Y => '0', @@ -1049,8 +1064,8 @@ AUDIO => SID_AUDIO_SIGNED(1), SIDTYPE => SID_FILTER2_REG(0), - EXT => "0"&SID_FILTER2_REG(1), - EXT_ADC => (others=>'0'), + EXT => SID_FILTER2_REG(2 downto 1), + EXT_ADC => signed_to_unsigned(SID_AUDIO_IN_SIGNED(1)), POT_X => '0', POT_Y => '0', @@ -1245,10 +1260,14 @@ AUDIO0 => SAMPLE_AUDIO_SIGNED(0), AUDIO1 => SAMPLE_AUDIO_SIGNED(1), IRQ => SAMPLE_IRQ, + + AUDIO_IN0 => SAMPLE_AUDIO_IN_SIGNED(0), + AUDIO_IN1 => SAMPLE_AUDIO_IN_SIGNED(1), RAM_ADDR => SAMPLE_RAM_ADDRESS, RAM_WRITE_ENABLE => SAMPLE_RAM_WRITE_ENABLE, - RAM_DATA => SAMPLE_RAM_DATA, + RAM_DATA => SAMPLE_RAM_READ_DATA, + RAM_WRITE_DATA => SAMPLE_RAM_WRITE_DATA, ADPCM_STEP_ADDR => ADPCM_STEP_ADDR, ADPCM_STEP_REQUEST => ADPCM_STEP_REQUEST, @@ -1268,10 +1287,10 @@ ( clock => clk, reset_n => reset_n, - data => write_data, + data => sample_ram_write_data, address => sample_ram_address, we => sample_ram_write_enable, - q => sample_ram_data + q => sample_ram_read_data ); end generate; @@ -1285,10 +1304,10 @@ ( clock => clk, reset_n => reset_n, - data => write_data, + data => sample_ram_write_data, address => sample_ram_address, we => sample_ram_write_enable, - q => sample_ram_data + q => sample_ram_read_data ); end generate; @@ -1304,10 +1323,10 @@ ( clock => clk, reset_n => reset_n, - data => write_data, + data => sample_ram_write_data, address => sample_ram_address, we => sample_ram_write_enable, - q => sample_ram_data + q => sample_ram_read_data ); end generate; @@ -1462,10 +1481,13 @@ PSG_STEREOMODE_REG <= "01"; --Polish PSG_PROFILESEL_REG <= "00"; --Simple log PSG_ENVELOPE16_REG <= '0'; --32 step - SID_FILTER1_REG <= "10"; -- 0=8580,1=6581,2=digifix - SID_FILTER2_REG <= "10"; -- 0=8580,1=6581,2=digifix + SID_FILTER1_REG <= "010"; -- 0=8580,1=6581,2=digifix + SID_FILTER2_REG <= "010"; -- 0=8580,1=6581,2=digifix RESTRICT_CAPABILITY_REG <= (others=>'1'); CHANNEL_EN_REG <= (others=>'1'); + MIXER_SIGNED_REG(0) <= to_signed(0,16); + MIXER_SIGNED_REG(1) <= to_signed(0,16); + MIX_SEL_REG <= (others=>'0'); elsif (clk'event and clk='1') then DETECT_RIGHT_REG <= DETECT_RIGHT_NEXT; IRQ_EN_REG <= IRQ_EN_NEXT; @@ -1486,6 +1508,8 @@ SID_FILTER2_REG <= SID_FILTER2_NEXT; RESTRICT_CAPABILITY_REG <= RESTRICT_CAPABILITY_NEXT; CHANNEL_EN_REG <= CHANNEL_EN_NEXT; + MIXER_SIGNED_REG <= MIXER_SIGNED_NEXT; + MIX_SEL_REG <= MIX_SEL_NEXT; end if; end process; @@ -1514,7 +1538,8 @@ CPU_FLASH_COMPLETE,CONFIG_FLASH_COMPLETE,CONFIG_FLASH_ADDR,flash_do_slow, RESTRICT_CAPABILITY_REG, CHANNEL_EN_REG, - PAL_REG + PAL_REG, + MIX_SEL_REG ) begin SATURATE_NEXT <= SATURATE_REG; @@ -1552,6 +1577,8 @@ PAL_NEXT <= PAL_REG; + MIX_SEL_NEXT <= MIX_SEL_REG; + if (CPU_FLASH_COMPLETE='1') then CPU_FLASH_DATA_NEXT <= flash_do_slow; CPU_FLASH_REQUEST_NEXT <= '0'; @@ -1577,13 +1604,14 @@ PSG_PROFILESEL_NEXT <= flash_do_slow(30 downto 29); -- 31 reserved when "1" => - SID_FILTER1_NEXT <= flash_do_slow(1 downto 0); - -- 2-3 reserved - SID_FILTER2_NEXT <= flash_do_slow(5 downto 4); - -- 6-7 reserved + SID_FILTER1_NEXT <= flash_do_slow(2 downto 0); + -- 3 reserved + SID_FILTER2_NEXT <= flash_do_slow(6 downto 4); + -- 7 reserved RESTRICT_CAPABILITY_NEXT <= flash_do_slow(12 downto 8); -- 13-15 reserved - -- 16-23 reserved (used in sidmax) + -- 21-23 reserved (used in sidmax) + MIX_SEL_NEXT(4 downto 0) <= flash_do_slow(20 downto 16); -- (clash with sidmix) CHANNEL_EN_NEXT <= flash_do_slow(28 downto 24); -- 29-31 reserved when others => @@ -1619,9 +1647,8 @@ end if; if (addr_decoded4(6)='1') then - SID_FILTER1_NEXT <= WRITE_DATA(1 downto 0); - SID_FILTER2_NEXT <= WRITE_DATA(5 downto 4); - -- (3 downto 1) reserved in case we want all revisions! + SID_FILTER1_NEXT <= WRITE_DATA(2 downto 0); + SID_FILTER2_NEXT <= WRITE_DATA(6 downto 4); end if; if (addr_decoded4(7)='1') then @@ -1628,6 +1655,10 @@ RESTRICT_CAPABILITY_NEXT(4 downto 0) <= WRITE_DATA(4 downto 0); end if; + if (addr_decoded4(8)='1') then + MIX_SEL_NEXT(4 downto 0) <= WRITE_DATA(4 downto 0); + end if; + if (addr_decoded4(9)='1') then CHANNEL_EN_NEXT(4 downto 0) <= WRITE_DATA(4 downto 0); end if; @@ -1676,6 +1707,7 @@ process(addr_decoded4,VERSION_LOC_REG, SATURATE_REG,CHANNEL_MODE_REG,IRQ_EN_REG,DETECT_RIGHT_REG, POST_DIVIDE_REG, GTIA_ENABLE_REG, +ADC_VOLUME_REG, SIO_DATA_VOLUME_REG, PSG_FREQ_REG, PSG_STEREOMODE_REG, PSG_PROFILESEL_REG, PSG_ENVELOPE16_REG, SID_FILTER1_REG, SID_FILTER2_REG, CPU_FLASH_CFG_REG,CPU_FLASH_ADDR_REG,CPU_FLASH_DATA_REG, @@ -1682,7 +1714,8 @@ CPU_FLASH_REQUEST_REG, CPU_FLASH_WRITE_N_REG, RESTRICT_CAPABILITY_REG, CHANNEL_EN_REG, -PAL_REG +PAL_REG, +MIX_SEL_REG ) variable ACTUAL_CAPABILITY : std_logic_vector(7 downto 0); begin @@ -1785,12 +1818,12 @@ CONFIG_DO(6 downto 5) <= PSG_PROFILESEL_REG; end if; - if (addr_decoded4(6)='1') then + if (addr_decoded4(6)='1') then -- different use on sidmax CONFIG_DO <= (others=>'0'); - CONFIG_DO(1 downto 0) <= SID_FILTER1_REG; - -- (3 downto 2) reserved in case we want more filter options - CONFIG_DO(5 downto 4) <= SID_FILTER2_REG; - -- (7 downto 6) reserved in case we want more filter options + CONFIG_DO(2 downto 0) <= SID_FILTER1_REG; + -- (3 downto 3) reserved in case we want more filter options + CONFIG_DO(6 downto 4) <= SID_FILTER2_REG; + -- (7 downto 7) reserved in case we want more filter options end if; if (addr_decoded4(7)='1') then @@ -1797,6 +1830,10 @@ CONFIG_DO(4 downto 0) <= RESTRICT_CAPABILITY_REG(4 downto 0); end if; + if (addr_decoded4(8)='1') then -- different use on sidmax + CONFIG_DO(4 downto 0) <= MIX_SEL_REG(4 downto 0); + end if; + if (addr_decoded4(9)='1') then CONFIG_DO(4 downto 0) <= CHANNEL_EN_REG(4 downto 0); end if; @@ -1876,7 +1913,14 @@ R_CH4 => unsigned_to_signed(PSG_AUDIO_UNSIGNED(1)), B_CH0 => GTIA_AUDIO_SIGNED, B_CH1 => unsigned_to_signed(SIO_AUDIO_UNSIGNED), - + + MUTE_CHANNEL => mixer_mute, + + S_AUDIO => mixer_audio_out, + S_LEFT => mixer_l_enable, + S_RIGHT => mixer_r_enable, + S_CHANNEL => mixer_audio_out_channel, + AUDIO_0_SIGNED => AUDIO_MIXED_SIGNED(0), AUDIO_1_SIGNED => AUDIO_MIXED_SIGNED(1), AUDIO_2_SIGNED => AUDIO_MIXED_SIGNED(2), @@ -1883,6 +1927,38 @@ AUDIO_3_SIGNED => AUDIO_MIXED_SIGNED(3) ); +-- provide audio back to: +-- sample enggine -> to record to ram +-- sid ext -> to use filter (mutes original output) +-- S_AUDIO => mixer_audio_out,, +-- S_LEFT => mixer_l_enable, +-- S_RIGHT => mixer_r_enable, +-- S_CHANNEL => mixer_audio_out_channel, + + process(MIXER_SIGNED_REG, mixer_l_enable, mixer_r_enable, mixer_audio_out, MIX_SEL_REG, mixer_audio_out_channel, SID_FILTER1_REG, SID_FILTER2_REG) + begin + MIXER_SIGNED_NEXT <= MIXER_SIGNED_REG; + + mixer_mute <= '0'; + + if (std_logic_vector(mixer_audio_out_channel) = MIX_SEL_REG) then + if (mixer_l_enable='1') then + MIXER_SIGNED_NEXT(0) <= mixer_audio_out; + mixer_mute <= SID_FILTER1_REG(1); + end if; + + if (mixer_r_enable='1') then + MIXER_SIGNED_NEXT(1) <= mixer_audio_out; + mixer_mute <= SID_FILTER2_REG(1); + end if; + end if; + end process; + + SAMPLE_AUDIO_IN_SIGNED <= MIXER_SIGNED_REG; + SID_AUDIO_IN_SIGNED <= MIXER_SIGNED_REG; + +-- sigma delta dither shared component (used in impl 4) + dac_dithergen : entity work.sigmadelta_dither port map ( @@ -2006,7 +2082,7 @@ spdif_out => spdif_out ); - EXT(SPDIF_BIT) <= spdif_out when CHANNEL_EN_REG(4)='1' else 'Z'; + EXT(SPDIF_BIT) <= spdif_out when CHANNEL_EN_REG(4)='1' else 'Z'; -- TODO wrong clock domain end generate spdif_on; -- io extension @@ -2184,6 +2260,8 @@ fir_off : if adc_fir_filter_v4=0 generate adc_out_signed <= adc_in_signed; + FIR_DATA_REQUEST <= '0'; + FIR_DATA_ADDRESS <= (others=>'0'); end generate fir_off; SIO_AUDIO_UNSIGNED <= unsigned(not(adc_use_reg(15))&adc_use_reg(14 downto 0)); Index: atari_chips/pokeyv2/sidmaxv1.vhd =================================================================== --- atari_chips/pokeyv2/sidmaxv1.vhd (revision 1546) +++ atari_chips/pokeyv2/sidmaxv1.vhd (revision 1547) @@ -1081,6 +1081,8 @@ DO => SAMPLE_DO, AUDIO0 => SAMPLE_AUDIO_SIGNED(0), AUDIO1 => SAMPLE_AUDIO_SIGNED(1), + AUDIO_IN0 => to_signed(0,16), + AUDIO_IN1 => to_signed(0,16), IRQ => SAMPLE_IRQ, RAM_ADDR => SAMPLE_RAM_ADDRESS, @@ -1718,6 +1720,8 @@ R_CH4 => unsigned_to_signed(PSG_AUDIO_UNSIGNED(1)), B_CH0 => (others=>'0'), B_CH1 => (others=>'0'), + + MUTE_CHANNEL => '0', AUDIO_0_SIGNED => AUDIO_MIXED_SIGNED(0), AUDIO_1_SIGNED => open,