From 57f064744ed29d02cdf51c367adfbb336d4bc8f6 Mon Sep 17 00:00:00 2001 From: shodge12 <44378937+shodge12@users.noreply.github.com> Date: Thu, 18 Jan 2024 11:24:57 -0500 Subject: [PATCH] PIA Changes 1. For cycle accurate 6809, changed PH2 to cpu_cycle_ena. (Improve timing of control register writes) 2. Changed PIA(s) addressing to alow complete mirror through FF00-FF3F --- CoCo3.qsf | 377 +++++++++++++++++++++++++++++++++++++++++++---- changes.txt | 28 ++++ rtl/coco3fpga.sv | 301 +++++++++++++------------------------ rtl/config.v | 6 +- 4 files changed, 478 insertions(+), 234 deletions(-) create mode 100644 changes.txt diff --git a/CoCo3.qsf b/CoCo3.qsf index cc596c2..ebfff23 100644 --- a/CoCo3.qsf +++ b/CoCo3.qsf @@ -8,16 +8,6 @@ # # -------------------------------------------------------------------------- -# -------------------------------------------------------------------------- -# -# 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 PARTITION_NETLIST_TYPE SOURCE -section_id Top set_global_assignment -name PARTITION_FITTER_PRESERVATION_LEVEL PLACEMENT_AND_ROUTING -section_id Top @@ -38,7 +28,7 @@ set_global_assignment -name TIMEQUEST_MULTICORNER_ANALYSIS OFF set_global_assignment -name OPTIMIZE_POWER_DURING_FITTING OFF set_global_assignment -name FINAL_PLACEMENT_OPTIMIZATION ALWAYS set_global_assignment -name FITTER_EFFORT "STANDARD FIT" -set_global_assignment -name OPTIMIZATION_MODE "HIGH PERFORMANCE EFFORT" +set_global_assignment -name OPTIMIZATION_MODE "AGGRESSIVE PERFORMANCE" set_global_assignment -name ALLOW_POWER_UP_DONT_CARE ON set_global_assignment -name QII_AUTO_PACKED_REGISTERS NORMAL set_global_assignment -name ROUTER_LCELL_INSERTION_AND_LOGIC_DUPLICATION ON @@ -65,30 +55,359 @@ set_global_assignment -name SEED 1 #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_DUAL_SDRAM=1" + #do not enable DEBUG_NOHDMI in release! #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 +set_global_assignment -name FAMILY "Cyclone V" +set_global_assignment -name DEVICE 5CSEBA6U23I7 +set_global_assignment -name DEVICE_FILTER_PACKAGE UFBGA +set_global_assignment -name DEVICE_FILTER_PIN_COUNT 672 +set_global_assignment -name DEVICE_FILTER_SPEED_GRADE 7 +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to ADC_CONVST +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to ADC_SCK +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to ADC_SDI +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to ADC_SDO +set_location_assignment PIN_U9 -to ADC_CONVST +set_location_assignment PIN_V10 -to ADC_SCK +set_location_assignment PIN_AC4 -to ADC_SDI +set_location_assignment PIN_AD4 -to ADC_SDO +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to ARDUINO_IO[*] +set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to ARDUINO_IO[*] +set_instance_assignment -name CURRENT_STRENGTH_NEW "MAXIMUM CURRENT" -to ARDUINO_IO[*] +set_location_assignment PIN_U14 -to IO_SCL +set_location_assignment PIN_AG9 -to IO_SDA +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to IO_S* +set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to IO_S* +set_instance_assignment -name CURRENT_STRENGTH_NEW "MAXIMUM CURRENT" -to IO_S* +set_location_assignment PIN_AF17 -to USER_IO[6] +set_location_assignment PIN_AF15 -to USER_IO[5] +set_location_assignment PIN_AG16 -to USER_IO[4] +set_location_assignment PIN_AH11 -to USER_IO[3] +set_location_assignment PIN_AH12 -to USER_IO[2] +set_location_assignment PIN_AH9 -to USER_IO[1] +set_location_assignment PIN_AG11 -to USER_IO[0] +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to USER_IO[*] +set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to USER_IO[*] +set_instance_assignment -name CURRENT_STRENGTH_NEW "MAXIMUM CURRENT" -to USER_IO[*] +set_location_assignment PIN_AH7 -to SDCD_SPDIF +set_instance_assignment -name CURRENT_STRENGTH_NEW "MAXIMUM CURRENT" -to SDCD_SPDIF +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to SDCD_SPDIF +set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to SDCD_SPDIF +set_location_assignment PIN_Y11 -to SDRAM_A[0] +set_location_assignment PIN_AA26 -to SDRAM_A[1] +set_location_assignment PIN_AA13 -to SDRAM_A[2] +set_location_assignment PIN_AA11 -to SDRAM_A[3] +set_location_assignment PIN_W11 -to SDRAM_A[4] +set_location_assignment PIN_Y19 -to SDRAM_A[5] +set_location_assignment PIN_AB23 -to SDRAM_A[6] +set_location_assignment PIN_AC23 -to SDRAM_A[7] +set_location_assignment PIN_AC22 -to SDRAM_A[8] +set_location_assignment PIN_C12 -to SDRAM_A[9] +set_location_assignment PIN_AB26 -to SDRAM_A[10] +set_location_assignment PIN_AD17 -to SDRAM_A[11] +set_location_assignment PIN_D12 -to SDRAM_A[12] +set_location_assignment PIN_Y17 -to SDRAM_BA[0] +set_location_assignment PIN_AB25 -to SDRAM_BA[1] +set_location_assignment PIN_E8 -to SDRAM_DQ[0] +set_location_assignment PIN_V12 -to SDRAM_DQ[1] +set_location_assignment PIN_D11 -to SDRAM_DQ[2] +set_location_assignment PIN_W12 -to SDRAM_DQ[3] +set_location_assignment PIN_AH13 -to SDRAM_DQ[4] +set_location_assignment PIN_D8 -to SDRAM_DQ[5] +set_location_assignment PIN_AH14 -to SDRAM_DQ[6] +set_location_assignment PIN_AF7 -to SDRAM_DQ[7] +set_location_assignment PIN_AE24 -to SDRAM_DQ[8] +set_location_assignment PIN_AD23 -to SDRAM_DQ[9] +set_location_assignment PIN_AE6 -to SDRAM_DQ[10] +set_location_assignment PIN_AE23 -to SDRAM_DQ[11] +set_location_assignment PIN_AG14 -to SDRAM_DQ[12] +set_location_assignment PIN_AD5 -to SDRAM_DQ[13] +set_location_assignment PIN_AF4 -to SDRAM_DQ[14] +set_location_assignment PIN_AH3 -to SDRAM_DQ[15] +set_location_assignment PIN_AG13 -to SDRAM_DQML +set_location_assignment PIN_AF13 -to SDRAM_DQMH +set_location_assignment PIN_AD20 -to SDRAM_CLK +set_location_assignment PIN_AG10 -to SDRAM_CKE +set_location_assignment PIN_AA19 -to SDRAM_nWE +set_location_assignment PIN_AA18 -to SDRAM_nCAS +set_location_assignment PIN_Y18 -to SDRAM_nCS +set_location_assignment PIN_W14 -to SDRAM_nRAS +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to SDRAM_* +set_instance_assignment -name CURRENT_STRENGTH_NEW "MAXIMUM CURRENT" -to SDRAM_* +set_instance_assignment -name FAST_OUTPUT_REGISTER ON -to SDRAM_* +set_instance_assignment -name FAST_OUTPUT_ENABLE_REGISTER ON -to SDRAM_DQ[*] +set_instance_assignment -name FAST_INPUT_REGISTER ON -to SDRAM_DQ[*] +set_instance_assignment -name ALLOW_SYNCH_CTRL_USAGE OFF -to *|SDRAM_* +set_location_assignment PIN_AE15 -to SD_SPI_CS +set_location_assignment PIN_AH8 -to SD_SPI_MISO +set_location_assignment PIN_AG8 -to SD_SPI_CLK +set_location_assignment PIN_U13 -to SD_SPI_MOSI +set_instance_assignment -name CURRENT_STRENGTH_NEW "MAXIMUM CURRENT" -to SD_SPI* +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to SD_SPI* +set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to SD_SPI* +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to FPGA_CLK1_50 +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to FPGA_CLK2_50 +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to FPGA_CLK3_50 +set_location_assignment PIN_V11 -to FPGA_CLK1_50 +set_location_assignment PIN_Y13 -to FPGA_CLK2_50 +set_location_assignment PIN_E11 -to FPGA_CLK3_50 +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to HDMI_I2C_* +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to HDMI_I2S +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to HDMI_LRCLK +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to HDMI_MCLK +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to HDMI_SCLK +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to HDMI_TX_* +set_instance_assignment -name FAST_OUTPUT_REGISTER ON -to HDMI_TX_D[*] +set_instance_assignment -name FAST_OUTPUT_REGISTER ON -to HDMI_TX_DE +set_instance_assignment -name FAST_OUTPUT_REGISTER ON -to HDMI_TX_HS +set_instance_assignment -name FAST_OUTPUT_REGISTER ON -to HDMI_TX_VS +set_instance_assignment -name FAST_OUTPUT_REGISTER ON -to HDMI_TX_CLK +set_location_assignment PIN_U10 -to HDMI_I2C_SCL +set_location_assignment PIN_AA4 -to HDMI_I2C_SDA +set_location_assignment PIN_T13 -to HDMI_I2S +set_location_assignment PIN_T11 -to HDMI_LRCLK +set_location_assignment PIN_U11 -to HDMI_MCLK +set_location_assignment PIN_T12 -to HDMI_SCLK +set_location_assignment PIN_AG5 -to HDMI_TX_CLK +set_location_assignment PIN_AD19 -to HDMI_TX_DE +set_location_assignment PIN_AD12 -to HDMI_TX_D[0] +set_location_assignment PIN_AE12 -to HDMI_TX_D[1] +set_location_assignment PIN_W8 -to HDMI_TX_D[2] +set_location_assignment PIN_Y8 -to HDMI_TX_D[3] +set_location_assignment PIN_AD11 -to HDMI_TX_D[4] +set_location_assignment PIN_AD10 -to HDMI_TX_D[5] +set_location_assignment PIN_AE11 -to HDMI_TX_D[6] +set_location_assignment PIN_Y5 -to HDMI_TX_D[7] +set_location_assignment PIN_AF10 -to HDMI_TX_D[8] +set_location_assignment PIN_Y4 -to HDMI_TX_D[9] +set_location_assignment PIN_AE9 -to HDMI_TX_D[10] +set_location_assignment PIN_AB4 -to HDMI_TX_D[11] +set_location_assignment PIN_AE7 -to HDMI_TX_D[12] +set_location_assignment PIN_AF6 -to HDMI_TX_D[13] +set_location_assignment PIN_AF8 -to HDMI_TX_D[14] +set_location_assignment PIN_AF5 -to HDMI_TX_D[15] +set_location_assignment PIN_AE4 -to HDMI_TX_D[16] +set_location_assignment PIN_AH2 -to HDMI_TX_D[17] +set_location_assignment PIN_AH4 -to HDMI_TX_D[18] +set_location_assignment PIN_AH5 -to HDMI_TX_D[19] +set_location_assignment PIN_AH6 -to HDMI_TX_D[20] +set_location_assignment PIN_AG6 -to HDMI_TX_D[21] +set_location_assignment PIN_AF9 -to HDMI_TX_D[22] +set_location_assignment PIN_AE8 -to HDMI_TX_D[23] +set_location_assignment PIN_T8 -to HDMI_TX_HS +set_location_assignment PIN_AF11 -to HDMI_TX_INT +set_location_assignment PIN_V13 -to HDMI_TX_VS +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to KEY[0] +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to KEY[1] +set_location_assignment PIN_AH17 -to KEY[0] +set_location_assignment PIN_AH16 -to KEY[1] +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to LED[0] +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to LED[1] +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to LED[2] +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to LED[3] +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to LED[4] +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to LED[5] +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to LED[6] +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to LED[7] +set_location_assignment PIN_W15 -to LED[0] +set_location_assignment PIN_AA24 -to LED[1] +set_location_assignment PIN_V16 -to LED[2] +set_location_assignment PIN_V15 -to LED[3] +set_location_assignment PIN_AF26 -to LED[4] +set_location_assignment PIN_AE26 -to LED[5] +set_location_assignment PIN_Y16 -to LED[6] +set_location_assignment PIN_AA23 -to LED[7] +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to SW[0] +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to SW[1] +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to SW[2] +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to SW[3] +set_location_assignment PIN_Y24 -to SW[0] +set_location_assignment PIN_W24 -to SW[1] +set_location_assignment PIN_W21 -to SW[2] +set_location_assignment PIN_W20 -to SW[3] +set_hps_location_assignment HPSINTERFACEPERIPHERALSPIMASTER_X52_Y72_N111 -to spi +set_hps_location_assignment HPSINTERFACEPERIPHERALUART_X52_Y67_N111 -to uart +set_hps_location_assignment HPSINTERFACEPERIPHERALI2C_X52_Y60_N111 -to hdmi_i2c +set_global_assignment -name PRE_FLOW_SCRIPT_FILE "quartus_sh:sys/build_id.tcl" +set_global_assignment -name CDF_FILE jtag.cdf +set_global_assignment -name QIP_FILE sys/sys.qip source sys/sys_analog.tcl +set_location_assignment PIN_AF25 -to SDIO_DAT[0] +set_location_assignment PIN_AF23 -to SDIO_DAT[1] +set_location_assignment PIN_AD26 -to SDIO_DAT[2] +set_location_assignment PIN_AF28 -to SDIO_DAT[3] +set_location_assignment PIN_AF27 -to SDIO_CMD +set_location_assignment PIN_AH26 -to SDIO_CLK +set_instance_assignment -name CURRENT_STRENGTH_NEW "MAXIMUM CURRENT" -to SDIO_* +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to SDIO_* +set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to SDIO_DAT[*] +set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to SDIO_CMD +set_location_assignment PIN_AE17 -to VGA_R[0] +set_location_assignment PIN_AE20 -to VGA_R[1] +set_location_assignment PIN_AF20 -to VGA_R[2] +set_location_assignment PIN_AH18 -to VGA_R[3] +set_location_assignment PIN_AH19 -to VGA_R[4] +set_location_assignment PIN_AF21 -to VGA_R[5] +set_location_assignment PIN_AE19 -to VGA_G[0] +set_location_assignment PIN_AG15 -to VGA_G[1] +set_location_assignment PIN_AF18 -to VGA_G[2] +set_location_assignment PIN_AG18 -to VGA_G[3] +set_location_assignment PIN_AG19 -to VGA_G[4] +set_location_assignment PIN_AG20 -to VGA_G[5] +set_location_assignment PIN_AG21 -to VGA_B[0] +set_location_assignment PIN_AA20 -to VGA_B[1] +set_location_assignment PIN_AE22 -to VGA_B[2] +set_location_assignment PIN_AF22 -to VGA_B[3] +set_location_assignment PIN_AH23 -to VGA_B[4] +set_location_assignment PIN_AH21 -to VGA_B[5] +set_location_assignment PIN_AH22 -to VGA_HS +set_location_assignment PIN_AG24 -to VGA_VS +set_location_assignment PIN_AH27 -to VGA_EN +set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to VGA_EN +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to VGA_* +set_instance_assignment -name CURRENT_STRENGTH_NEW 8MA -to VGA_* +set_location_assignment PIN_AC24 -to AUDIO_L +set_location_assignment PIN_AE25 -to AUDIO_R +set_location_assignment PIN_AG26 -to AUDIO_SPDIF +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to AUDIO_* +set_instance_assignment -name CURRENT_STRENGTH_NEW 8MA -to AUDIO_* +set_location_assignment PIN_Y15 -to LED_USER +set_location_assignment PIN_AA15 -to LED_HDD +set_location_assignment PIN_AG28 -to LED_POWER +set_location_assignment PIN_AH24 -to BTN_USER +set_location_assignment PIN_AG25 -to BTN_OSD +set_location_assignment PIN_AG23 -to BTN_RESET +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to LED_* +set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to BTN_* +set_instance_assignment -name WEAK_PULL_UP_RESISTOR ON -to BTN_* source files.qip +set_global_assignment -name VHDL_FILE rtl/sram/coco_ram.vhd +set_global_assignment -name VHDL_FILE rtl/rom/coco_rom_cart.vhd +set_global_assignment -name VHDL_FILE rtl/rom/coco3_char_rom.vhd +set_global_assignment -name VERILOG_FILE rtl/PS2_Key/ps2_keyboard.v +set_global_assignment -name MIF_FILE rtl/VDAC.mif +set_global_assignment -name VERILOG_FILE rtl/VDAC.v +set_global_assignment -name VERILOG_FILE rtl/Mister_Video.v +set_global_assignment -name VERILOG_FILE rtl/cocokey.v +set_global_assignment -name VERILOG_FILE rtl/UART_6551/uart_6551.v +set_global_assignment -name VERILOG_FILE rtl/UART_6551/6551tx.v +set_global_assignment -name VERILOG_FILE rtl/UART_6551/6551rx.v +set_global_assignment -name VHDL_FILE rtl/CPU09/cpu09l_128a.vhd +set_global_assignment -name SYSTEMVERILOG_FILE rtl/coco3fpga.sv +set_global_assignment -name VERILOG_FILE rtl/pll.v +set_global_assignment -name VERILOG_FILE rtl/pll/pll_0002.v +set_global_assignment -name VERILOG_FILE rtl/cassette.v +set_global_assignment -name VERILOG_FILE rtl/rtc.sv +set_global_assignment -name VERILOG_FILE rtl/AMW.v +set_global_assignment -name VERILOG_FILE rtl/square_gen.v +set_global_assignment -name VERILOG_FILE rtl/config.v +set_global_assignment -name SYSTEMVERILOG_FILE rtl/fdc.sv +set_global_assignment -name SYSTEMVERILOG_FILE rtl/sdc.sv +set_global_assignment -name SYSTEMVERILOG_FILE rtl/sdc_top.sv +set_global_assignment -name SYSTEMVERILOG_FILE rtl/ps2_mouse.v +set_global_assignment -name SYSTEMVERILOG_FILE rtl/sdram/sdram2.sv +set_global_assignment -name SYSTEMVERILOG_FILE rtl/wd1793.sv +set_global_assignment -name SYSTEMVERILOG_FILE CoCo3.sv +set_global_assignment -name VHDL_FILE rtl/sram/coco_vid_ram_buf.vhd +set_global_assignment -name SYSTEMVERILOG_FILE rtl/coco_mem_fetch.sv +set_global_assignment -name VERILOG_FILE rtl/EE_Cold_Bt.v +set_global_assignment -name VHDL_FILE rtl/rom/coco_rom_32K.vhd +set_global_assignment -name VHDL_FILE rtl/rom/coco_rom_8K.vhd +set_global_assignment -name VHDL_FILE rtl/rom/coco_rom_16.vhd +set_global_assignment -name SDC_FILE rtl/CoCo3FPGA.sdc -set_global_assignment -name ENABLE_SIGNALTAP OFF -set_global_assignment -name USE_SIGNALTAP_FILE Video_Explorer.stp +set_global_assignment -name ENABLE_SIGNALTAP ON +set_global_assignment -name USE_SIGNALTAP_FILE Vsync.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 +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[3] -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[21] -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[22] -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[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[28] -to auto_signaltap_0|vcc -section_id auto_signaltap_0 +set_global_assignment -name SIGNALTAP_FILE Vsync.stp +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[25] -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_global_assignment -name ENABLE_SIGNALTAP OFF +set_global_assignment -name OPTIMIZATION_MODE "HIGH PERFORMANCE EFFORT" +set_global_assignment -name USE_SIGNALTAP_FILE Video_Explorer.stp +set_global_assignment -name VERILOG_FILE rtl/mc6809glb/mc6809glb.v +set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_trigger_in[0] -to "emu:emu|coco3fpga:coco3|PH_2_RAW" -section_id auto_signaltap_0 +set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_trigger_in[1] -to "emu:emu|coco3fpga:coco3|RAM_CS" -section_id auto_signaltap_0 +set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_trigger_in[2] -to "emu:emu|coco3fpga:coco3|cpu_ena" -section_id auto_signaltap_0 +set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_trigger_in[3] -to "emu:emu|coco3fpga:coco3|data_ready" -section_id auto_signaltap_0 +set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_trigger_in[4] -to "emu:emu|coco3fpga:coco3|end_hold" -section_id auto_signaltap_0 +set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_trigger_in[5] -to "emu:emu|coco3fpga:coco3|hold" -section_id auto_signaltap_0 +set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_trigger_in[6] -to "emu:emu|coco3fpga:coco3|sdram_cpu_req~reg0" -section_id auto_signaltap_0 +set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_trigger_in[7] -to "emu:emu|coco3fpga:coco3|sdram_cpu_rnw~reg0" -section_id auto_signaltap_0 +set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_data_in[0] -to "emu:emu|coco3fpga:coco3|PH_2_RAW" -section_id auto_signaltap_0 +set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_data_in[1] -to "emu:emu|coco3fpga:coco3|RAM_CS" -section_id auto_signaltap_0 +set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_data_in[2] -to "emu:emu|coco3fpga:coco3|cpu_ena" -section_id auto_signaltap_0 +set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_data_in[3] -to "emu:emu|coco3fpga:coco3|data_ready" -section_id auto_signaltap_0 +set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_data_in[4] -to "emu:emu|coco3fpga:coco3|end_hold" -section_id auto_signaltap_0 +set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_data_in[5] -to "emu:emu|coco3fpga:coco3|hold" -section_id auto_signaltap_0 +set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_data_in[6] -to "emu:emu|coco3fpga:coco3|sdram_cpu_req~reg0" -section_id auto_signaltap_0 +set_instance_assignment -name CONNECT_TO_SLD_NODE_ENTITY_PORT acq_data_in[7] -to "emu:emu|coco3fpga:coco3|sdram_cpu_rnw~reg0" -section_id auto_signaltap_0 +set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_DATA_BITS=8" -section_id auto_signaltap_0 +set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_TRIGGER_BITS=8" -section_id auto_signaltap_0 +set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_STORAGE_QUALIFIER_BITS=8" -section_id auto_signaltap_0 +set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_INVERSION_MASK=0000000000000000000000000000000000000000000000000000" -section_id auto_signaltap_0 +set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_INVERSION_MASK_LENGTH=52" -section_id auto_signaltap_0 +set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[0] -to auto_signaltap_0|gnd -section_id auto_signaltap_0 +set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[1] -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|gnd -section_id auto_signaltap_0 +set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[5] -to auto_signaltap_0|vcc -section_id auto_signaltap_0 +set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[7] -to auto_signaltap_0|vcc -section_id auto_signaltap_0 +set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[8] -to auto_signaltap_0|gnd -section_id auto_signaltap_0 +set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[9] -to auto_signaltap_0|vcc -section_id auto_signaltap_0 +set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[10] -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|gnd -section_id auto_signaltap_0 +set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[17] -to auto_signaltap_0|gnd -section_id auto_signaltap_0 +set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[19] -to auto_signaltap_0|gnd -section_id auto_signaltap_0 +set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[20] -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|vcc -section_id auto_signaltap_0 +set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[24] -to auto_signaltap_0|gnd -section_id auto_signaltap_0 +set_instance_assignment -name POST_FIT_CONNECT_TO_SLD_NODE_ENTITY_PORT crc[26] -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|gnd -section_id auto_signaltap_0 +set_global_assignment -name SLD_FILE db/Vsync_auto_stripped.stp set_instance_assignment -name PARTITION_HIERARCHY root_partition -to | -section_id Top \ No newline at end of file diff --git a/changes.txt b/changes.txt new file mode 100644 index 0000000..d8d89dd --- /dev/null +++ b/changes.txt @@ -0,0 +1,28 @@ +CTF = Compile Time Feature... + +1. For cycle accurate 6809, changed PH2 to cpu_cycle_ena. (Improve timing of control register writes) +2. Changed PIA(s) addressing to alow complete mirror through FF00-FF3F + + +To Do... +1. Fix assign SDC_EN_CS +2. Add new color dithering... + + + +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 diff --git a/rtl/coco3fpga.sv b/rtl/coco3fpga.sv index 73bd1d4..ba067a3 100644 --- a/rtl/coco3fpga.sv +++ b/rtl/coco3fpga.sv @@ -906,21 +906,37 @@ assign DATA_IN = RS232_EN ? DATA_RS232: SLOT3_HW ? {5'b00000, ROM_BANK}: // FF00, FF04, FF08, FF0C -({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111000000) ? DATA_REG1: +//({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111000000) ? DATA_REG1: // FF01, FF05, FF09, FF0D -({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111000001) ? {!HSYNC1_IRQ_BUF[1], 3'b011, SEL[0], DDR1, HSYNC1_POL, HSYNC1_IRQ_INT}: +//({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111000001) ? {!HSYNC1_IRQ_BUF[1], 3'b011, SEL[0], DDR1, HSYNC1_POL, HSYNC1_IRQ_INT}: // FF02, FF06, FF0A, FF0E -({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111000010) ? DATA_REG2: +//({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111000010) ? DATA_REG2: // FF03, FF07, FF0B, FF0F -({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111000011) ? {!VSYNC1_IRQ_BUF[1], 3'b011, SEL[1], DDR2, VSYNC1_POL, VSYNC1_IRQ_INT}: +//({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111000011) ? {!VSYNC1_IRQ_BUF[1], 3'b011, SEL[1], DDR2, VSYNC1_POL, VSYNC1_IRQ_INT}: // FF20, FF24, FF28, FF2C -({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111001000) ? DATA_REG3: +//({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111001000) ? DATA_REG3: // FF21, FF25, FF29, FF2D -({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111001001) ? {4'b0011, CAS_MTR, DDR3, 2'b00}: // CD_POL, CD_INT}: +//({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111001001) ? {4'b0011, CAS_MTR, DDR3, 2'b00}: // CD_POL, CD_INT}: // FF22, FF26, FF2A, FF2E -({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111001010) ? DATA_REG4: +//({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111001010) ? DATA_REG4: // FF23, FF27, FF2B, FF2F -({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111001011) ? {!CART1_FIRQ_BUF[1], 3'b011, SOUND_EN, DDR4, CART1_POL, CART1_FIRQ_INT}: +//({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111001011) ? {!CART1_FIRQ_BUF[1], 3'b011, SOUND_EN, DDR4, CART1_POL, CART1_FIRQ_INT}: +// FF00, FF04, FF08, FF0C +({ADDRESS[15:5], ADDRESS[1:0]} == 13'b1111111100000) ? DATA_REG1: +// FF01, FF05, FF09, FF0D +({ADDRESS[15:5], ADDRESS[1:0]} == 13'b1111111100001) ? {!HSYNC1_IRQ_BUF[1], 3'b011, SEL[0], DDR1, HSYNC1_POL, HSYNC1_IRQ_INT}: +// FF02, FF06, FF0A, FF0E +({ADDRESS[15:5], ADDRESS[1:0]} == 13'b1111111100010) ? DATA_REG2: +// FF03, FF07, FF0B, FF0F +({ADDRESS[15:5], ADDRESS[1:0]} == 13'b1111111100011) ? {!VSYNC1_IRQ_BUF[1], 3'b011, SEL[1], DDR2, VSYNC1_POL, VSYNC1_IRQ_INT}: +// FF20, FF24, FF28, FF2C +({ADDRESS[15:5], ADDRESS[1:0]} == 13'b1111111100100) ? DATA_REG3: +// FF21, FF25, FF29, FF2D +({ADDRESS[15:5], ADDRESS[1:0]} == 13'b1111111100101) ? {4'b0011, CAS_MTR, DDR3, 2'b00}: // CD_POL, CD_INT}: +// FF22, FF26, FF2A, FF2E +({ADDRESS[15:5], ADDRESS[1:0]} == 13'b1111111100110) ? DATA_REG4: +// FF23, FF27, FF2B, FF2F +({ADDRESS[15:5], ADDRESS[1:0]} == 13'b1111111100111) ? {!CART1_FIRQ_BUF[1], 3'b011, SOUND_EN, DDR4, CART1_POL, CART1_FIRQ_INT}: // HiRes Joystick // ({PDL,ADDRESS} == 17'h0FF60) ? PADDLE_LATCH_0[11:4]: // ({PDL,ADDRESS} == 17'h0FF61) ? {PADDLE_LATCH_0[3:0],4'b0000}: @@ -2699,111 +2715,74 @@ begin if(!RW_N) begin case (ADDRESS) - 16'hFF00: + + 16'hFF00, + 16'hFF04, + 16'hFF08, + 16'hFF0C, + 16'hFF10, + 16'hFF14, + 16'hFF18, + 16'hFF1C: begin if(!DDR1) DD_REG1 <= DATA_OUT; end - 16'hFF01: + + 16'hFF01, + 16'hFF05, + 16'hFF09, + 16'hFF0D, + 16'hFF11, + 16'hFF15, + 16'hFF19, + 16'hFF1D: begin HSYNC1_IRQ_INT <= DATA_OUT[0]; HSYNC1_POL <= DATA_OUT[1]; DDR1 <= DATA_OUT[2]; SEL[0] <= DATA_OUT[3]; end - 16'hFF02: + + 16'hFF02, + 16'hFF06, + 16'hFF0A, + 16'hFF0E, + 16'hFF12, + 16'hFF16, + 16'hFF1A, + 16'hFF1E: begin if(!DDR2) DD_REG2 <= DATA_OUT; else KEY_COLUMN <= DATA_OUT; end - 16'hFF03: + + 16'hFF03, + 16'hFF07, + 16'hFF0B, + 16'hFF0F, + 16'hFF13, + 16'hFF17, + 16'hFF1B, + 16'hFF1F: begin VSYNC1_IRQ_INT <= DATA_OUT[0]; VSYNC1_POL <= DATA_OUT[1]; DDR2 <= DATA_OUT[2]; SEL[1] <= DATA_OUT[3]; end - 16'hFF04: - begin - if(!DDR1) - DD_REG1 <= DATA_OUT; - end - 16'hFF05: - begin - HSYNC1_IRQ_INT <= DATA_OUT[0]; - HSYNC1_POL <= DATA_OUT[1]; - DDR1 <= DATA_OUT[2]; - SEL[0] <= DATA_OUT[3]; - end - 16'hFF06: - begin - if(!DDR2) - DD_REG2 <= DATA_OUT; - else - KEY_COLUMN <= DATA_OUT; - end - 16'hFF07: - begin - VSYNC1_IRQ_INT <= DATA_OUT[0]; - VSYNC1_POL <= DATA_OUT[1]; - DDR2 <= DATA_OUT[2]; - SEL[1] <= DATA_OUT[3]; - end - 16'hFF08: - begin - if(!DDR1) - DD_REG1 <= DATA_OUT; - end - 16'hFF09: - begin - HSYNC1_IRQ_INT <= DATA_OUT[0]; - HSYNC1_POL <= DATA_OUT[1]; - DDR1 <= DATA_OUT[2]; - SEL[0] <= DATA_OUT[3]; - end - 16'hFF0A: - begin - if(!DDR2) - DD_REG2 <= DATA_OUT; - else - KEY_COLUMN <= DATA_OUT; - end - 16'hFF0B: - begin - VSYNC1_IRQ_INT <= DATA_OUT[0]; - VSYNC1_POL <= DATA_OUT[1]; - DDR2 <= DATA_OUT[2]; - SEL[1] <= DATA_OUT[3]; - end - 16'hFF0C: - begin - if(!DDR1) - DD_REG1 <= DATA_OUT; - end - 16'hFF0D: - begin - HSYNC1_IRQ_INT <= DATA_OUT[0]; - HSYNC1_POL <= DATA_OUT[1]; - DDR1 <= DATA_OUT[2]; - SEL[0] <= DATA_OUT[3]; - end - 16'hFF0E: - begin - if(!DDR2) - DD_REG2 <= DATA_OUT; - else - KEY_COLUMN <= DATA_OUT; - end - 16'hFF0F: - begin - VSYNC1_IRQ_INT <= DATA_OUT[0]; - VSYNC1_POL <= DATA_OUT[1]; - DDR2 <= DATA_OUT[2]; - SEL[1] <= DATA_OUT[3]; - end - 16'hFF20: + + + 16'hFF20, + 16'hFF24, + 16'hFF28, + 16'hFF2C, + 16'hFF30, + 16'hFF34, + 16'hFF38, + 16'hFF3C: begin if(!DDR3) DD_REG3 <= DATA_OUT; @@ -2814,14 +2793,30 @@ begin // SOUND_DTOA <= DATA_OUT[7:2]; end end - 16'hFF21: + + 16'hFF21, + 16'hFF25, + 16'hFF29, + 16'hFF2D, + 16'hFF31, + 16'hFF35, + 16'hFF39, + 16'hFF3D: begin // CD_INT <= DATA_OUT[0]; // CD_POL <= DATA_OUT[1]; DDR3 <= DATA_OUT[2]; CAS_MTR <= DATA_OUT[3]; end - 16'hFF22: + + 16'hFF22, + 16'hFF26, + 16'hFF2A, + 16'hFF2E, + 16'hFF32, + 16'hFF36, + 16'hFF3A, + 16'hFF3E: begin if(!DDR4) DD_REG4 <= DATA_OUT; @@ -2832,121 +2827,23 @@ begin VDG_CONTROL <= DATA_OUT[7:4]; end end - 16'hFF23: - begin - CART1_FIRQ_INT <= DATA_OUT[0]; - CART1_POL <= DATA_OUT[1]; - DDR4 <= DATA_OUT[2]; - SOUND_EN <= DATA_OUT[3]; - end - 16'hFF24: - begin - if(!DDR3) - DD_REG3 <= DATA_OUT; - else - begin - DTOA_CODE <= DATA_OUT[7:2]; -// if({SOUND_EN,SEL} == 3'b100) -// SOUND_DTOA <= DATA_OUT[7:2]; - end - end - 16'hFF25: - begin -// CD_INT <= DATA_OUT[0]; -// CD_POL <= DATA_OUT[1]; - DDR3 <= DATA_OUT[2]; - CAS_MTR <= DATA_OUT[3]; - end - 16'hFF26: - begin - if(!DDR4) - DD_REG4 <= DATA_OUT; - else - begin - SBS <= DATA_OUT[1]; - CSS <= DATA_OUT[3]; - VDG_CONTROL <= DATA_OUT[7:4]; - end - end - 16'hFF27: - begin - CART1_FIRQ_INT <= DATA_OUT[0]; - CART1_POL <= DATA_OUT[1]; - DDR4 <= DATA_OUT[2]; - SOUND_EN <= DATA_OUT[3]; - end - 16'hFF28: - begin - if(!DDR3) - DD_REG3 <= DATA_OUT; - else - begin - DTOA_CODE <= DATA_OUT[7:2]; -// if({SOUND_EN,SEL} == 3'b100) -// SOUND_DTOA <= DATA_OUT[7:2]; - end - end - 16'hFF29: - begin -// CD_INT <= DATA_OUT[0]; -// CD_POL <= DATA_OUT[1]; - DDR3 <= DATA_OUT[2]; - CAS_MTR <= DATA_OUT[3]; - end - 16'hFF2A: - begin - if(!DDR4) - DD_REG4 <= DATA_OUT; - else - begin - SBS <= DATA_OUT[1]; - CSS <= DATA_OUT[3]; - VDG_CONTROL <= DATA_OUT[7:4]; - end - end - 16'hFF2B: - begin - CART1_FIRQ_INT <= DATA_OUT[0]; - CART1_POL <= DATA_OUT[1]; - DDR4 <= DATA_OUT[2]; - SOUND_EN <= DATA_OUT[3]; - end - 16'hFF2C: - begin - if(!DDR3) - DD_REG3 <= DATA_OUT; - else - begin - DTOA_CODE <= DATA_OUT[7:2]; -// if({SOUND_EN,SEL} == 3'b100) -// SOUND_DTOA <= DATA_OUT[7:2]; - end - end - 16'hFF2D: - begin -// CD_INT <= DATA_OUT[0]; -// CD_POL <= DATA_OUT[1]; - DDR3 <= DATA_OUT[2]; - CAS_MTR <= DATA_OUT[3]; - end - 16'hFF2E: - begin - if(!DDR4) - DD_REG4 <= DATA_OUT; - else - begin - SBS <= DATA_OUT[1]; - CSS <= DATA_OUT[3]; - VDG_CONTROL <= DATA_OUT[7:4]; - end - end - 16'hFF2F: + + 16'hFF23, + 16'hFF27, + 16'hFF2B, + 16'hFF2F, + 16'hFF33, + 16'hFF37, + 16'hFF3B, + 16'hFF3F: begin CART1_FIRQ_INT <= DATA_OUT[0]; CART1_POL <= DATA_OUT[1]; DDR4 <= DATA_OUT[2]; SOUND_EN <= DATA_OUT[3]; end + + 16'hFF7A: begin ORCH_LEFT <= DATA_OUT; diff --git a/rtl/config.v b/rtl/config.v index bef6eda..9d4ae2d 100644 --- a/rtl/config.v +++ b/rtl/config.v @@ -64,7 +64,7 @@ `include "..\RTL\config_inc.v" // If defined the Config_Debug sets the FEATURE MASKS all OR'd together which appears on COCO space at FFF1 & (FFF0 = 0x55 as a debug flag) -//`define Config_Debug +`define Config_Debug // Feature list - note only FEATURE_1 - FEATURE_8 are supported /////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -74,9 +74,9 @@ `set_feature(CoCo3_CYC_ACC_6809, FEATURE_3) // Use cycle accurate 6809 -`set_feature(CoCo3_sdc_override_size, FEATURE_4) // Define static size value +//`set_feature(CoCo3_sdc_override_size, FEATURE_4) // Define static size value -`set_feature(CoCo3_sdc_fix_os9_driver, FEATURE_5) // fix sdc query disk size issue in llcocosdc driver in multipak enviroment +//`set_feature(CoCo3_sdc_fix_os9_driver, FEATURE_5) // fix sdc query disk size issue in llcocosdc driver in multipak enviroment `set_feature(CoCo3_disable_GART_in_GIMEX, FEATURE_6)// Disable GIMEX ram transfers [GIMEX detection in OS( EOU]