From 662045f99140a2b6a2635ae8256c780ce8e9492c Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Thu, 8 Sep 2022 12:01:40 +0000
Subject: [PATCH] Relocated some definitions.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@15772 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
---
 os/sb/host/sbapi.c | 19 -------------------
 os/sb/host/sbvrq.h | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/os/sb/host/sbapi.c b/os/sb/host/sbapi.c
index 31ace195d..87211f113 100644
--- a/os/sb/host/sbapi.c
+++ b/os/sb/host/sbapi.c
@@ -71,25 +71,6 @@ static void sb_api_loadelf(struct port_extctx *ectxp);
 #define SB_SVC12_HANDLER        sb_api_loadelf
 /** @} */
 
-/**
- * @name    VRQ pseudo-instructions handlers
- * @{
- */
-#if (SB_CFG_ENABLE_VRQ == TRUE) || defined(__DOXYGEN__)
-#define SB_SVC125_HANDLER       sb_api_vrq_set_alarm
-#define SB_SVC126_HANDLER       sb_api_vrq_reset_alarm
-#define SB_SVC127_HANDLER       sb_api_vrq_wait
-#define SB_SVC248_HANDLER       sb_api_vrq_setwt
-#define SB_SVC249_HANDLER       sb_api_vrq_clrwt
-#define SB_SVC250_HANDLER       sb_api_vrq_seten
-#define SB_SVC251_HANDLER       sb_api_vrq_clren
-#define SB_SVC252_HANDLER       sb_api_vrq_disable
-#define SB_SVC253_HANDLER       sb_api_vrq_enable
-#define SB_SVC254_HANDLER       sb_api_vrq_getisr
-#define SB_SVC255_HANDLER       sb_api_vrq_return
-#endif
-/** @} */
-
 #define __SVC(x) asm volatile ("svc " #x)
 
 /*
diff --git a/os/sb/host/sbvrq.h b/os/sb/host/sbvrq.h
index 8478dc99f..fd27a65bc 100644
--- a/os/sb/host/sbvrq.h
+++ b/os/sb/host/sbvrq.h
@@ -41,6 +41,25 @@
 #define SB_VRQ_ISR_DISABLED     1U
 /** @} */
 
+/**
+ * @name    VRQ pseudo-instructions handlers
+ * @{
+ */
+#if (SB_CFG_ENABLE_VRQ == TRUE) || defined(__DOXYGEN__)
+#define SB_SVC125_HANDLER       sb_api_vrq_set_alarm
+#define SB_SVC126_HANDLER       sb_api_vrq_reset_alarm
+#define SB_SVC127_HANDLER       sb_api_vrq_wait
+#define SB_SVC248_HANDLER       sb_api_vrq_setwt
+#define SB_SVC249_HANDLER       sb_api_vrq_clrwt
+#define SB_SVC250_HANDLER       sb_api_vrq_seten
+#define SB_SVC251_HANDLER       sb_api_vrq_clren
+#define SB_SVC252_HANDLER       sb_api_vrq_disable
+#define SB_SVC253_HANDLER       sb_api_vrq_enable
+#define SB_SVC254_HANDLER       sb_api_vrq_getisr
+#define SB_SVC255_HANDLER       sb_api_vrq_return
+#endif
+/** @} */
+
 /*===========================================================================*/
 /* Module pre-compile time settings.                                         */
 /*===========================================================================*/