reorg of SACI version1 vs version 2 src code

slaclab · Dec 4, 2024 · c5a286c · c5a286c
1 parent 41870b9
commit c5a286c
Show file tree

Hide file tree

Showing 42 changed files with 20 additions and 6 deletions.
diff --git a/protocols/saci/ruckus.tcl b/protocols/saci/ruckus.tcl
@@ -1,8 +1,6 @@
-# Load RUCKUS library
+# Load RUCKUS environment and library
 source $::env(RUCKUS_PROC_TCL)
 
-# Load Source Code
-loadSource -lib surf -dir "$::DIR_PATH/rtl"
-
-# Load Simulation
-loadSource -lib surf -sim_only -dir "$::DIR_PATH/sim"
+# Load ruckus files
+loadRuckusTcl "$::DIR_PATH/saci1"
+loadRuckusTcl "$::DIR_PATH/saci2"
diff --git a/protocols/saci/doc/SACI.pptx → protocols/saci/saci1/doc/SACI.pptx b/protocols/saci/doc/SACI.pptx → protocols/saci/saci1/doc/SACI.pptx
diff --git a/protocols/saci/doc/SaciRdCmd.png → protocols/saci/saci1/doc/SaciRdCmd.png b/protocols/saci/doc/SaciRdCmd.png → protocols/saci/saci1/doc/SaciRdCmd.png
diff --git a/protocols/saci/doc/SaciRdCmd.svg → protocols/saci/saci1/doc/SaciRdCmd.svg b/protocols/saci/doc/SaciRdCmd.svg → protocols/saci/saci1/doc/SaciRdCmd.svg
diff --git a/protocols/saci/doc/SaciRdRsp.png → protocols/saci/saci1/doc/SaciRdRsp.png b/protocols/saci/doc/SaciRdRsp.png → protocols/saci/saci1/doc/SaciRdRsp.png
diff --git a/protocols/saci/doc/SaciRdRsp.svg → protocols/saci/saci1/doc/SaciRdRsp.svg b/protocols/saci/doc/SaciRdRsp.svg → protocols/saci/saci1/doc/SaciRdRsp.svg
diff --git a/protocols/saci/doc/SaciRead.tim → protocols/saci/saci1/doc/SaciRead.tim b/protocols/saci/doc/SaciRead.tim → protocols/saci/saci1/doc/SaciRead.tim
diff --git a/protocols/saci/doc/SaciWrCmd-1.png → protocols/saci/saci1/doc/SaciWrCmd-1.png b/protocols/saci/doc/SaciWrCmd-1.png → protocols/saci/saci1/doc/SaciWrCmd-1.png
diff --git a/protocols/saci/doc/SaciWrCmd.png → protocols/saci/saci1/doc/SaciWrCmd.png b/protocols/saci/doc/SaciWrCmd.png → protocols/saci/saci1/doc/SaciWrCmd.png
diff --git a/protocols/saci/doc/SaciWrCmd.svg → protocols/saci/saci1/doc/SaciWrCmd.svg b/protocols/saci/doc/SaciWrCmd.svg → protocols/saci/saci1/doc/SaciWrCmd.svg
diff --git a/protocols/saci/doc/SaciWrRsp-1.png → protocols/saci/saci1/doc/SaciWrRsp-1.png b/protocols/saci/doc/SaciWrRsp-1.png → protocols/saci/saci1/doc/SaciWrRsp-1.png
diff --git a/protocols/saci/doc/SaciWrRsp.png → protocols/saci/saci1/doc/SaciWrRsp.png b/protocols/saci/doc/SaciWrRsp.png → protocols/saci/saci1/doc/SaciWrRsp.png
diff --git a/protocols/saci/doc/SaciWrRsp.svg → protocols/saci/saci1/doc/SaciWrRsp.svg b/protocols/saci/doc/SaciWrRsp.svg → protocols/saci/saci1/doc/SaciWrRsp.svg
diff --git a/protocols/saci/doc/SaciWrRsp1.png → protocols/saci/saci1/doc/SaciWrRsp1.png b/protocols/saci/doc/SaciWrRsp1.png → protocols/saci/saci1/doc/SaciWrRsp1.png
diff --git a/protocols/saci/doc/SaciWrRsp1.svg → protocols/saci/saci1/doc/SaciWrRsp1.svg b/protocols/saci/doc/SaciWrRsp1.svg → protocols/saci/saci1/doc/SaciWrRsp1.svg
diff --git a/protocols/saci/doc/SaciWrite.tim → protocols/saci/saci1/doc/SaciWrite.tim b/protocols/saci/doc/SaciWrite.tim → protocols/saci/saci1/doc/SaciWrite.tim
diff --git a/protocols/saci/doc/Snap_Saci_rev2b.bmp → protocols/saci/saci1/doc/Snap_Saci_rev2b.bmp b/protocols/saci/doc/Snap_Saci_rev2b.bmp → protocols/saci/saci1/doc/Snap_Saci_rev2b.bmp
diff --git a/protocols/saci/doc/waveforms.js → protocols/saci/saci1/doc/waveforms.js b/protocols/saci/doc/waveforms.js → protocols/saci/saci1/doc/waveforms.js
diff --git a/protocols/saci/rtl/AxiLiteSaciMaster.vhd → ...cols/saci/saci1/rtl/AxiLiteSaciMaster.vhd b/protocols/saci/rtl/AxiLiteSaciMaster.vhd → ...cols/saci/saci1/rtl/AxiLiteSaciMaster.vhd
diff --git a/protocols/saci/rtl/SaciAxiLiteMaster.vhd → ...cols/saci/saci1/rtl/SaciAxiLiteMaster.vhd b/protocols/saci/rtl/SaciAxiLiteMaster.vhd → ...cols/saci/saci1/rtl/SaciAxiLiteMaster.vhd
diff --git a/protocols/saci/rtl/SaciMaster.vhd → protocols/saci/saci1/rtl/SaciMaster.vhd b/protocols/saci/rtl/SaciMaster.vhd → protocols/saci/saci1/rtl/SaciMaster.vhd
diff --git a/protocols/saci/rtl/SaciMaster2.vhd → protocols/saci/saci1/rtl/SaciMaster2.vhd b/protocols/saci/rtl/SaciMaster2.vhd → protocols/saci/saci1/rtl/SaciMaster2.vhd
diff --git a/protocols/saci/rtl/SaciMasterPkg.vhd → protocols/saci/saci1/rtl/SaciMasterPkg.vhd b/protocols/saci/rtl/SaciMasterPkg.vhd → protocols/saci/saci1/rtl/SaciMasterPkg.vhd
diff --git a/protocols/saci/rtl/SaciMasterSync.vhd → protocols/saci/saci1/rtl/SaciMasterSync.vhd b/protocols/saci/rtl/SaciMasterSync.vhd → protocols/saci/saci1/rtl/SaciMasterSync.vhd
diff --git a/protocols/saci/rtl/SaciMultiPixel.vhd → protocols/saci/saci1/rtl/SaciMultiPixel.vhd b/protocols/saci/rtl/SaciMultiPixel.vhd → protocols/saci/saci1/rtl/SaciMultiPixel.vhd
diff --git a/protocols/saci/rtl/SaciMultiPixelPkg.vhd → ...cols/saci/saci1/rtl/SaciMultiPixelPkg.vhd b/protocols/saci/rtl/SaciMultiPixelPkg.vhd → ...cols/saci/saci1/rtl/SaciMultiPixelPkg.vhd
diff --git a/protocols/saci/rtl/SaciPrepRdout.vhd → protocols/saci/saci1/rtl/SaciPrepRdout.vhd b/protocols/saci/rtl/SaciPrepRdout.vhd → protocols/saci/saci1/rtl/SaciPrepRdout.vhd
diff --git a/protocols/saci/rtl/SaciSlave.vhd → protocols/saci/saci1/rtl/SaciSlave.vhd b/protocols/saci/rtl/SaciSlave.vhd → protocols/saci/saci1/rtl/SaciSlave.vhd
diff --git a/protocols/saci/rtl/SaciSlaveOld.vhd → protocols/saci/saci1/rtl/SaciSlaveOld.vhd b/protocols/saci/rtl/SaciSlaveOld.vhd → protocols/saci/saci1/rtl/SaciSlaveOld.vhd
diff --git a/protocols/saci/saci1/ruckus.tcl b/protocols/saci/saci1/ruckus.tcl
@@ -0,0 +1,8 @@
+# Load RUCKUS library
+source $::env(RUCKUS_PROC_TCL)
+
+# Load Source Code
+loadSource -lib surf -dir "$::DIR_PATH/rtl"
+
+# Load Simulation
+loadSource -lib surf -sim_only -dir "$::DIR_PATH/sim"
diff --git a/protocols/saci/sim/AxiLiteSaciMasterTb.vhd → ...ls/saci/saci1/sim/AxiLiteSaciMasterTb.vhd b/protocols/saci/sim/AxiLiteSaciMasterTb.vhd → ...ls/saci/saci1/sim/AxiLiteSaciMasterTb.vhd
diff --git a/protocols/saci/sim/FrontEndSaciPkg.vhd → protocols/saci/saci1/sim/FrontEndSaciPkg.vhd b/protocols/saci/sim/FrontEndSaciPkg.vhd → protocols/saci/saci1/sim/FrontEndSaciPkg.vhd
diff --git a/protocols/saci/sim/SaciAxiLiteMasterTb.vhd → ...ls/saci/saci1/sim/SaciAxiLiteMasterTb.vhd b/protocols/saci/sim/SaciAxiLiteMasterTb.vhd → ...ls/saci/saci1/sim/SaciAxiLiteMasterTb.vhd
diff --git a/...s/saci/sim/SaciAxiLiteMasterTbWrapper.vhd → .../saci1/sim/SaciAxiLiteMasterTbWrapper.vhd b/...s/saci/sim/SaciAxiLiteMasterTbWrapper.vhd → .../saci1/sim/SaciAxiLiteMasterTbWrapper.vhd
diff --git a/protocols/saci/sim/SaciSlaveAnalog.v → protocols/saci/saci1/sim/SaciSlaveAnalog.v b/protocols/saci/sim/SaciSlaveAnalog.v → protocols/saci/saci1/sim/SaciSlaveAnalog.v
diff --git a/protocols/saci/sim/SaciSlaveRam.vhd → protocols/saci/saci1/sim/SaciSlaveRam.vhd b/protocols/saci/sim/SaciSlaveRam.vhd → protocols/saci/saci1/sim/SaciSlaveRam.vhd
diff --git a/protocols/saci/sim/SaciSlaveWrapper.vhd → ...ocols/saci/saci1/sim/SaciSlaveWrapper.vhd b/protocols/saci/sim/SaciSlaveWrapper.vhd → ...ocols/saci/saci1/sim/SaciSlaveWrapper.vhd
diff --git a/...cols/saci/rtl/AxiLiteSaci2Coordinator.vhd → ...aci/saci2/rtl/AxiLiteSaci2Coordinator.vhd b/...cols/saci/rtl/AxiLiteSaci2Coordinator.vhd → ...aci/saci2/rtl/AxiLiteSaci2Coordinator.vhd
diff --git a/protocols/saci/rtl/Saci2Coordinator.vhd → ...ocols/saci/saci2/rtl/Saci2Coordinator.vhd b/protocols/saci/rtl/Saci2Coordinator.vhd → ...ocols/saci/saci2/rtl/Saci2Coordinator.vhd
diff --git a/protocols/saci/rtl/Saci2Subordinate.vhd → ...ocols/saci/saci2/rtl/Saci2Subordinate.vhd b/protocols/saci/rtl/Saci2Subordinate.vhd → ...ocols/saci/saci2/rtl/Saci2Subordinate.vhd
diff --git a/...aci/rtl/Saci2SubordinateAxiLiteMaster.vhd → ...ci2/rtl/Saci2SubordinateAxiLiteMaster.vhd b/...aci/rtl/Saci2SubordinateAxiLiteMaster.vhd → ...ci2/rtl/Saci2SubordinateAxiLiteMaster.vhd
diff --git a/protocols/saci/saci2/ruckus.tcl b/protocols/saci/saci2/ruckus.tcl
@@ -0,0 +1,8 @@
+# Load RUCKUS library
+source $::env(RUCKUS_PROC_TCL)
+
+# Load Source Code
+loadSource -lib surf -dir "$::DIR_PATH/rtl"
+
+# Load Simulation
+#loadSource -lib surf -sim_only -dir "$::DIR_PATH/sim"