From f86fd36240d5a974b2038b11d87d496409a4a1f0 Mon Sep 17 00:00:00 2001
From: Ayke van Laethem <aykevanlaethem@gmail.com>
Date: Fri, 6 Mar 2020 12:49:05 +0100
Subject: [PATCH] softdevice: make code more flexible for other SoftDevices

This is required for adding S140 support. It relies on the following
TinyGo PR:
https://github.com/tinygo-org/tinygo/pull/942
---
 adapter_sd.c => adapter_s132.c |  0
 adapter_s132.go                | 10 ++++++++++
 adapter_sd.go                  |  8 ++++----
 error_sd.go                    |  2 +-
 gap_sd.go                      |  4 ++--
 gatts_sd.go                    |  4 ++--
 uuid_sd.go                     |  4 ++--
 7 files changed, 21 insertions(+), 11 deletions(-)
 rename adapter_sd.c => adapter_s132.c (100%)
 create mode 100644 adapter_s132.go

diff --git a/adapter_sd.c b/adapter_s132.c
similarity index 100%
rename from adapter_sd.c
rename to adapter_s132.c
diff --git a/adapter_s132.go b/adapter_s132.go
new file mode 100644
index 0000000..10f8b03
--- /dev/null
+++ b/adapter_s132.go
@@ -0,0 +1,10 @@
+// +build softdevice,s132v6
+
+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
+*/
+import "C"
diff --git a/adapter_sd.go b/adapter_sd.go
index f70b0b1..852bddf 100644
--- a/adapter_sd.go
+++ b/adapter_sd.go
@@ -1,4 +1,4 @@
-// +build softdevice,s132v6
+// +build softdevice
 
 package bluetooth
 
@@ -7,9 +7,9 @@ package bluetooth
 // static functions).
 #define SVCALL_AS_NORMAL_FUNCTION
 
-#include "s132_nrf52_6.1.1/s132_nrf52_6.1.1_API/include/nrf_sdm.h"
-#include "s132_nrf52_6.1.1/s132_nrf52_6.1.1_API/include/ble.h"
-#include "s132_nrf52_6.1.1/s132_nrf52_6.1.1_API/include/ble_gap.h"
+#include "nrf_sdm.h"
+#include "ble.h"
+#include "ble_gap.h"
 
 void assertHandler(void);
 */
diff --git a/error_sd.go b/error_sd.go
index 3103113..3b04214 100644
--- a/error_sd.go
+++ b/error_sd.go
@@ -1,4 +1,4 @@
-// +build softdevice,s132v6
+// +build softdevice
 
 package bluetooth
 
diff --git a/gap_sd.go b/gap_sd.go
index f58dc2d..3e8ede1 100644
--- a/gap_sd.go
+++ b/gap_sd.go
@@ -1,4 +1,4 @@
-// +build softdevice,s132v6
+// +build softdevice
 
 package bluetooth
 
@@ -7,7 +7,7 @@ package bluetooth
 // static functions).
 #define SVCALL_AS_NORMAL_FUNCTION
 
-#include "s132_nrf52_6.1.1/s132_nrf52_6.1.1_API/include/ble_gap.h"
+#include "ble_gap.h"
 */
 import "C"
 
diff --git a/gatts_sd.go b/gatts_sd.go
index 1e7f588..0977e71 100644
--- a/gatts_sd.go
+++ b/gatts_sd.go
@@ -1,4 +1,4 @@
-// +build softdevice,s132v6
+// +build softdevice
 
 package bluetooth
 
@@ -7,7 +7,7 @@ package bluetooth
 // static functions).
 #define SVCALL_AS_NORMAL_FUNCTION
 
-#include "s132_nrf52_6.1.1/s132_nrf52_6.1.1_API/include/ble_gap.h"
+#include "ble_gap.h"
 */
 import "C"
 
diff --git a/uuid_sd.go b/uuid_sd.go
index 291cd69..0ef137a 100644
--- a/uuid_sd.go
+++ b/uuid_sd.go
@@ -1,4 +1,4 @@
-// +build softdevice,s132v6
+// +build softdevice
 
 package bluetooth
 
@@ -7,7 +7,7 @@ package bluetooth
 // static functions).
 #define SVCALL_AS_NORMAL_FUNCTION
 
-#include "s132_nrf52_6.1.1/s132_nrf52_6.1.1_API/include/ble.h"
+#include "ble.h"
 */
 import "C"
 import "unsafe"