nrf: clean up code after CGo improvements

aykevl · deadprogram · commit 74e8f86261fa · 2023-06-06T16:59:23.000+02:00
Make use of a few new features in TinyGo:

  * Functions and globals in header files are supported.
  * Static functions are supported.

This allows us to remove workarounds specifically used for the lack of
support for static functions.
diff --git a/adapter_nrf51.go b/adapter_nrf51.go
@@ -4,10 +4,6 @@
 package bluetooth
 
 /*
-// Define SoftDevice functions as regular function declarations (not inline
-// static functions).
-#define SVCALL_AS_NORMAL_FUNCTION
-
 #include "nrf_sdm.h"
 #include "ble.h"
 #include "ble_gap.h"
diff --git a/adapter_nrf528xx-full.go b/adapter_nrf528xx-full.go
@@ -7,10 +7,6 @@ package bluetooth
 // both central and peripheral mode. This includes S132 and S140.
 
 /*
-// Define SoftDevice functions as regular function declarations (not inline
-// static functions).
-#define SVCALL_AS_NORMAL_FUNCTION
-
 #include "nrf_sdm.h"
 #include "nrf_nvic.h"
 #include "ble.h"
diff --git a/adapter_nrf528xx-peripheral.go b/adapter_nrf528xx-peripheral.go
@@ -7,10 +7,6 @@ package bluetooth
 // mode support. This includes the S113.
 
 /*
-// Define SoftDevice functions as regular function declarations (not inline
-// static functions).
-#define SVCALL_AS_NORMAL_FUNCTION
-
 #include "nrf_sdm.h"
 #include "nrf_nvic.h"
 #include "ble.h"
diff --git a/adapter_nrf528xx.go b/adapter_nrf528xx.go
@@ -6,10 +6,6 @@ package bluetooth
 // This file defines the SoftDevice adapter for all nrf52-series chips.
 
 /*
-// Define SoftDevice functions as regular function declarations (not inline
-// static functions).
-#define SVCALL_AS_NORMAL_FUNCTION
-
 #include "nrf_sdm.h"
 #include "nrf_nvic.h"
 #include "ble.h"
diff --git a/adapter_s110.c b/adapter_s110.c
diff --git a/adapter_s113v7.c b/adapter_s113v7.c
diff --git a/adapter_s113v7.go b/adapter_s113v7.go
@@ -7,5 +7,8 @@ package bluetooth
 // Add the correct SoftDevice include path to CFLAGS, so #include will work as
 // expected.
 #cgo CFLAGS: -Is113_nrf52_7.0.1/s113_nrf52_7.0.1_API/include
+
+#include "nrf_nvic.h"
+nrf_nvic_state_t nrf_nvic_state = {0};
 */
 import "C"
diff --git a/adapter_s132.c b/adapter_s132.c
diff --git a/adapter_s132.go b/adapter_s132.go
@@ -7,5 +7,8 @@ package bluetooth
 // Add the correct SoftDevice include path to CFLAGS, so #include will work as
 // expected.
 #cgo CFLAGS: -Is132_nrf52_6.1.1/s132_nrf52_6.1.1_API/include
+
+#include "nrf_nvic.h"
+nrf_nvic_state_t nrf_nvic_state = {0};
 */
 import "C"
diff --git a/adapter_s140v6.c b/adapter_s140v6.c
diff --git a/adapter_s140v6.go b/adapter_s140v6.go
@@ -7,5 +7,8 @@ package bluetooth
 // Add the correct SoftDevice include path to CFLAGS, so #include will work as
 // expected.
 #cgo CFLAGS: -Is140_nrf52_6.1.1/s140_nrf52_6.1.1_API/include
+
+#include "nrf_nvic.h"
+nrf_nvic_state_t nrf_nvic_state = {0};
 */
 import "C"
diff --git a/adapter_s140v7.c b/adapter_s140v7.c
diff --git a/adapter_s140v7.go b/adapter_s140v7.go
@@ -7,5 +7,8 @@ package bluetooth
 // Add the correct SoftDevice include path to CFLAGS, so #include will work as
 // expected.
 #cgo CFLAGS: -Is140_nrf52_7.3.0/s140_nrf52_7.3.0_API/include
+
+#include "nrf_nvic.h"
+nrf_nvic_state_t nrf_nvic_state = {0};
 */
 import "C"
diff --git a/gap_nrf51.go b/gap_nrf51.go
@@ -4,10 +4,6 @@
 package bluetooth
 
 /*
-// Define SoftDevice functions as regular function declarations (not inline
-// static functions).
-#define SVCALL_AS_NORMAL_FUNCTION
-
 #include "ble_gap.h"
 */
 import "C"
diff --git a/gap_nrf528xx-advertisement.go b/gap_nrf528xx-advertisement.go
@@ -9,10 +9,6 @@ import (
 )
 
 /*
-// Define SoftDevice functions as regular function declarations (not inline
-// static functions).
-#define SVCALL_AS_NORMAL_FUNCTION
-
 #include "ble_gap.h"
 */
 import "C"
diff --git a/gap_nrf528xx-central.go b/gap_nrf528xx-central.go
@@ -11,10 +11,6 @@ import (
 )
 
 /*
-// Define SoftDevice functions as regular function declarations (not inline
-// static functions).
-#define SVCALL_AS_NORMAL_FUNCTION
-
 #include "ble_gap.h"
 */
 import "C"
diff --git a/gattc_sd.go b/gattc_sd.go
@@ -4,10 +4,6 @@
 package bluetooth
 
 /*
-// Define SoftDevice functions as regular function declarations (not inline
-// static functions).
-#define SVCALL_AS_NORMAL_FUNCTION
-
 #include "ble_gattc.h"
 */
 import "C"
diff --git a/gatts_sd.go b/gatts_sd.go
@@ -4,10 +4,6 @@
 package bluetooth
 
 /*
-// Define SoftDevice functions as regular function declarations (not inline
-// static functions).
-#define SVCALL_AS_NORMAL_FUNCTION
-
 #include "ble_gap.h"
 #include "ble_gatts.h"
 */
diff --git a/uuid_sd.go b/uuid_sd.go
@@ -4,10 +4,6 @@
 package bluetooth
 
 /*
-// Define SoftDevice functions as regular function declarations (not inline
-// static functions).
-#define SVCALL_AS_NORMAL_FUNCTION
-
 #include "ble.h"
 */
 import "C"
