From a7d33ca1866803f235df95a186974c9fa0c4ade4 Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Wed, 28 Jun 2023 15:55:36 +0200
Subject: [PATCH] connects missing pins in system

---
 contrib/eclipse_launch/TGC-VP.launch | 5 +++--
 scc                                  | 2 +-
 src/tgc_vp/system.cpp                | 6 ++----
 src/tgc_vp/system.h                  | 3 ---
 vpvper                               | 2 +-
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/contrib/eclipse_launch/TGC-VP.launch b/contrib/eclipse_launch/TGC-VP.launch
index 56a52c7..f28407a 100644
--- a/contrib/eclipse_launch/TGC-VP.launch
+++ b/contrib/eclipse_launch/TGC-VP.launch
@@ -16,13 +16,14 @@
     <stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
     <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_ID" value="gdb"/>
     <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="run"/>
-    <booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
-    <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
+    <booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="false"/>
+    <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="sc_main"/>
     <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="-f fw/hello-world/hello -p pctrace=contrib/TGC_C_cycles.json"/>
     <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/Debug/src/tgc-vp"/>
     <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="TGC-VP"/>
     <booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
     <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="cdt.managedbuild.toolchain.gnu.base.1730410661"/>
+    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
         <listEntry value="/TGC-VP"/>
     </listAttribute>
diff --git a/scc b/scc
index fbc21a0..76f36cc 160000
--- a/scc
+++ b/scc
@@ -1 +1 @@
-Subproject commit fbc21a0509e01f3697a16dc407eaa40b9d6a5cbb
+Subproject commit 76f36cc6068e2e586675289e4d48559146560ec0
diff --git a/src/tgc_vp/system.cpp b/src/tgc_vp/system.cpp
index 178a017..0ad1ef1 100644
--- a/src/tgc_vp/system.cpp
+++ b/src/tgc_vp/system.cpp
@@ -97,8 +97,8 @@ system::system(sc_core::sc_module_name nm)
     qspi1.irq_o(global_int_s[6]);
     qspi2.irq_o(global_int_s[7]);
 
-    s_dummy_sck_i[0](uart1.tx_o);
-    uart1.rx_i(s_dummy_sck_o[0]);
+    gpio0.iof0_i[16](uart1.tx_o);
+    uart1.rx_i(gpio0.iof0_o[17]);
     uart1.irq_o(global_int_s[4]);
 
     gpio0.iof1_i[0](pwm0.cmpgpio_o[0]);
@@ -130,8 +130,6 @@ system::system(sc_core::sc_module_name nm)
     pwm2.cmpip_o[1](global_int_s[49]);
     pwm2.cmpip_o[2](global_int_s[50]);
     pwm2.cmpip_o[3](global_int_s[51]);
-
-    for (auto &sock : s_dummy_sck_i) sock.error_if_no_callback = false;
 }
 
 } /* namespace sysc */
diff --git a/src/tgc_vp/system.h b/src/tgc_vp/system.h
index 70577d0..ff41cbd 100644
--- a/src/tgc_vp/system.h
+++ b/src/tgc_vp/system.h
@@ -65,9 +65,6 @@ private:
     sc_core::sc_vector<sc_core::sc_signal<bool, sc_core::SC_MANY_WRITERS>> global_int_s{"global_int_s", 256}, local_int_s{"local_int_s", 16};
     sc_core::sc_signal<bool, sc_core::SC_MANY_WRITERS> core_int_s{"core_int_s"};
     
-    sc_core::sc_vector<tlm::scc::tlm_signal_bool_opt_in> s_dummy_sck_i{"s_dummy_sck_i", 16};
-    sc_core::sc_vector<tlm::scc::tlm_signal_bool_opt_out> s_dummy_sck_o{"s_dummy_sck_o", 16};
-
 protected:
     void gen_reset();
     vpvper::sifive::spi& qspi0;
diff --git a/vpvper b/vpvper
index 755a9a3..ce00e1b 160000
--- a/vpvper
+++ b/vpvper
@@ -1 +1 @@
-Subproject commit 755a9a3f19cd6c3364a17ac15c521c09de71341d
+Subproject commit ce00e1bb0a8dfa019287072c0c35f96195f377e0