Add ch32v support

ebs-universe · Jan 25, 2025 · 2f2664f · 2f2664f
1 parent 8a43283
commit 2f2664f
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 5 deletions.
diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
     "name": "ebs-platform",
-    "version": "0.3.5",
+    "version": "0.4.0",
     "description": "Common EBS Platform Interfaces",
     "keywords": "ebs",
     "repository": {

diff --git a/src/platform/cpu.h b/src/platform/cpu.h
@@ -65,6 +65,19 @@
     static inline void global_interrupt_disable(void){
         __disable_irq();
     }
+#elif defined __riscv
+    #if defined __CH32V00x_H
+    // Use definitions of ch32v003fun.h 
+    static inline void global_interrupt_enable(void){
+        __enable_irq();
+    }
+
+    static inline void global_interrupt_disable(void){
+        __disable_irq();
+    }
+    #else
+        #error "RISC-V platform not supported"
+    #endif
 #elif (defined __linux__ || defined _WIN32)
     static inline void global_interrupt_enable(void){
         ;

diff --git a/src/platform/debug.c b/src/platform/debug.c
@@ -22,6 +22,17 @@ typedef union {
 
 #endif
 
+#ifdef __riscv 
+#if __riscv_xlen == 32
+typedef struct {
+    uint32_t mstatus;
+    uint32_t mtval;
+    uint32_t mcause;
+    uint32_t mepc;
+} RV32_FAULT_t;
+#endif
+#endif
+
 #pragma GCC push_options 
 #pragma GCC optimize("O0")
 
@@ -34,6 +45,20 @@ void die(void) {
     uint32_t bfar = *((HAL_SFR_t *)0xE000ED38);
     (void) bfar;
     #endif
+    #ifdef __riscv
+    #if __riscv_xlen == 32
+        RV32_FAULT_t fault;
+        #ifdef __CH32V00x_H
+        // It is unclear how portable this is. Presently used for 
+        // CH32V00xx only, using primitives from ch32v003fun.h
+        fault.mstatus = __get_MSTATUS();
+        fault.mtval = __get_MTVAL();
+        fault.mcause = __get_MCAUSE();
+        fault.mepc = __get_MEPC();
+        #endif
+        (void) fault;
+    #endif
+    #endif
     #if APP_ENABLE_OUTPUT_ERROR
         #if ERROR_POLARITY
         gpio_set_output_high(ERROR_GPIO);
@@ -46,6 +71,7 @@ void die(void) {
 
 #pragma GCC pop_options 
 
+#if APP_ENABLE_DEBUG
 #if DEBUG_TRANSPORT_TYPE == EBS_INTF_UART
 #include <hal/uc/uart.h>
 
@@ -93,5 +119,5 @@ HAL_BASE_t _debug_printf(const char *format, ...){
 void _debug_flush(void){
 
 }
-
+#endif
 #endif
diff --git a/src/platform/debug.h b/src/platform/debug.h
@@ -5,18 +5,18 @@
 
 #include <application.h>
 #include <stdarg.h>
-#include "platform/types.h"
+#include "types.h"
 
 
 void die(void);
 
+#if APP_ENABLE_DEBUG
+
 HAL_BASE_t _debug_putchar(char c);
 HAL_BASE_t _debug_write(const void *buffer, HAL_BASE_t len);
 HAL_BASE_t _debug_printf(const char *format, va_list args);
 void _debug_flush(void);
 
-#if APP_ENABLE_DEBUG
-
 static inline HAL_BASE_t debug_putchar(char c) {
     return _debug_putchar(c);
 }

diff --git a/src/platform/types.h b/src/platform/types.h
@@ -52,6 +52,21 @@ typedef uint32_t HAL_ADDRESS_t;
 typedef uint32_t PORTSELECTOR_t;
 typedef HAL_BASE_t PINSELECTOR_t;
 
+#elif defined __riscv
+// Targeting RISC-V
+    #if __riscv_xlen == 32
+        typedef uint32_t HAL_BASE_t;
+        typedef uint32_t HAL_INT_t;
+        typedef volatile uint32_t HAL_SFR_t;
+        typedef uint32_t HAL_ADDRESS_t;
+        #ifdef __CH32V00x_H
+        typedef uint32_t PORTSELECTOR_t;
+        typedef HAL_BASE_t PINSELECTOR_t;
+        #else
+          #error "RISC-V platform not supported."
+        #endif 
+    #endif
+
 #elif (defined __linux__ || defined _WIN32)
 // 64-bit development platforms