diff --git a/Logic/68030-68000-bus.vhd b/Logic/68030-68000-bus.vhd
index 47bd056..ace6c00 100644
--- a/Logic/68030-68000-bus.vhd
+++ b/Logic/68030-68000-bus.vhd
@@ -232,7 +232,7 @@ begin
RESET_DLY <= "00000000";
elsif(rising_edge(CLK_OSZI)) then
--reset delay: wait 128 E-Clocks!
- if(CLK_000_NE_D0 = '1' and cpu_est = E1 and RESET = '0') then
+ if(CLK_000_NE_D0 = '1' and cpu_est = E1) then
RESET_DLY <= RESET_DLY +1;
end if;
end if;
@@ -493,11 +493,11 @@ begin
-- bus drivers
- AMIGA_ADDR_ENABLE <= AMIGA_BUS_ENABLE_INT WHEN AS_030='0' ELSE '1';
- AMIGA_BUS_ENABLE_HIGH <= '0' WHEN BGACK_030_INT ='1' AND AMIGA_BUS_ENABLE_INT ='0' AND AS_030='0' ELSE
- '0' WHEN BGACK_030_INT ='0' AND AMIGA_BUS_ENABLE_DMA_HIGH = '0' AND AS_000_DMA='0' ELSE
+ AMIGA_ADDR_ENABLE <= AMIGA_BUS_ENABLE_INT;
+ AMIGA_BUS_ENABLE_HIGH <= '0' WHEN BGACK_030_INT ='1' AND AMIGA_BUS_ENABLE_INT ='0' ELSE
+ '0' WHEN BGACK_030_INT ='0' AND AMIGA_BUS_ENABLE_DMA_HIGH = '0' ELSE
'1';
- AMIGA_BUS_ENABLE_LOW <= '0' WHEN BGACK_030_INT ='0' AND AMIGA_BUS_ENABLE_DMA_LOW = '0' AND AS_000_DMA='0' ELSE
+ AMIGA_BUS_ENABLE_LOW <= '0' WHEN BGACK_030_INT ='0' AND AMIGA_BUS_ENABLE_DMA_LOW = '0' ELSE
'1';
diff --git a/Logic/68030_TK.tcl b/Logic/68030_TK.tcl
index b36a01e..35b3132 100644
--- a/Logic/68030_TK.tcl
+++ b/Logic/68030_TK.tcl
@@ -279146,3 +279146,369 @@ if [runCmd "\"$cpld_bin/synsvf\" -exe \"$install_dir/ispvmsystem/ispufw\" -prj 6
########## Tcl recorder end at 10/05/14 00:12:34 ###########
+
+########## Tcl recorder starts at 10/05/14 21:30:23 ##########
+
+# Commands to make the Process:
+# Hierarchy
+if [runCmd "\"$cpld_bin/vhd2jhd\" 68030-68000-bus.vhd -o 68030-68000-bus.jhd -m \"$install_dir/ispcpld/generic/lib/vhd/location.map\" -p \"$install_dir/ispcpld/generic/lib\""] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+
+########## Tcl recorder end at 10/05/14 21:30:23 ###########
+
+
+########## Tcl recorder starts at 10/05/14 21:30:24 ##########
+
+# Commands to make the Process:
+# JEDEC File
+if [catch {open BUS68030.cmd w} rspFile] {
+ puts stderr "Cannot create response file BUS68030.cmd: $rspFile"
+} else {
+ puts $rspFile "STYFILENAME: 68030_tk.sty
+PROJECT: BUS68030
+WORKING_PATH: \"$proj_dir\"
+MODULE: BUS68030
+VHDL_FILE_LIST: 68030-68000-bus.vhd
+OUTPUT_FILE_NAME: BUS68030
+SUFFIX_NAME: edi
+PART: M4A5-128/64-10VC
+"
+ close $rspFile
+}
+if [runCmd "\"$cpld_bin/Synpwrap\" -e BUS68030 -target mach -pro "] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+file delete BUS68030.cmd
+if [runCmd "\"$cpld_bin/edif2blf\" -edf BUS68030.edi -out BUS68030.bl0 -err automake.err -log BUS68030.log -prj 68030_tk -lib \"$install_dir/ispcpld/dat/mach.edn\" -net_Vcc VCC -net_GND GND -nbx -dse -tlw -cvt YES -xor"] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+if [runCmd "\"$cpld_bin/mblifopt\" BUS68030.bl0 -collapse none -reduce none -keepwires -err automake.err -family"] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+if [runCmd "\"$cpld_bin/mblflink\" \"BUS68030.bl1\" -o \"68030_tk.bl2\" -omod \"68030_tk\" -err \"automake.err\""] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+if [runCmd "\"$cpld_bin/impsrc\" -prj 68030_tk -lci 68030_tk.lct -log 68030_tk.imp -err automake.err -tti 68030_tk.bl2 -dir $proj_dir"] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+if [runCmd "\"$cpld_bin/abelvci\" -vci 68030_tk.lct -blifopt 68030_tk.b2_"] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+if [runCmd "\"$cpld_bin/mblifopt\" 68030_tk.bl2 -sweep -mergefb -err automake.err -o 68030_tk.bl3 @68030_tk.b2_"] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+if [runCmd "\"$cpld_bin/abelvci\" -vci 68030_tk.lct -dev mach4a -diofft 68030_tk.d0"] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+if [runCmd "\"$cpld_bin/mdiofft\" 68030_tk.bl3 -pla -family AMDMACH -idev van -o 68030_tk.tt2 -oxrf 68030_tk.xrf -err automake.err @68030_tk.d0"] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+if [runCmd "\"$cpld_bin/tt2tott3\" -prj 68030_tk -dir $proj_dir -log 68030_tk.log -tti 68030_tk.tt2 -tto 68030_tk.tt3"] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+if [runCmd "\"$cpld_bin/abelvci\" -vci 68030_tk.lct -dev mach4a -prefit 68030_tk.l0"] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+if [runCmd "\"$cpld_bin/prefit\" -inp 68030_tk.tt3 -out 68030_tk.tt4 -err automake.err -log 68030_tk.log -percent 68030_tk.tte -mod BUS68030 @68030_tk.l0"] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+if [runCmd "\"$cpld_bin/blif2eqn\" 68030_tk.tte -o 68030_tk.eq3 -use_short -err automake.err "] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+if [runCmd "\"$cpld_bin/lci2vci\" -lci 68030_tk.lct -out 68030_tk.vct -log 68030_tk.l2v"] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+if [catch {open 68030_tk.rsp w} rspFile] {
+ puts stderr "Cannot create response file 68030_tk.rsp: $rspFile"
+} else {
+ puts $rspFile "-inp \"68030_tk.tt4\" -vci \"68030_tk.vct\" -log \"68030_tk.log\" -eqn \"68030_tk.eq3\" -dev mach447a -dat \"$install_dir/ispcpld/dat/mach4a/\" -msg \"$install_dir/ispcpld/dat/\" -err automake.err -tmv \"NoInput.tmv\"
+"
+ close $rspFile
+}
+if [runCmd "\"$cpld_bin/machfitr\" \"@68030_tk.rsp\""] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+file delete 68030_tk.rsp
+if [runCmd "\"$cpld_bin/lci2vci\" -vci 68030_tk.vco -out 68030_tk.lco -log 68030_tk.v2l"] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+if [runCmd "\"$cpld_bin/synsvf\" -exe \"$install_dir/ispvmsystem/ispufw\" -prj 68030_tk -if 68030_tk.jed -j2s -log 68030_tk.svl "] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+
+########## Tcl recorder end at 10/05/14 21:30:24 ###########
+
+
+########## Tcl recorder starts at 10/05/14 21:32:32 ##########
+
+# Commands to make the Process:
+# Hierarchy
+if [runCmd "\"$cpld_bin/vhd2jhd\" 68030-68000-bus.vhd -o 68030-68000-bus.jhd -m \"$install_dir/ispcpld/generic/lib/vhd/location.map\" -p \"$install_dir/ispcpld/generic/lib\""] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+
+########## Tcl recorder end at 10/05/14 21:32:32 ###########
+
+
+########## Tcl recorder starts at 10/05/14 21:32:32 ##########
+
+# Commands to make the Process:
+# JEDEC File
+if [catch {open BUS68030.cmd w} rspFile] {
+ puts stderr "Cannot create response file BUS68030.cmd: $rspFile"
+} else {
+ puts $rspFile "STYFILENAME: 68030_tk.sty
+PROJECT: BUS68030
+WORKING_PATH: \"$proj_dir\"
+MODULE: BUS68030
+VHDL_FILE_LIST: 68030-68000-bus.vhd
+OUTPUT_FILE_NAME: BUS68030
+SUFFIX_NAME: edi
+PART: M4A5-128/64-10VC
+"
+ close $rspFile
+}
+if [runCmd "\"$cpld_bin/Synpwrap\" -e BUS68030 -target mach -pro "] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+file delete BUS68030.cmd
+if [runCmd "\"$cpld_bin/edif2blf\" -edf BUS68030.edi -out BUS68030.bl0 -err automake.err -log BUS68030.log -prj 68030_tk -lib \"$install_dir/ispcpld/dat/mach.edn\" -net_Vcc VCC -net_GND GND -nbx -dse -tlw -cvt YES -xor"] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+if [runCmd "\"$cpld_bin/mblifopt\" BUS68030.bl0 -collapse none -reduce none -keepwires -err automake.err -family"] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+if [runCmd "\"$cpld_bin/mblflink\" \"BUS68030.bl1\" -o \"68030_tk.bl2\" -omod \"68030_tk\" -err \"automake.err\""] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+if [runCmd "\"$cpld_bin/impsrc\" -prj 68030_tk -lci 68030_tk.lct -log 68030_tk.imp -err automake.err -tti 68030_tk.bl2 -dir $proj_dir"] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+if [runCmd "\"$cpld_bin/abelvci\" -vci 68030_tk.lct -blifopt 68030_tk.b2_"] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+if [runCmd "\"$cpld_bin/mblifopt\" 68030_tk.bl2 -sweep -mergefb -err automake.err -o 68030_tk.bl3 @68030_tk.b2_"] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+if [runCmd "\"$cpld_bin/abelvci\" -vci 68030_tk.lct -dev mach4a -diofft 68030_tk.d0"] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+if [runCmd "\"$cpld_bin/mdiofft\" 68030_tk.bl3 -pla -family AMDMACH -idev van -o 68030_tk.tt2 -oxrf 68030_tk.xrf -err automake.err @68030_tk.d0"] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+if [runCmd "\"$cpld_bin/tt2tott3\" -prj 68030_tk -dir $proj_dir -log 68030_tk.log -tti 68030_tk.tt2 -tto 68030_tk.tt3"] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+if [runCmd "\"$cpld_bin/abelvci\" -vci 68030_tk.lct -dev mach4a -prefit 68030_tk.l0"] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+if [runCmd "\"$cpld_bin/prefit\" -inp 68030_tk.tt3 -out 68030_tk.tt4 -err automake.err -log 68030_tk.log -percent 68030_tk.tte -mod BUS68030 @68030_tk.l0"] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+if [runCmd "\"$cpld_bin/blif2eqn\" 68030_tk.tte -o 68030_tk.eq3 -use_short -err automake.err "] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+if [runCmd "\"$cpld_bin/lci2vci\" -lci 68030_tk.lct -out 68030_tk.vct -log 68030_tk.l2v"] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+if [catch {open 68030_tk.rsp w} rspFile] {
+ puts stderr "Cannot create response file 68030_tk.rsp: $rspFile"
+} else {
+ puts $rspFile "-inp \"68030_tk.tt4\" -vci \"68030_tk.vct\" -log \"68030_tk.log\" -eqn \"68030_tk.eq3\" -dev mach447a -dat \"$install_dir/ispcpld/dat/mach4a/\" -msg \"$install_dir/ispcpld/dat/\" -err automake.err -tmv \"NoInput.tmv\"
+"
+ close $rspFile
+}
+if [runCmd "\"$cpld_bin/machfitr\" \"@68030_tk.rsp\""] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+file delete 68030_tk.rsp
+if [runCmd "\"$cpld_bin/lci2vci\" -vci 68030_tk.vco -out 68030_tk.lco -log 68030_tk.v2l"] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+if [runCmd "\"$cpld_bin/synsvf\" -exe \"$install_dir/ispvmsystem/ispufw\" -prj 68030_tk -if 68030_tk.jed -j2s -log 68030_tk.svl "] {
+ return
+} else {
+ vwait done
+ if [checkResult $done] {
+ return
+ }
+}
+
+########## Tcl recorder end at 10/05/14 21:32:32 ###########
+
diff --git a/Logic/68030_tk.crf b/Logic/68030_tk.crf
index 9959bed..f843dbd 100644
--- a/Logic/68030_tk.crf
+++ b/Logic/68030_tk.crf
@@ -1,7 +1,7 @@
// Signal Name Cross Reference File
// ispLEVER Classic 1.7.00.05.28.13
-// Design '68030_tk' created Sun Oct 05 00:12:41 2014
+// Design '68030_tk' created Sun Oct 05 21:32:39 2014
// LEGEND: '>' Functional Block Port Separator
diff --git a/Logic/68030_tk.ipr b/Logic/68030_tk.ipr
index 2274747..4a1ff2f 100644
Binary files a/Logic/68030_tk.ipr and b/Logic/68030_tk.ipr differ
diff --git a/Logic/BUS68030.prj b/Logic/BUS68030.prj
index 289cfb2..1c22fe1 100644
--- a/Logic/BUS68030.prj
+++ b/Logic/BUS68030.prj
@@ -1,6 +1,6 @@
#-- Lattice Semiconductor Corporation Ltd.
#-- Synplify OEM project file c:/users/matze/documents/github/68030tk/logic\BUS68030.prj
-#-- Written on Sun Oct 05 00:12:34 2014
+#-- Written on Sun Oct 05 21:32:32 2014
#device options
diff --git a/Logic/Programming.xcf b/Logic/Programming.xcf
index 99c2f55..5791c35 100644
--- a/Logic/Programming.xcf
+++ b/Logic/Programming.xcf
@@ -19,8 +19,8 @@
0
C:\Users\Matze\Documents\GitHub\68030tk\Logic\68030_tk.jed
- 10/05/14 00:12:48
- 0x0375
+ 10/05/14 21:32:45
+ 0x4FC8
Erase,Program,Verify