Project

General

Profile

« Previous | Next » 

Revision 1499

Added by markw 3 days ago

Disable lowpass again, remembered the filter is explicit for spdif output (where it matters). Make spdif component explicitly have a port for left/right. Get all versions building again (some needed old dac for space reasons). Change default volume for adc and sio mixing for v4.5 (SHOULD not need the filtering there, testing now).

View differences:

build.sh
"a6_bit" => 3,
"a7_bit" => 19, #use CS1
"cs1_bit" => 20, #force high
"optimisearea" => 1
"optimisearea" => 1,
"sigmadelta_implementation" => 2
},
},
"10M16SCU169C8G" =>
......
"ps2clk_bit" => 7,
"ps2dat_bit" => 8,
"ext_bits"=> 11,
"sigmadelta_implementation" => 2
},
"stereo_psg_covox_auto" =>
{
......
#"a7_bit" => 19, #use CS1
"ext_bits"=> 11,
#"cs1_bit" => 20, #force high
"sigmadelta_implementation" => 2
},
},
"10M16SCU169C8G" =>
......
"paddle_comp"=>0,
"enable_iox"=>0,
"enable_adc"=>0,
"adc_audio_detect"=>1,
"adc_fir_filter_v4"=>1,
"adc_volume"=>3,
"sio_data_volume"=>2,
"pll_v2" => 0,
"optimisearea" => 1,
},
......
"paddle_comp"=>0,
"enable_iox"=>0,
"enable_adc"=>1,
"adc_audio_detect"=>1,
"adc_fir_filter_v4"=>1,
"adc_volume"=>3,
"sio_data_volume"=>2,
"pll_v2" => 0,
"optimisearea" => 1,
},
......
"paddle_comp"=>0,
"enable_iox"=>0,
"enable_adc"=>1,
"adc_audio_detect"=>1,
"adc_fir_filter_v4"=>1,
"adc_volume"=>3,
"sio_data_volume"=>2,
"pll_v2" => 0,
"optimisearea" => 1,
},
......
"paddle_comp"=>0,
"enable_iox"=>0,
"enable_adc"=>1,
"adc_audio_detect"=>1,
"adc_fir_filter_v4"=>1,
"adc_volume"=>3,
"sio_data_volume"=>2,
"pll_v2" => 0,
"optimisearea" => 1,
},
......
"paddle_comp"=>0,
"enable_iox"=>0,
"enable_adc"=>1,
"adc_audio_detect"=>1,
"adc_fir_filter_v4"=>1,
"adc_volume"=>3,
"sio_data_volume"=>2,
"pll_v2" => 0,
"optimisearea" => 1,
},
......
},
"pokeymax_v4.5" =>
{
"10M16SCU169C8G" =>
{
"full_quad" =>
{
"enable_audout2" => 0,
"pokeys" => 4,
"enable_auto_stereo" => 1,
"enable_sid" => 1,
"enable_psg" => 1,
"enable_covox" => 1,
"enable_sample" => 1,
"enable_flash" => 1,
"enable_spdif" => 1,
"enable_ps2" => 1,
"flash_addr_bits" => 17,
"sid_wave_base" => 79872, #"to_integer(unsigned(x\"13800\"))",
"fancy_switch_bit" => 1,
"a4_bit" => 2,
"a5_bit" => 3,
"a6_bit" => 4,
"a7_bit" => 5,
"ps2clk_bit" => 6,
"ps2dat_bit" => 7,
"gtia_audio_bit" => 8,
"spdif_bit" => 10,
"ext_bits"=> 10,
"paddle_lvds"=>1,
"paddle_comp"=>0,
"enable_iox"=>0,
"enable_adc"=>1,
"adc_volume"=>1,
"sio_data_volume"=>0,
"pll_v2" => 0,
"optimisearea" => 1,
},
"mono" =>
{
"enable_audout2" => 0,
"pokeys" => 1,
"enable_auto_stereo" => 1,
"enable_sid" => 0,
"enable_psg" => 0,
"enable_covox" => 0,
"enable_sample" => 0,
"enable_flash" => 1,
"flash_addr_bits" => 17,
"a4_bit" => 2,
"a5_bit" => 3,
"a6_bit" => 4,
"a7_bit" => 5,
"fancy_switch_bit" => 1,
"ps2clk_bit" => 6,
"ps2dat_bit" => 7,
"gtia_audio_bit" => 8,
"spdif_bit" => 10,
"ext_bits"=> 10,
"paddle_lvds"=>1,
"paddle_comp"=>0,
"enable_iox"=>0,
"enable_adc"=>1,
"adc_volume"=>1,
"sio_data_volume"=>0,
"pll_v2" => 0,
"optimisearea" => 1,
},
},
"10M08SCU169C8G" =>
{
"full_stereo_sample" =>
......
"enable_flash" => 1,
"enable_spdif" => 0,
"enable_ps2" => 0,
"fancy_switch_bit" => 1,
"a4_bit" => 2,
"a5_bit" => 3,
"a6_bit" => 4,
......
"ps2clk_bit" => 6,
"ps2dat_bit" => 7,
"gtia_audio_bit" => 8,
"fancy_switch_bit" => 9,
"spdif_bit" => 1,
"spdif_bit" => 10,
"ext_bits"=> 10,
"paddle_lvds"=>1,
"paddle_comp"=>0,
"enable_iox"=>0,
"enable_adc"=>0,
"adc_volume"=>1,
"sio_data_volume"=>0,
"pll_v2" => 0,
"optimisearea" => 1,
},
......
"enable_flash" => 1,
"enable_spdif" => 1,
"enable_ps2" => 0,
"fancy_switch_bit" => 1,
"a4_bit" => 2,
"a5_bit" => 3,
"a6_bit" => 4,
......
#"gtia_audio_bit" => 9, PASS
#"gtia_audio_bit" => 5, PASS
"gtia_audio_bit" => 8,
"fancy_switch_bit" => 9,
"spdif_bit" => 1,
"spdif_bit" => 10,
"ext_bits"=> 10,
"paddle_lvds"=>1,
"paddle_comp"=>0,
"enable_iox"=>0,
"enable_adc"=>1,
"adc_volume"=>1,
"sio_data_volume"=>0,
"pll_v2" => 0,
"optimisearea" => 1,
},
......
"enable_covox" => 0,
"enable_sample" => 0,
"enable_flash" => 1,
"fancy_switch_bit" => 1,
"a4_bit" => 2,
"a5_bit" => 3,
"a6_bit" => 4,
......
"ps2clk_bit" => 6,
"ps2dat_bit" => 7,
"gtia_audio_bit" => 8,
"fancy_switch_bit" => 9,
"spdif_bit" => 1,
"spdif_bit" => 10,
"ext_bits"=> 10,
"paddle_lvds"=>1,
"paddle_comp"=>0,
"enable_iox"=>0,
"enable_adc"=>1,
"adc_volume"=>1,
"sio_data_volume"=>0,
"pll_v2" => 0,
"optimisearea" => 1,
},
......
next unless ($dir =~ /$wanted_variant/);
}
print "Building $versioncode $name of $typeboard into $dir\n";
`rm -f init*.bin`;
my $sio_data_volume = 2;
my $adc_volume = 0;
if (exists $spec->{"adc_volume"})
{
$adc_volume = $spec->{"adc_volume"}
}
if (exists $spec->{"sio_data_volume"})
{
$adc_volume = $spec->{"sio_data_volume"}
}
`./init adc_volume=$adc_volume sio_data_volume=$sio_data_volume`;
`rm -f init*.hex`;
`./makehexfiles`;
`rm -rf $dir`;
mkdir $dir;
......
#The sof file is compressed
#Reason being that we have a user flash area (UFM) and a config flash area (CFM)
#We steal some of the CFM space for sid wave tables but it needs to be empty
print("quartus_cpf --convert ../convert_secure_${type}_${needs_sid_waves}.cof");
`quartus_cpf --convert ../convert_secure_${type}_${needs_sid_waves}.cof`;
if (int($fpgasize)>=8 and $needs_sid_waves) #We only patch the larger ones, the others do not have space...

Also available in: Unified diff