libtock-sync: temperature: use yield-waitfor

Author: bradjc

libtock-sync/Makefile

@@ -16,6 +16,7 @@ $(LIBNAME)_SRCS  += $(wildcard $($(LIBNAME)_DIR)/kernel/*.c)
 $(LIBNAME)_SRCS  += $(wildcard $($(LIBNAME)_DIR)/net/*.c)
 $(LIBNAME)_SRCS  += $(wildcard $($(LIBNAME)_DIR)/peripherals/*.c)
 $(LIBNAME)_SRCS  += $(wildcard $($(LIBNAME)_DIR)/sensors/*.c)
+$(LIBNAME)_SRCS  += $(wildcard $($(LIBNAME)_DIR)/sensors/syscalls/*.c)
 $(LIBNAME)_SRCS  += $(wildcard $($(LIBNAME)_DIR)/services/*.c)
 $(LIBNAME)_SRCS  += $(wildcard $($(LIBNAME)_DIR)/storage/*.c)
 

libtock-sync/sensors/syscalls/temperature_syscalls.c

@@ -0,0 +1,9 @@
+#include "temperature_syscalls.h"
+
+returncode_t libtocksync_temperature_yield_wait_for(int* temp) {
+  yield_waitfor_return_t ret;
+  ret = yield_wait_for(DRIVER_NUM_TEMPERATURE, 0);
+
+  *temp = (int) ret.data0;
+  return RETURNCODE_SUCCESS;
+}

libtock-sync/sensors/syscalls/temperature_syscalls.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <libtock/sensors/syscalls/temperature_syscalls.h>
+#include <libtock/tock.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Wait for a temperature read to finish.
+returncode_t libtocksync_temperature_yield_wait_for(int* temp);
+
+#ifdef __cplusplus
+}
+#endif

libtock-sync/sensors/temperature.c

@@ -1,31 +1,13 @@
 #include "temperature.h"
 
-struct data {
-  bool fired;
-  int temp;
-  returncode_t result;
-};
-
-static struct data result = { .fired = false };
-
-static void temp_cb(returncode_t ret, int temperature) {
-  result.temp   = temperature;
-  result.fired  = true;
-  result.result = ret;
-}
-
 returncode_t libtocksync_temperature_read(int* temperature) {
   returncode_t err;
-  result.fired = false;
 
-  err = libtock_temperature_read(temp_cb);
+  err = libtock_temperature_command_read();
   if (err != RETURNCODE_SUCCESS) return err;
 
-  // Wait for the callback.
-  yield_for(&result.fired);
-  if (result.result != RETURNCODE_SUCCESS) return result.result;
-
-  *temperature = result.temp;
+  // Wait for the operation to finish.
+  err = libtocksync_temperature_yield_wait_for(temperature);
 
-  return RETURNCODE_SUCCESS;
+  return err;
 }

libtock-sync/sensors/temperature.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <libtock/sensors/temperature.h>
+#include "syscalls/temperature_syscalls.h"
 #include <libtock/tock.h>
 
 #ifdef __cplusplus