ywf: lora_phy

Author: bradjc

libtock-sync/net/lora_phy.c

@@ -1,38 +1,39 @@
 #include "lora_phy.h"
 
-struct lora_phy_spi_data {
-  bool fired;
-  returncode_t ret;
-};
-
-static struct lora_phy_spi_data result = {.fired = false};
-
-static void lora_phy_spi_cb(returncode_t ret) {
-  result.fired = true;
-  result.ret   = ret;
-}
-
 returncode_t libtocksync_lora_phy_write(const uint8_t* write,
                                         uint32_t       len) {
-  result.fired = false;
   returncode_t ret;
 
-  ret = libtock_lora_phy_write(write, len, lora_phy_spi_cb);
+  ret = libtock_lora_phy_set_readonly_allow_master_write_buffer(buf, len);
   if (ret != RETURNCODE_SUCCESS) return ret;
+  defer { libtock_lora_phy_set_readonly_allow_master_write_buffer(NULL, 0);
+  };
 
-  yield_for(&result.fired);
-  return result.ret;
+  ret = libtock_lora_phy_command_read_write(len);
+  if (ret != RETURNCODE_SUCCESS) return ret;
+
+  ret = libtocksync_lora_phy_yield_wait_for();
+  return ret;
 }
 
 returncode_t libtocksync_lora_phy_read_write(const uint8_t* write,
                                              uint8_t*       read,
                                              uint32_t       len) {
-  result.fired = false;
   returncode_t ret;
 
-  ret = libtock_lora_phy_read_write(write, read, len, lora_phy_spi_cb);
+  ret = libtock_lora_phy_set_readwrite_allow_master_read_buffer(read, len);
+  if (ret != RETURNCODE_SUCCESS) return ret;
+  defer { libtock_lora_phy_set_readwrite_allow_master_read_buffer(NULL, 0);
+  };
+
+  ret = libtock_lora_phy_set_readonly_allow_master_write_buffer(buf, len);
+  if (ret != RETURNCODE_SUCCESS) return ret;
+  defer { libtock_lora_phy_set_readonly_allow_master_write_buffer(NULL, 0);
+  };
+
+  ret = libtock_lora_phy_command_read_write(len);
   if (ret != RETURNCODE_SUCCESS) return ret;
 
-  yield_for(&result.fired);
-  return result.ret;
+  ret = libtocksync_lora_phy_yield_wait_for();
+  return ret;
 }

libtock-sync/net/lora_phy.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <libtock/net/lora_phy.h>
 #include <libtock/tock.h>
 
 #ifdef __cplusplus

libtock-sync/net/syscalls/lora_phy_syscalls.c

@@ -0,0 +1,12 @@
+#include <libtock/net/syscalls/lora_phy_syscalls.h>
+
+#include "lora_phy_syscalls.h"
+
+
+returncode_t libtocksync_lora_phy_yield_wait_for(void) {
+  yield_waitfor_return_t ret;
+  ret = yield_wait_for(DRIVER_NUM_LORA_PHY_SPI, 0);
+
+  return RETURNCODE_SUCCESS;
+}
+

libtock-sync/net/syscalls/lora_phy_syscalls.h

@@ -0,0 +1,13 @@
+#pragma once
+
+#include <libtock/tock.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+returncode_t libtocksync_lora_phy_yield_wait_for(void);
+
+#ifdef __cplusplus
+}
+#endif