From 91b2cae087d8b43c82e8a7249411b84c1320ddba Mon Sep 17 00:00:00 2001 From: Gehstock Date: Sun, 19 Jan 2020 14:49:34 +0100 Subject: [PATCH] Slingshot Fix the Controls on Calipso Core --- .../Calipso_MiST/Calipso.qsf | 2 +- .../Williams 6809 rev.1 Hardware/.gitignore | 1 - .../README.md | 0 .../RobotronFPGA.qpf | 0 .../RobotronFPGA.qsf | 2 +- .../RobotronFPGA.sdc | 0 .../rtl/RobotronFPGA_MiST.sv | 4 ++-- .../rtl/build_id.tcl | 0 .../rtl/cpu68.vhd | 0 .../rtl/defender_sound_board.vhd | 0 .../rtl/dpram.vhd | 0 .../rtl/gen_ram.vhd | 0 .../rtl/pll_mist.qip | 0 .../rtl/pll_mist.vhd | 0 .../rtl/robotron_cpu/decoder_4.vhd | 0 .../rtl/robotron_cpu/decoder_6.vhd | 0 .../rtl/robotron_cpu/robotron_cpu.vhd | 0 .../rtl/robotron_cpu/robotron_cpu_test.vhd | 0 .../rtl/robotron_cpu/sc1.vhd | 0 .../rtl/robotron_cpu/sc1_tb.vhd | 0 .../rtl/robotron_soc.vhd | 0 .../rtl/sdram.sv | 0 .../Robotron-FPGA/buildall.sh | 16 ---------------- .../Robotron-FPGA/clean.bat | 15 --------------- 24 files changed, 4 insertions(+), 36 deletions(-) delete mode 100644 Arcade_MiST/Williams 6809 rev.1 Hardware/.gitignore rename Arcade_MiST/Williams 6809 rev.1 Hardware/{Robotron-FPGA => Robotron Hardware}/README.md (100%) rename Arcade_MiST/Williams 6809 rev.1 Hardware/{Robotron-FPGA => Robotron Hardware}/RobotronFPGA.qpf (100%) rename Arcade_MiST/Williams 6809 rev.1 Hardware/{Robotron-FPGA => Robotron Hardware}/RobotronFPGA.qsf (99%) rename Arcade_MiST/Williams 6809 rev.1 Hardware/{Robotron-FPGA => Robotron Hardware}/RobotronFPGA.sdc (100%) rename Arcade_MiST/Williams 6809 rev.1 Hardware/{Robotron-FPGA => Robotron Hardware}/rtl/RobotronFPGA_MiST.sv (99%) rename Arcade_MiST/Williams 6809 rev.1 Hardware/{Robotron-FPGA => Robotron Hardware}/rtl/build_id.tcl (100%) rename Arcade_MiST/Williams 6809 rev.1 Hardware/{Robotron-FPGA => Robotron Hardware}/rtl/cpu68.vhd (100%) rename Arcade_MiST/Williams 6809 rev.1 Hardware/{Robotron-FPGA => Robotron Hardware}/rtl/defender_sound_board.vhd (100%) rename Arcade_MiST/Williams 6809 rev.1 Hardware/{Robotron-FPGA => Robotron Hardware}/rtl/dpram.vhd (100%) rename Arcade_MiST/Williams 6809 rev.1 Hardware/{Robotron-FPGA => Robotron Hardware}/rtl/gen_ram.vhd (100%) rename Arcade_MiST/Williams 6809 rev.1 Hardware/{Robotron-FPGA => Robotron Hardware}/rtl/pll_mist.qip (100%) rename Arcade_MiST/Williams 6809 rev.1 Hardware/{Robotron-FPGA => Robotron Hardware}/rtl/pll_mist.vhd (100%) rename Arcade_MiST/Williams 6809 rev.1 Hardware/{Robotron-FPGA => Robotron Hardware}/rtl/robotron_cpu/decoder_4.vhd (100%) rename Arcade_MiST/Williams 6809 rev.1 Hardware/{Robotron-FPGA => Robotron Hardware}/rtl/robotron_cpu/decoder_6.vhd (100%) rename Arcade_MiST/Williams 6809 rev.1 Hardware/{Robotron-FPGA => Robotron Hardware}/rtl/robotron_cpu/robotron_cpu.vhd (100%) mode change 100755 => 100644 rename Arcade_MiST/Williams 6809 rev.1 Hardware/{Robotron-FPGA => Robotron Hardware}/rtl/robotron_cpu/robotron_cpu_test.vhd (100%) mode change 100755 => 100644 rename Arcade_MiST/Williams 6809 rev.1 Hardware/{Robotron-FPGA => Robotron Hardware}/rtl/robotron_cpu/sc1.vhd (100%) rename Arcade_MiST/Williams 6809 rev.1 Hardware/{Robotron-FPGA => Robotron Hardware}/rtl/robotron_cpu/sc1_tb.vhd (100%) mode change 100755 => 100644 rename Arcade_MiST/Williams 6809 rev.1 Hardware/{Robotron-FPGA => Robotron Hardware}/rtl/robotron_soc.vhd (100%) rename Arcade_MiST/Williams 6809 rev.1 Hardware/{Robotron-FPGA => Robotron Hardware}/rtl/sdram.sv (100%) delete mode 100755 Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/buildall.sh delete mode 100644 Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/clean.bat diff --git a/Arcade_MiST/Konami Scramble Hardware/Calipso_MiST/Calipso.qsf b/Arcade_MiST/Konami Scramble Hardware/Calipso_MiST/Calipso.qsf index c2aa47d2..6c4906d9 100644 --- a/Arcade_MiST/Konami Scramble Hardware/Calipso_MiST/Calipso.qsf +++ b/Arcade_MiST/Konami Scramble Hardware/Calipso_MiST/Calipso.qsf @@ -40,7 +40,7 @@ # Project-Wide Assignments # ======================== set_global_assignment -name ORIGINAL_QUARTUS_VERSION 16.1.2 -set_global_assignment -name LAST_QUARTUS_VERSION "13.1 SP4.26" +set_global_assignment -name LAST_QUARTUS_VERSION 13.1 set_global_assignment -name PROJECT_CREATION_TIME_DATE "01:53:30 APRIL 20, 2017" set_global_assignment -name PROJECT_OUTPUT_DIRECTORY output_files set_global_assignment -name NUM_PARALLEL_PROCESSORS ALL diff --git a/Arcade_MiST/Williams 6809 rev.1 Hardware/.gitignore b/Arcade_MiST/Williams 6809 rev.1 Hardware/.gitignore deleted file mode 100644 index 859e0d99..00000000 --- a/Arcade_MiST/Williams 6809 rev.1 Hardware/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Standard Hardware diff --git a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/README.md b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/README.md similarity index 100% rename from Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/README.md rename to Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/README.md diff --git a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/RobotronFPGA.qpf b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/RobotronFPGA.qpf similarity index 100% rename from Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/RobotronFPGA.qpf rename to Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/RobotronFPGA.qpf diff --git a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/RobotronFPGA.qsf b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/RobotronFPGA.qsf similarity index 99% rename from Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/RobotronFPGA.qsf rename to Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/RobotronFPGA.qsf index bd44a02d..92e52611 100644 --- a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/RobotronFPGA.qsf +++ b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/RobotronFPGA.qsf @@ -43,7 +43,7 @@ set_global_assignment -name PROJECT_CREATION_TIME_DATE "21:22:13 JUNE 04, 2019" set_global_assignment -name PROJECT_OUTPUT_DIRECTORY output_files set_global_assignment -name PRE_FLOW_SCRIPT_FILE "quartus_sh:rtl/build_id.tcl" set_global_assignment -name ORIGINAL_QUARTUS_VERSION 13.1 -set_global_assignment -name LAST_QUARTUS_VERSION "13.1 SP4.26" +set_global_assignment -name LAST_QUARTUS_VERSION 13.1 set_global_assignment -name SMART_RECOMPILE ON # Pin & Location Assignments diff --git a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/RobotronFPGA.sdc b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/RobotronFPGA.sdc similarity index 100% rename from Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/RobotronFPGA.sdc rename to Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/RobotronFPGA.sdc diff --git a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/RobotronFPGA_MiST.sv b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/RobotronFPGA_MiST.sv similarity index 99% rename from Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/RobotronFPGA_MiST.sv rename to Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/RobotronFPGA_MiST.sv index c51b7f46..e99abca9 100644 --- a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/RobotronFPGA_MiST.sv +++ b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/RobotronFPGA_MiST.sv @@ -38,12 +38,12 @@ module RobotronFPGA_MiST( `include "rtl/build_id.v" -`define CORE_NAME "ROBOTRON" +//`define CORE_NAME "ROBOTRON" //`define CORE_NAME "JOUST" //`define CORE_NAME "SPLAT" //`define CORE_NAME "BUBBLES" //`define CORE_NAME "STARGATE" -//`define CORE_NAME "SINISTAR" +`define CORE_NAME "SINISTAR" localparam CONF_STR = { `CORE_NAME,";ROM;", diff --git a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/build_id.tcl b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/build_id.tcl similarity index 100% rename from Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/build_id.tcl rename to Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/build_id.tcl diff --git a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/cpu68.vhd b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/cpu68.vhd similarity index 100% rename from Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/cpu68.vhd rename to Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/cpu68.vhd diff --git a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/defender_sound_board.vhd b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/defender_sound_board.vhd similarity index 100% rename from Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/defender_sound_board.vhd rename to Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/defender_sound_board.vhd diff --git a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/dpram.vhd b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/dpram.vhd similarity index 100% rename from Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/dpram.vhd rename to Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/dpram.vhd diff --git a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/gen_ram.vhd b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/gen_ram.vhd similarity index 100% rename from Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/gen_ram.vhd rename to Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/gen_ram.vhd diff --git a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/pll_mist.qip b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/pll_mist.qip similarity index 100% rename from Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/pll_mist.qip rename to Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/pll_mist.qip diff --git a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/pll_mist.vhd b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/pll_mist.vhd similarity index 100% rename from Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/pll_mist.vhd rename to Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/pll_mist.vhd diff --git a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/robotron_cpu/decoder_4.vhd b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/robotron_cpu/decoder_4.vhd similarity index 100% rename from Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/robotron_cpu/decoder_4.vhd rename to Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/robotron_cpu/decoder_4.vhd diff --git a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/robotron_cpu/decoder_6.vhd b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/robotron_cpu/decoder_6.vhd similarity index 100% rename from Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/robotron_cpu/decoder_6.vhd rename to Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/robotron_cpu/decoder_6.vhd diff --git a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/robotron_cpu/robotron_cpu.vhd b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/robotron_cpu/robotron_cpu.vhd old mode 100755 new mode 100644 similarity index 100% rename from Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/robotron_cpu/robotron_cpu.vhd rename to Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/robotron_cpu/robotron_cpu.vhd diff --git a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/robotron_cpu/robotron_cpu_test.vhd b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/robotron_cpu/robotron_cpu_test.vhd old mode 100755 new mode 100644 similarity index 100% rename from Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/robotron_cpu/robotron_cpu_test.vhd rename to Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/robotron_cpu/robotron_cpu_test.vhd diff --git a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/robotron_cpu/sc1.vhd b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/robotron_cpu/sc1.vhd similarity index 100% rename from Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/robotron_cpu/sc1.vhd rename to Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/robotron_cpu/sc1.vhd diff --git a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/robotron_cpu/sc1_tb.vhd b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/robotron_cpu/sc1_tb.vhd old mode 100755 new mode 100644 similarity index 100% rename from Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/robotron_cpu/sc1_tb.vhd rename to Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/robotron_cpu/sc1_tb.vhd diff --git a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/robotron_soc.vhd b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/robotron_soc.vhd similarity index 100% rename from Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/robotron_soc.vhd rename to Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/robotron_soc.vhd diff --git a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/sdram.sv b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/sdram.sv similarity index 100% rename from Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/rtl/sdram.sv rename to Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/rtl/sdram.sv diff --git a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/buildall.sh b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/buildall.sh deleted file mode 100755 index 2fa8e228..00000000 --- a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/buildall.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -PROJECTS=" \ -ROBOTRON \ -JOUST \ -SPLAT \ -BUBBLES \ -STARGATE \ -SINISTAR" - -mkdir -p Releases -for PROJECT in $PROJECTS; do - echo "Compiling $PROJECT" - sed -i "s/^.define CORE_NAME.*/\`define CORE_NAME \"$PROJECT\"/" rtl/RobotronFPGA_MiST.sv - quartus_sh --flow compile RobotronFPGA.qsf && cp output_files/RobotronFPGA.rbf Releases/$PROJECT.rbf -done \ No newline at end of file diff --git a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/clean.bat b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/clean.bat deleted file mode 100644 index c9a2cb06..00000000 --- a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron-FPGA/clean.bat +++ /dev/null @@ -1,15 +0,0 @@ -@echo off -del /s *.bak -del /s *.orig -del /s *.rej -rmdir /s /q db -rmdir /s /q incremental_db -rmdir /s /q output -rmdir /s /q simulation -rmdir /s /q greybox_tmp -del PLLJ_PLLSPE_INFO.txt -del *.qws -del *.ppf -del *.qip -del *.ddb -pause