From 6b25d6fea0669c9e069d51a17341864af58d130a Mon Sep 17 00:00:00 2001
From: Cindy Liu <hcindyl@google.com>
Date: Wed, 15 Sep 2021 22:03:31 +0000
Subject: [PATCH] Merge "kata:VectorCoreDriver: Use HW register header."

GitOrigin-RevId: 7b10748eb801311b291aeba25cc0535f4e0b09d4
---
 apps/system/CMakeLists.txt                           | 5 ++++-
 apps/system/components/VectorCoreDriver/src/driver.c | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/apps/system/CMakeLists.txt b/apps/system/CMakeLists.txt
index da3d4ba..5d74eae 100644
--- a/apps/system/CMakeLists.txt
+++ b/apps/system/CMakeLists.txt
@@ -74,7 +74,10 @@ DeclareCAmkESComponent(SeL4Debug
 )
 
 DeclareCAmkESComponent(VectorCoreDriver
-  SOURCES components/VectorCoreDriver/src/driver.c
+  SOURCES
+  components/VectorCoreDriver/src/driver.c
+  INCLUDES
+  vc_top-gen/include
 )
 
 DeclareCAmkESRootserver(system.camkes)
diff --git a/apps/system/components/VectorCoreDriver/src/driver.c b/apps/system/components/VectorCoreDriver/src/driver.c
index b748c0a..ca807af 100644
--- a/apps/system/components/VectorCoreDriver/src/driver.c
+++ b/apps/system/components/VectorCoreDriver/src/driver.c
@@ -1,8 +1,9 @@
 #include <camkes.h>
 #include <stdint.h>
 
-// TODO: Set offsets into memory based on `csr`.
-#define CTRL (csr + 0x0)
+#include "vc_top/vc_top.h"
+
+#define CTRL (csr + VC_TOP_CTRL_REG_OFFSET)
 
 void vctop_set_ctrl(uint32_t ctrl) {
     *((volatile uint32_t*)CTRL) = ctrl;