CART and OS9 improvements. Cycle accurate 6809 at up to 9.54 Mhz.
CTF = Compile Time Feature... 1. Interrupt system restored to previous code - improved compadibility. 2. Changed to cycle accurate 6809 (Greg Miller) at speeds up to 9.56Mhz. [CTF] 3. Recoded sdc and fdc to only have one instance of the wd1773. 4. Re-added software disable in sdc [Ext 'g']. 5. Recoded Cartridge bank switching to only exist when MiSTer slot 3 is selected. [removed soft multipak select] 6. Moved CoCo Hardware RS-232 from always existing to only existing in multipak slot 1. 7. Changed ADRS (SDS sig) decoding to = FF40-FF5f per hardware. 8. Fixed coding problem in os9 driver llcocosdc to work with MPI properly. [CTF] 9. Set default disk size to constant $555555 to fix os9 redirect problem. [CTF] 10 Disabled GART [GIMEX hardware DMA] to prevent OS9 from detecting GIMEX. [CTF] 11 Corrected missing begin statement in master timing loop. 12. Fixed Donkey King DAPD issue in Tom Mix program [DPAD now moved joysticks to limits under dpad 13. Fixed incorrect addressing of FE00-FEFF for CARTs which gets PITFALL and RAMPAGE working 14. Updated MiSTer framework
This commit is contained in:
1 parent
060ebb2dc3
commit
d593e3fc4e
4 files changed
+96
-125
No files matched your search
@@ -8,6 +8,16 @@
|
|||||||
#
|
#
|
||||||
# --------------------------------------------------------------------------
|
# --------------------------------------------------------------------------
|
||||||
|
|
||||||
|
# --------------------------------------------------------------------------
|
||||||
|
#
|
||||||
|
# MiSTer project
|
||||||
|
#
|
||||||
|
# WARNING WARNING WARNING:
|
||||||
|
# Do not add files to project in Quartus IDE! It will mess this file!
|
||||||
|
# Add the files manually to files.qip file.
|
||||||
|
#
|
||||||
|
# --------------------------------------------------------------------------
|
||||||
|
|
||||||
set_global_assignment -name TOP_LEVEL_ENTITY sys_top
|
set_global_assignment -name TOP_LEVEL_ENTITY sys_top
|
||||||
set_global_assignment -name PARTITION_NETLIST_TYPE SOURCE -section_id Top
|
set_global_assignment -name PARTITION_NETLIST_TYPE SOURCE -section_id Top
|
||||||
set_global_assignment -name PARTITION_FITTER_PRESERVATION_LEVEL PLACEMENT_AND_ROUTING -section_id Top
|
set_global_assignment -name PARTITION_FITTER_PRESERVATION_LEVEL PLACEMENT_AND_ROUTING -section_id Top
|
||||||
@@ -19,7 +29,7 @@ set_global_assignment -name GENERATE_RBF_FILE ON
|
|||||||
set_global_assignment -name PROJECT_OUTPUT_DIRECTORY output_files
|
set_global_assignment -name PROJECT_OUTPUT_DIRECTORY output_files
|
||||||
set_global_assignment -name NUM_PARALLEL_PROCESSORS ALL
|
set_global_assignment -name NUM_PARALLEL_PROCESSORS ALL
|
||||||
set_global_assignment -name SAVE_DISK_SPACE OFF
|
set_global_assignment -name SAVE_DISK_SPACE OFF
|
||||||
set_global_assignment -name SMART_RECOMPILE OFF
|
set_global_assignment -name SMART_RECOMPILE ON
|
||||||
set_global_assignment -name MIN_CORE_JUNCTION_TEMP "-40"
|
set_global_assignment -name MIN_CORE_JUNCTION_TEMP "-40"
|
||||||
set_global_assignment -name MAX_CORE_JUNCTION_TEMP 100
|
set_global_assignment -name MAX_CORE_JUNCTION_TEMP 100
|
||||||
set_global_assignment -name POWER_PRESET_COOLING_SOLUTION "23 MM HEAT SINK WITH 200 LFPM AIRFLOW"
|
set_global_assignment -name POWER_PRESET_COOLING_SOLUTION "23 MM HEAT SINK WITH 200 LFPM AIRFLOW"
|
||||||
@@ -28,7 +38,7 @@ set_global_assignment -name TIMEQUEST_MULTICORNER_ANALYSIS OFF
|
|||||||
set_global_assignment -name OPTIMIZE_POWER_DURING_FITTING OFF
|
set_global_assignment -name OPTIMIZE_POWER_DURING_FITTING OFF
|
||||||
set_global_assignment -name FINAL_PLACEMENT_OPTIMIZATION ALWAYS
|
set_global_assignment -name FINAL_PLACEMENT_OPTIMIZATION ALWAYS
|
||||||
set_global_assignment -name FITTER_EFFORT "STANDARD FIT"
|
set_global_assignment -name FITTER_EFFORT "STANDARD FIT"
|
||||||
set_global_assignment -name OPTIMIZATION_MODE "AGGRESSIVE PERFORMANCE"
|
set_global_assignment -name OPTIMIZATION_MODE "HIGH PERFORMANCE EFFORT"
|
||||||
set_global_assignment -name ALLOW_POWER_UP_DONT_CARE ON
|
set_global_assignment -name ALLOW_POWER_UP_DONT_CARE ON
|
||||||
set_global_assignment -name QII_AUTO_PACKED_REGISTERS NORMAL
|
set_global_assignment -name QII_AUTO_PACKED_REGISTERS NORMAL
|
||||||
set_global_assignment -name ROUTER_LCELL_INSERTION_AND_LOGIC_DUPLICATION ON
|
set_global_assignment -name ROUTER_LCELL_INSERTION_AND_LOGIC_DUPLICATION ON
|
||||||
@@ -55,121 +65,30 @@ set_global_assignment -name SEED 1
|
|||||||
#enable it only if 8bit indexed mode is used in core
|
#enable it only if 8bit indexed mode is used in core
|
||||||
#set_global_assignment -name VERILOG_MACRO "MISTER_FB_PALETTE=1"
|
#set_global_assignment -name VERILOG_MACRO "MISTER_FB_PALETTE=1"
|
||||||
|
|
||||||
#set_global_assignment -name VERILOG_MACRO "MISTER_DUAL_SDRAM=1"
|
|
||||||
|
|
||||||
#do not enable DEBUG_NOHDMI in release!
|
#do not enable DEBUG_NOHDMI in release!
|
||||||
#set_global_assignment -name VERILOG_MACRO "MISTER_DEBUG_NOHDMI=1"
|
#set_global_assignment -name VERILOG_MACRO "MISTER_DEBUG_NOHDMI=1"
|
||||||
|
|
||||||
|
# disable bilinear filtering when downscaling
|
||||||
|
#set_global_assignment -name VERILOG_MACRO "MISTER_DOWNSCALE_NN=1"
|
||||||
|
|
||||||
|
# disable adaptive scanline filtering
|
||||||
|
#set_global_assignment -name VERILOG_MACRO "MISTER_DISABLE_ADAPTIVE=1"
|
||||||
|
|
||||||
|
#use only 1MB per frame for scaler to free ~21MB DDR3 RAM
|
||||||
|
#set_global_assignment -name VERILOG_MACRO "MISTER_SMALL_VBUF=1"
|
||||||
|
|
||||||
|
# Disable YC / Composite output to save some resources
|
||||||
|
#set_global_assignment -name VERILOG_MACRO "MISTER_DISABLE_YC=1"
|
||||||
|
|
||||||
|
# Disable ALSA audio output to save some resources
|
||||||
|
#set_global_assignment -name VERILOG_MACRO "MISTER_DISABLE_ALSA=1"
|
||||||
|
|
||||||
|
|
||||||
source sys/sys.tcl
|
source sys/sys.tcl
|
||||||
source sys/sys_analog.tcl
|
source sys/sys_analog.tcl
|
||||||
source files.qip
|
source files.qip
|
||||||
|
|
||||||
set_global_assignment -name ENABLE_SIGNALTAP ON
|
set_global_assignment -name ENABLE_SIGNALTAP OFF
|
||||||
set_global_assignment -name USE_SIGNALTAP_FILE HD2.stp
|
set_global_assignment -name USE_SIGNALTAP_FILE Video_Explorer.stp
|
||||||
set_global_assignment -name SIGNALTAP_FILE Video_Explorer.stp
|
set_global_assignment -name SIGNALTAP_FILE Video_Explorer.stp
|
||||||
set_global_assignment -name SIGNALTAP_FILE rom_Exploror.stp1
|
|
||||||
set_global_assignment -name SOURCE_FILE rom_Exploror.stp1
|
|
||||||
set_global_assignment -name SIGNALTAP_FILE Serial.stp
|
|
||||||
set_global_assignment -name SIGNALTAP_FILE AMW.stp
|
|
||||||
set_global_assignment -name SIGNALTAP_FILE HD.stp
|
|
||||||
set_global_assignment -name SIGNALTAP_FILE reset.stp
|
|
||||||
<<<<<<< HEAD
|
|
||||||
set_global_assignment -name SIGNALTAP_FILE Vsync.stp
|
|
||||||
set_global_assignment -name SIGNALTAP_FILE HD2.stp
|
|
||||||
set_global_assignment -name SLD_FILE db/HD2_auto_stripped.stp
|
|
||||||
set_instance_assignment -name PARTITION_HIERARCHY root_partition -to | -section_id Top
|
set_instance_assignment -name PARTITION_HIERARCHY root_partition -to | -section_id Top
|
||||||
=======
|
|
||||||
set_global_assignment -name SLD_NODE_CREATOR_ID 110 -section_id auto_signaltap_0
|
|
||||||
set_global_assignment -name SLD_NODE_ENTITY_NAME sld_signaltap -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_clk -to "emu:emu|coco3fpga:coco3|CLK_57" -section_id auto_signaltap_0
|
|
||||||
set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_RAM_BLOCK_TYPE=AUTO" -section_id auto_signaltap_0
|
|
||||||
set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_NODE_INFO=805334528" -section_id auto_signaltap_0
|
|
||||||
set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_POWER_UP_TRIGGER=0" -section_id auto_signaltap_0
|
|
||||||
set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_STORAGE_QUALIFIER_INVERSION_MASK_LENGTH=0" -section_id auto_signaltap_0
|
|
||||||
set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_SEGMENT_SIZE=16384" -section_id auto_signaltap_0
|
|
||||||
set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_ATTRIBUTE_MEM_MODE=OFF" -section_id auto_signaltap_0
|
|
||||||
set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_STATE_FLOW_USE_GENERATED=0" -section_id auto_signaltap_0
|
|
||||||
set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_STATE_BITS=11" -section_id auto_signaltap_0
|
|
||||||
set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_BUFFER_FULL_STOP=1" -section_id auto_signaltap_0
|
|
||||||
set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_CURRENT_RESOURCE_WIDTH=1" -section_id auto_signaltap_0
|
|
||||||
set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_INCREMENTAL_ROUTING=1" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[0] -to auto_signaltap_0|vcc -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[1] -to auto_signaltap_0|gnd -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[3] -to auto_signaltap_0|vcc -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[4] -to auto_signaltap_0|vcc -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[5] -to auto_signaltap_0|gnd -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[8] -to auto_signaltap_0|vcc -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[11] -to auto_signaltap_0|gnd -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[12] -to auto_signaltap_0|gnd -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[13] -to auto_signaltap_0|gnd -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[15] -to auto_signaltap_0|vcc -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[17] -to auto_signaltap_0|vcc -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[20] -to auto_signaltap_0|vcc -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[21] -to auto_signaltap_0|vcc -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[29] -to auto_signaltap_0|vcc -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[30] -to auto_signaltap_0|gnd -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[31] -to auto_signaltap_0|vcc -section_id auto_signaltap_0
|
|
||||||
set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_TRIGGER_LEVEL=1" -section_id auto_signaltap_0
|
|
||||||
set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_SAMPLE_DEPTH=16384" -section_id auto_signaltap_0
|
|
||||||
set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_TRIGGER_IN_ENABLED=0" -section_id auto_signaltap_0
|
|
||||||
set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_TRIGGER_PIPELINE=0" -section_id auto_signaltap_0
|
|
||||||
set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_RAM_PIPELINE=0" -section_id auto_signaltap_0
|
|
||||||
set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_COUNTER_PIPELINE=0" -section_id auto_signaltap_0
|
|
||||||
set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_ADVANCED_TRIGGER_ENTITY=basic,1," -section_id auto_signaltap_0
|
|
||||||
set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_TRIGGER_LEVEL_PIPELINE=1" -section_id auto_signaltap_0
|
|
||||||
set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_ENABLE_ADVANCED_TRIGGER=0" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[19] -to auto_signaltap_0|vcc -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[22] -to auto_signaltap_0|gnd -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[23] -to auto_signaltap_0|gnd -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[2] -to auto_signaltap_0|vcc -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[9] -to auto_signaltap_0|gnd -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[10] -to auto_signaltap_0|gnd -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[14] -to auto_signaltap_0|gnd -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[18] -to auto_signaltap_0|gnd -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[24] -to auto_signaltap_0|vcc -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[26] -to auto_signaltap_0|gnd -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[28] -to auto_signaltap_0|vcc -section_id auto_signaltap_0
|
|
||||||
set_global_assignment -name SIGNALTAP_FILE Vsync.stp
|
|
||||||
set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_trigger_in[0] -to "emu:emu|coco3fpga:coco3|COCO3VIDEO:MISTER_COCOVID|LINE[0]" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_trigger_in[1] -to "emu:emu|coco3fpga:coco3|COCO3VIDEO:MISTER_COCOVID|LINE[1]" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_trigger_in[2] -to "emu:emu|coco3fpga:coco3|COCO3VIDEO:MISTER_COCOVID|LINE[2]" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_trigger_in[3] -to "emu:emu|coco3fpga:coco3|COCO3VIDEO:MISTER_COCOVID|LINE[3]" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_trigger_in[4] -to "emu:emu|coco3fpga:coco3|COCO3VIDEO:MISTER_COCOVID|LINE[4]" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_trigger_in[5] -to "emu:emu|coco3fpga:coco3|COCO3VIDEO:MISTER_COCOVID|LINE[5]" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_trigger_in[6] -to "emu:emu|coco3fpga:coco3|COCO3VIDEO:MISTER_COCOVID|LINE[6]" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_trigger_in[7] -to "emu:emu|coco3fpga:coco3|COCO3VIDEO:MISTER_COCOVID|LINE[7]" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_trigger_in[8] -to "emu:emu|coco3fpga:coco3|COCO3VIDEO:MISTER_COCOVID|LINE[8]" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_trigger_in[9] -to "emu:emu|coco3fpga:coco3|COCO3VIDEO:MISTER_COCOVID|LINE[9]" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_trigger_in[10] -to "emu:emu|coco3fpga:coco3|COCO3VIDEO:MISTER_COCOVID|VSYNC_FLAG" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_trigger_in[11] -to "emu:emu|coco3fpga:coco3|COCO3VIDEO:MISTER_COCOVID|VSYNC_N" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_data_in[0] -to "emu:emu|coco3fpga:coco3|COCO3VIDEO:MISTER_COCOVID|LINE[0]" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_data_in[1] -to "emu:emu|coco3fpga:coco3|COCO3VIDEO:MISTER_COCOVID|LINE[1]" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_data_in[2] -to "emu:emu|coco3fpga:coco3|COCO3VIDEO:MISTER_COCOVID|LINE[2]" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_data_in[3] -to "emu:emu|coco3fpga:coco3|COCO3VIDEO:MISTER_COCOVID|LINE[3]" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_data_in[4] -to "emu:emu|coco3fpga:coco3|COCO3VIDEO:MISTER_COCOVID|LINE[4]" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_data_in[5] -to "emu:emu|coco3fpga:coco3|COCO3VIDEO:MISTER_COCOVID|LINE[5]" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_data_in[6] -to "emu:emu|coco3fpga:coco3|COCO3VIDEO:MISTER_COCOVID|LINE[6]" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_data_in[7] -to "emu:emu|coco3fpga:coco3|COCO3VIDEO:MISTER_COCOVID|LINE[7]" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_data_in[8] -to "emu:emu|coco3fpga:coco3|COCO3VIDEO:MISTER_COCOVID|LINE[8]" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_data_in[9] -to "emu:emu|coco3fpga:coco3|COCO3VIDEO:MISTER_COCOVID|LINE[9]" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_data_in[10] -to "emu:emu|coco3fpga:coco3|COCO3VIDEO:MISTER_COCOVID|VSYNC_FLAG" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_data_in[11] -to "emu:emu|coco3fpga:coco3|COCO3VIDEO:MISTER_COCOVID|VSYNC_N" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[6] -to auto_signaltap_0|vcc -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[16] -to auto_signaltap_0|vcc -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[25] -to auto_signaltap_0|gnd -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_trigger_in[12] -to "emu:emu|coco3fpga:coco3|RST_FF02_N" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_trigger_in[13] -to "emu:emu|coco3fpga:coco3|VSYNC1_IRQ_N" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_trigger_in[14] -to "emu:emu|coco3fpga:coco3|VSYNC1_IRQ_STAT_N" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_data_in[12] -to "emu:emu|coco3fpga:coco3|RST_FF02_N" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_data_in[13] -to "emu:emu|coco3fpga:coco3|VSYNC1_IRQ_N" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_data_in[14] -to "emu:emu|coco3fpga:coco3|VSYNC1_IRQ_STAT_N" -section_id auto_signaltap_0
|
|
||||||
set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_DATA_BITS=15" -section_id auto_signaltap_0
|
|
||||||
set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_TRIGGER_BITS=15" -section_id auto_signaltap_0
|
|
||||||
set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_STORAGE_QUALIFIER_BITS=15" -section_id auto_signaltap_0
|
|
||||||
set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_INVERSION_MASK=0000000000000000000000000000000000000000000000000000000000000000000000000" -section_id auto_signaltap_0
|
|
||||||
set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_INVERSION_MASK_LENGTH=73" -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[7] -to auto_signaltap_0|gnd -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[27] -to auto_signaltap_0|gnd -section_id auto_signaltap_0
|
|
||||||
set_instance_assignment -name PARTITION_HIERARCHY root_partition -to | -section_id Top
|
|
||||||
set_global_assignment -name SLD_FILE db/Vsync_auto_stripped.stp
|
|
||||||
>>>>>>> 94bfcdbf6b819b4e234858756d208ee02f1a0a46
|
|
||||||
Binary file not shown.
+23
-11
@@ -124,6 +124,12 @@ module sys_top
|
|||||||
inout [6:0] USER_IO
|
inout [6:0] USER_IO
|
||||||
);
|
);
|
||||||
|
|
||||||
|
`ifdef MISTER_DUAL_SDRAM
|
||||||
|
`ifndef MISTER_DISABLE_YC
|
||||||
|
`define MISTER_DISABLE_YC
|
||||||
|
`endif
|
||||||
|
`endif
|
||||||
|
|
||||||
////////////////////// Secondary SD ///////////////////////////////////
|
////////////////////// Secondary SD ///////////////////////////////////
|
||||||
wire SD_CS, SD_CLK, SD_MOSI;
|
wire SD_CS, SD_CLK, SD_MOSI;
|
||||||
|
|
||||||
@@ -519,17 +525,6 @@ cyclonev_hps_interface_peripheral_uart uart
|
|||||||
.txd(uart_txd)
|
.txd(uart_txd)
|
||||||
);
|
);
|
||||||
|
|
||||||
wire aspi_sck,aspi_mosi,aspi_ss,aspi_miso;
|
|
||||||
cyclonev_hps_interface_peripheral_spi_master spi
|
|
||||||
(
|
|
||||||
.sclk_out(aspi_sck),
|
|
||||||
.txd(aspi_mosi), // mosi
|
|
||||||
.rxd(aspi_miso), // miso
|
|
||||||
|
|
||||||
.ss_0_n(aspi_ss),
|
|
||||||
.ss_in_n(1)
|
|
||||||
);
|
|
||||||
|
|
||||||
wire [63:0] f2h_irq = {video_sync,HDMI_TX_VS};
|
wire [63:0] f2h_irq = {video_sync,HDMI_TX_VS};
|
||||||
cyclonev_hps_interface_interrupts interrupts
|
cyclonev_hps_interface_interrupts interrupts
|
||||||
(
|
(
|
||||||
@@ -635,11 +630,13 @@ ddr_svc ddr_svc
|
|||||||
.ram_write(ram2_write),
|
.ram_write(ram2_write),
|
||||||
.ram_bcnt(ram2_bcnt),
|
.ram_bcnt(ram2_bcnt),
|
||||||
|
|
||||||
|
`ifndef MISTER_DISABLE_ALSA
|
||||||
.ch0_addr(alsa_address),
|
.ch0_addr(alsa_address),
|
||||||
.ch0_burst(1),
|
.ch0_burst(1),
|
||||||
.ch0_data(alsa_readdata),
|
.ch0_data(alsa_readdata),
|
||||||
.ch0_req(alsa_req),
|
.ch0_req(alsa_req),
|
||||||
.ch0_ready(alsa_ready),
|
.ch0_ready(alsa_ready),
|
||||||
|
`endif
|
||||||
|
|
||||||
.ch1_addr(pal_addr),
|
.ch1_addr(pal_addr),
|
||||||
.ch1_burst(128),
|
.ch1_burst(128),
|
||||||
@@ -1477,8 +1474,10 @@ audio_out audio_out
|
|||||||
.core_l(audio_l),
|
.core_l(audio_l),
|
||||||
.core_r(audio_r),
|
.core_r(audio_r),
|
||||||
|
|
||||||
|
`ifndef MISTER_DISABLE_ALSA
|
||||||
.alsa_l(alsa_l),
|
.alsa_l(alsa_l),
|
||||||
.alsa_r(alsa_r),
|
.alsa_r(alsa_r),
|
||||||
|
`endif
|
||||||
|
|
||||||
.i2s_bclk(HDMI_SCLK),
|
.i2s_bclk(HDMI_SCLK),
|
||||||
.i2s_lrclk(HDMI_LRCLK),
|
.i2s_lrclk(HDMI_LRCLK),
|
||||||
@@ -1491,6 +1490,18 @@ audio_out audio_out
|
|||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
|
`ifndef MISTER_DISABLE_ALSA
|
||||||
|
wire aspi_sck,aspi_mosi,aspi_ss,aspi_miso;
|
||||||
|
cyclonev_hps_interface_peripheral_spi_master spi
|
||||||
|
(
|
||||||
|
.sclk_out(aspi_sck),
|
||||||
|
.txd(aspi_mosi), // mosi
|
||||||
|
.rxd(aspi_miso), // miso
|
||||||
|
|
||||||
|
.ss_0_n(aspi_ss),
|
||||||
|
.ss_in_n(1)
|
||||||
|
);
|
||||||
|
|
||||||
wire [28:0] alsa_address;
|
wire [28:0] alsa_address;
|
||||||
wire [63:0] alsa_readdata;
|
wire [63:0] alsa_readdata;
|
||||||
wire alsa_ready;
|
wire alsa_ready;
|
||||||
@@ -1517,6 +1528,7 @@ alsa alsa
|
|||||||
.pcm_l(alsa_l),
|
.pcm_l(alsa_l),
|
||||||
.pcm_r(alsa_r)
|
.pcm_r(alsa_r)
|
||||||
);
|
);
|
||||||
|
`endif
|
||||||
|
|
||||||
//////////////// User I/O (USB 3.0 connector) /////////////////////////
|
//////////////// User I/O (USB 3.0 connector) /////////////////////////
|
||||||
|
|
||||||
|
|||||||
+43
-3
@@ -173,7 +173,7 @@ sys_umul #(12,12) mul(CLK_VIDEO,mul_start,mul_run, mul_arg1,mul_arg2,mul_res);
|
|||||||
wire [11:0] wideres = mul_res[11:0] + hsize;
|
wire [11:0] wideres = mul_res[11:0] + hsize;
|
||||||
|
|
||||||
always @(posedge CLK_VIDEO) begin
|
always @(posedge CLK_VIDEO) begin
|
||||||
reg [11:0] oheight,wres;
|
reg [11:0] oheight,htarget,wres;
|
||||||
reg [12:0] arxf,aryf;
|
reg [12:0] arxf,aryf;
|
||||||
reg [3:0] cnt;
|
reg [3:0] cnt;
|
||||||
reg narrow;
|
reg narrow;
|
||||||
@@ -188,11 +188,18 @@ always @(posedge CLK_VIDEO) begin
|
|||||||
else if(~div_start & ~div_run & ~mul_start & ~mul_run) begin
|
else if(~div_start & ~div_run & ~mul_start & ~mul_run) begin
|
||||||
cnt <= cnt + 1'd1;
|
cnt <= cnt + 1'd1;
|
||||||
case(cnt)
|
case(cnt)
|
||||||
|
// example ideal and non-ideal cases:
|
||||||
|
// [1] 720x400 4:3 VGA 80x25 text-mode (non-square pixels)
|
||||||
|
// [2] 640x480 4:3 VGA graphics mode (square pixels)
|
||||||
|
// [3] 512x512 4:3 X68000 graphics mode (non-square pixels)
|
||||||
0: begin
|
0: begin
|
||||||
div_num <= HDMI_HEIGHT;
|
div_num <= HDMI_HEIGHT;
|
||||||
div_den <= vsize;
|
div_den <= vsize;
|
||||||
div_start <= 1;
|
div_start <= 1;
|
||||||
end
|
end
|
||||||
|
// [1] 1080 / 400 -> 2
|
||||||
|
// [2] 1080 / 480 -> 2
|
||||||
|
// [3] 1080 / 512 -> 2
|
||||||
|
|
||||||
1: if(!div_res[11:0]) begin
|
1: if(!div_res[11:0]) begin
|
||||||
// screen resolution is lower than video resolution.
|
// screen resolution is lower than video resolution.
|
||||||
@@ -206,6 +213,9 @@ always @(posedge CLK_VIDEO) begin
|
|||||||
mul_arg2 <= div_res[11:0];
|
mul_arg2 <= div_res[11:0];
|
||||||
mul_start <= 1;
|
mul_start <= 1;
|
||||||
end
|
end
|
||||||
|
// [1] 1080 / 400 * 400 -> 800
|
||||||
|
// [2] 1080 / 480 * 480 -> 960
|
||||||
|
// [3] 1080 / 512 * 512 -> 1024
|
||||||
|
|
||||||
2: begin
|
2: begin
|
||||||
oheight <= mul_res[11:0];
|
oheight <= mul_res[11:0];
|
||||||
@@ -219,24 +229,39 @@ always @(posedge CLK_VIDEO) begin
|
|||||||
mul_arg2 <= arx_i;
|
mul_arg2 <= arx_i;
|
||||||
mul_start <= 1;
|
mul_start <= 1;
|
||||||
end
|
end
|
||||||
|
// [1] 1080 / 400 * 400 * 4 -> 3200
|
||||||
|
// [2] 1080 / 480 * 480 * 4 -> 3840
|
||||||
|
// [3] 1080 / 512 * 512 * 4 -> 4096
|
||||||
|
|
||||||
4: begin
|
4: begin
|
||||||
div_num <= mul_res;
|
div_num <= mul_res;
|
||||||
div_den <= ary_i;
|
div_den <= ary_i;
|
||||||
div_start <= 1;
|
div_start <= 1;
|
||||||
end
|
end
|
||||||
|
// [1] 1080 / 480 * 480 * 4 / 3 -> 1066
|
||||||
|
// [2] 1080 / 480 * 480 * 4 / 3 -> 1280
|
||||||
|
// [3] 1080 / 512 * 512 * 4 / 3 -> 1365
|
||||||
|
// saved as htarget
|
||||||
|
|
||||||
5: begin
|
5: begin
|
||||||
|
htarget <= div_res[11:0];
|
||||||
div_num <= div_res;
|
div_num <= div_res;
|
||||||
div_den <= hsize;
|
div_den <= hsize;
|
||||||
div_start <= 1;
|
div_start <= 1;
|
||||||
end
|
end
|
||||||
|
// computes wide scaling factor as a ceiling division
|
||||||
|
// [1] 1080 / 400 * 400 * 4 / 3 / 720 -> 1
|
||||||
|
// [2] 1080 / 480 * 480 * 4 / 3 / 640 -> 2
|
||||||
|
// [3] 1080 / 512 * 512 * 4 / 3 / 512 -> 2
|
||||||
|
|
||||||
6: begin
|
6: begin
|
||||||
mul_arg1 <= hsize;
|
mul_arg1 <= hsize;
|
||||||
mul_arg2 <= div_res[11:0] ? div_res[11:0] : 12'd1;
|
mul_arg2 <= div_res[11:0] ? div_res[11:0] : 12'd1;
|
||||||
mul_start <= 1;
|
mul_start <= 1;
|
||||||
end
|
end
|
||||||
|
// [1] 1080 / 400 * 400 * 4 / 3 / 720 * 720 -> 720
|
||||||
|
// [2] 1080 / 480 * 480 * 4 / 3 / 640 * 640 -> 1280
|
||||||
|
// [3] 1080 / 512 * 512 * 4 / 3 / 512 * 512 -> 1024
|
||||||
|
|
||||||
7: if(mul_res <= HDMI_WIDTH) begin
|
7: if(mul_res <= HDMI_WIDTH) begin
|
||||||
cnt <= 10;
|
cnt <= 10;
|
||||||
@@ -247,17 +272,32 @@ always @(posedge CLK_VIDEO) begin
|
|||||||
div_den <= hsize;
|
div_den <= hsize;
|
||||||
div_start <= 1;
|
div_start <= 1;
|
||||||
end
|
end
|
||||||
|
// [1] 1920 / 720 -> 2
|
||||||
|
// [2] 1920 / 640 -> 3
|
||||||
|
// [3] 1920 / 512 -> 3
|
||||||
|
|
||||||
9: begin
|
9: begin
|
||||||
mul_arg1 <= hsize;
|
mul_arg1 <= hsize;
|
||||||
mul_arg2 <= div_res[11:0] ? div_res[11:0] : 12'd1;
|
mul_arg2 <= div_res[11:0] ? div_res[11:0] : 12'd1;
|
||||||
mul_start <= 1;
|
mul_start <= 1;
|
||||||
end
|
end
|
||||||
|
// [1] 1920 / 720 * 720 -> 1440
|
||||||
|
// [2] 1920 / 640 * 640 -> 1920
|
||||||
|
// [3] 1920 / 512 * 512 -> 1536
|
||||||
|
|
||||||
10: begin
|
10: begin
|
||||||
narrow <= ((div_num[11:0] - mul_res[11:0]) <= (wideres - div_num[11:0])) || (wideres > HDMI_WIDTH);
|
narrow <= ((htarget - mul_res[11:0]) <= (wideres - htarget)) || (wideres > HDMI_WIDTH);
|
||||||
wres <= wideres;
|
wres <= mul_res[11:0] == htarget ? mul_res[11:0] : wideres;
|
||||||
end
|
end
|
||||||
|
// [1] 1066 - 720 = 346 <= 1440 - 1066 = 374 || 1440 > 1920 -> true
|
||||||
|
// [2] 1280 - 1280 = 0 <= 1920 - 1280 = 640 || 1920 > 1920 -> true
|
||||||
|
// [3] 1365 - 1024 = 341 <= 1536 - 1365 = 171 || 1536 > 1920 -> false
|
||||||
|
// 1. narrow flag is true when mul_res[11:0] narrow width is closer to
|
||||||
|
// htarget aspect ratio target width or when wideres wider width
|
||||||
|
// does not fit to the screen.
|
||||||
|
// 2. wres becomes wideres only when mul_res[11:0] narrow width not equal
|
||||||
|
// to target width, meaning it is not optimal for source aspect ratio.
|
||||||
|
// otherwise it is set to narrow width that is optimal.
|
||||||
|
|
||||||
11: begin
|
11: begin
|
||||||
case(SCALE)
|
case(SCALE)
|
||||||
|
|||||||
Reference in new issue
Block a user