YWF: Convert many more drivers

examples/ble-uart/main.c

@@ -12,9 +12,7 @@
 #include <simple_ble.h>
 
 #include <libtock-sync/interface/console.h>
-#include <libtock/interface/console.h>
 #include <libtock/net/nrf51_serialization.h>
-#include <libtock/tock.h>
 
 #include "ble_nus.h"
 #include "nrf.h"
@@ -62,7 +60,7 @@ void ble_evt_user_handler(ble_evt_t* p_ble_evt) {
 // This gets called with the serial data from the BLE central.
 static void nus_data_handler(ble_nus_t* p_nus, uint8_t* p_data, uint16_t length) {
   UNUSED_PARAMETER(p_nus);
-  int bytes_written;
+  uint32_t bytes_written;
 
   // In this app, just print it to the console.
   libtocksync_console_write(p_data, length, &bytes_written);

examples/buttons/main.c

@@ -1,3 +1,4 @@
+#include <libtock-sync/interface/button.h>
 #include <libtock/interface/button.h>
 #include <libtock/interface/led.h>
 
@@ -13,7 +14,7 @@ int main(void) {
 
   // Enable interrupts on each button.
   int count;
-  err = libtock_button_count(&count);
+  err = libtocksync_button_count(&count);
   if (err < 0) return err;
 
   for (int i = 0; i < count; i++) {

examples/i2c-usb-bridge/main.c

@@ -14,13 +14,13 @@ uint8_t send_buf[DATA_LEN];
 
 static int getch(void) {
   uint8_t buffer[1];
-  int number_read;
+  uint32_t number_read;
   libtocksync_console_read(buffer, 1, &number_read);
   return buffer[0];
 }
 
-static int putnstr(char* str, int len) {
-  int number_written;
+static uint32_t putnstr(char* str, int len) {
+  uint32_t number_written;
   libtocksync_console_read((uint8_t*) str, len, &number_written);
   return number_written;
 }

examples/security_app/main.c

@@ -4,10 +4,9 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include <libtock/interface/console.h>
+#include <libtock-sync/peripherals/gpio.h>
 #include <libtock/interface/led.h>
 #include <libtock/peripherals/gpio.h>
-#include <libtock/tock.h>
 
 typedef struct {
   bool pir;
@@ -44,9 +43,9 @@ int main(void) {
 
   // configure pins
   libtock_gpio_set_interrupt_callback(gpio_cb);
-  libtock_gpio_enable_input(0, libtock_pull_none);
+  libtocksync_gpio_enable_input(0, libtock_pull_none);
   libtock_gpio_enable_interrupt(0, libtock_change);
-  libtock_gpio_enable_input(1, libtock_pull_up);
+  libtocksync_gpio_enable_input(1, libtock_pull_up);
   libtock_gpio_enable_interrupt(1, libtock_change);
 
   // configure accelerometer

examples/sensors/main.c

@@ -10,7 +10,6 @@
 #include <libtock-sync/sensors/sound_pressure.h>
 #include <libtock-sync/sensors/temperature.h>
 #include <libtock-sync/services/alarm.h>
-#include <libtock/tock.h>
 
 static libtock_alarm_t alarm;
 static bool light          = false;

examples/servo/main.c

@@ -3,7 +3,6 @@
 
 #include <libtock-sync/services/alarm.h>
 #include <libtock/interface/syscalls/servo_syscalls.h>
-#include <libtock/tock.h>
 
 
 int main(void) {

examples/tests/console/console/main.c

@@ -7,7 +7,7 @@
 
 static int getch(void) {
   uint8_t buffer[1];
-  int number_read;
+  uint32_t number_read;
   libtocksync_console_read(buffer, 1, &number_read);
   return buffer[0];
 }

examples/tests/console/console_recv_long/main.c

@@ -5,15 +5,15 @@
 uint8_t buf[100];
 
 int main(void) {
-  int number_read;
+  uint32_t number_read;
   int ret = libtocksync_console_read(buf, 61, &number_read);
   if (ret != RETURNCODE_SUCCESS) {
     printf("[SHORT] Error doing UART receive: %i\n", ret);
     return -1;
   }
 
   printf("\n\nconsole_recv_long: ");
-  for (int i = 0; i < number_read; i++) {
+  for (uint32_t i = 0; i < number_read; i++) {
     printf("%c", buf[i]);
   }
   printf("\n");

examples/tests/console/console_recv_short/main.c

@@ -5,15 +5,15 @@
 uint8_t buf[100];
 
 int main(void) {
-  int number_read;
+  uint32_t number_read;
   int ret = libtocksync_console_read(buf, 11, &number_read);
   if (ret != RETURNCODE_SUCCESS) {
     printf("[SHORT] Error doing UART receive: %i\n", ret);
     return -1;
   }
 
   printf("\n\nconsole_recv_short: ");
-  for (int i = 0; i < number_read; i++) {
+  for (uint32_t i = 0; i < number_read; i++) {
     printf("%c", buf[i]);
   }
   printf("\n");

examples/tests/keyboard_hid/main.c

@@ -10,7 +10,7 @@ int main(void) {
   returncode_t ret;
   printf("[TEST] USB Keyboard HID\n");
 
-  if (!libtock_usb_keyboard_hid_exists()) {
+  if (!libtocksync_usb_keyboard_hid_exists()) {
     printf("No USB keyboard HID on this board!\n");
     return -2;
   }

examples/tests/kv/kv_interactive/main.c

@@ -4,7 +4,6 @@
 
 #include <libtock-sync/interface/console.h>
 #include <libtock-sync/storage/kv.h>
-#include <libtock/interface/console.h>
 
 #define KEY_LEN  64
 #define DATA_LEN 64
@@ -17,7 +16,7 @@ char read_buf[DATA_LEN];
 
 static int getch(void) {
   uint8_t buffer[1];
-  int number_read;
+  uint32_t number_read;
   libtocksync_console_read(buffer, 1, &number_read);
   return buffer[0];
 }

examples/tests/number_guess_game/main.c

@@ -8,13 +8,13 @@
 
 static int getch(void) {
   uint8_t buffer[1];
-  int number_read;
+  uint32_t number_read;
   libtocksync_console_read(buffer, 1, &number_read);
   return buffer[0];
 }
 
 static int putnstr(const char* str, int len) {
-  int number_written;
+  uint32_t number_written;
   libtocksync_console_read((uint8_t*) str, len, &number_written);
   return number_written;
 }

examples/tutorials/hotp/hotp_milestone_one/main.c

@@ -18,6 +18,7 @@
 #include <string.h>
 
 // Libtock includes
+#include <libtock-sync/interface/button.h>
 #include <libtock-sync/interface/console.h>
 #include <libtock-sync/services/alarm.h>
 #include <libtock/interface/button.h>
@@ -52,7 +53,7 @@ static void program_new_secret(hotp_key_t* hotp_key) {
   while (i < 127) {
     // read next character
     char c;
-    int number_read, number_written;
+    uint32_t number_read, number_written;
     libtocksync_console_read((uint8_t*) &c, 1, &number_read);
 
     // break on enter
@@ -121,7 +122,7 @@ int main(void) {
     // Delay and check if button is still pressed, signalling a "hold"
     libtocksync_alarm_delay_ms(500);
     int new_val = 0;
-    libtock_button_read(btn_num, &new_val);
+    libtocksync_button_read(btn_num, &new_val);
 
     // Handle long presses (program new secret)
     if (new_val) {

examples/tutorials/hotp/hotp_milestone_three/main.c

@@ -12,6 +12,7 @@
 #include <stdio.h>
 
 // Libtock includes
+#include <libtock-sync/interface/button.h>
 #include <libtock-sync/services/alarm.h>
 #include <libtock/interface/button.h>
 
@@ -78,7 +79,7 @@ int main(void) {
     // Delay and check if button is still pressed, signalling a "hold"
     libtocksync_alarm_delay_ms(500);
     int new_val = 0;
-    libtock_button_read(btn_num, &new_val);
+    libtocksync_button_read(btn_num, &new_val);
 
     // Handle long presses (program new secret)
     if (new_val) {

examples/tutorials/hotp/hotp_milestone_two/main.c

@@ -18,10 +18,10 @@
 #include <string.h>
 
 // Libtock includes
+#include <libtock-sync/interface/button.h>
 #include <libtock-sync/services/alarm.h>
 #include <libtock-sync/storage/kv.h>
 #include <libtock/interface/button.h>
-#include <libtock/tock.h>
 
 // Local includes
 #include "base32.h"
@@ -120,7 +120,7 @@ int main(void) {
     // Delay and check if button is still pressed, signalling a "hold"
     libtocksync_alarm_delay_ms(500);
     int new_val = 0;
-    libtock_button_read(btn_num, &new_val);
+    libtocksync_button_read(btn_num, &new_val);
 
     // Handle long presses (program new secret)
     if (new_val) {

examples/tutorials/hotp/hotp_milestone_two/step1.c

@@ -21,7 +21,7 @@ void program_new_secret(hotp_key_t* hotp_key) {
   while (i < 127) {
     // read next character
     char c;
-    int number_read, number_written;
+    uint32_t number_read, number_written;
     libtocksync_console_read((uint8_t*) &c, 1, &number_read);
 
     // break on enter

examples/tutorials/hotp/hotp_oracle_complete/main.c

@@ -17,6 +17,7 @@
 #include <string.h>
 
 // Libtock includes
+#include <libtock-sync/interface/button.h>
 #include <libtock-sync/interface/console.h>
 #include <libtock-sync/interface/usb_keyboard_hid.h>
 #include <libtock-sync/services/alarm.h>
@@ -153,7 +154,7 @@ static void program_new_secret(int slot_num) {
   while (i < 127) {
     // read next character
     char c;
-    int number_read, number_written;
+    uint32_t number_read, number_written;
     libtocksync_console_read((uint8_t*) &c, 1, &number_read);
 
     // break on enter
@@ -229,7 +230,7 @@ static void get_next_code_encrypted(int slot_num) {
     len = 16;
   }
 
-  if (libtock_usb_keyboard_hid_exists()) {
+  if (libtocksync_usb_keyboard_hid_exists()) {
     // Write the value to the USB keyboard.
     int ret = libtocksync_usb_keyboard_hid_send_string(hotp_format_buffer, len);
     if (ret < 0) {
@@ -279,7 +280,7 @@ int main(void) {
     // Delay and check if button is still pressed, signalling a "hold"
     libtocksync_alarm_delay_ms(500);
     int new_val = 0;
-    libtock_button_read(btn_num, &new_val);
+    libtocksync_button_read(btn_num, &new_val);
 
     // Handle long presses (program new secret)
     if (new_val) {

examples/tutorials/root_of_trust/encryption_service_milestone_three/main.c

@@ -10,7 +10,6 @@
 
 #include <libtock-sync/interface/console.h>
 #include <libtock/kernel/ipc.h>
-#include <libtock/tock.h>
 
 #include "oracle.h"
 
@@ -86,7 +85,7 @@ static int log_to_screen(const char* message) {
 
 static size_t request_plaintext(uint8_t* plaintext, size_t size) {
   char c;
-  int number_read, number_written;
+  uint32_t number_read, number_written;
 
   printf("Enter plaintext to encrypt:\n");
 

examples/tutorials/root_of_trust/encryption_service_milestone_two/main.c

@@ -10,7 +10,6 @@
 
 #include <libtock-sync/interface/console.h>
 #include <libtock/kernel/ipc.h>
-#include <libtock/tock.h>
 
 #define LOG_WIDTH      32
 
@@ -83,7 +82,7 @@ static int log_to_screen(const char* message) {
 
 static size_t request_plaintext(uint8_t* plaintext, size_t size) {
   char c;
-  int number_read, number_written;
+  uint32_t number_read, number_written;
 
   printf("Enter plaintext to encrypt:\n");
 

examples/witenergy/main.c

@@ -19,7 +19,6 @@
 #include <libtock/interface/console.h>
 #include <libtock/interface/led.h>
 #include <libtock/net/nrf51_serialization.h>
-#include <libtock/tock.h>
 
 
 /*******************************************************************************

libtock-sync/display/syscalls/text_screen_syscalls.c

@@ -0,0 +1,18 @@
+#include "text_screen_syscalls.h"
+
+returncode_t libtocksync_text_screen_yield_wait_for_done(void) {
+  yield_waitfor_return_t ywf;
+  ywf = yield_wait_for(DRIVER_NUM_TEXT_SCREEN, 0);
+  return (returncode_t) ywf.data0;
+}
+
+returncode_t libtocksync_text_screen_yield_wait_for_size(uint32_t* width, uint32_t* height) {
+  yield_waitfor_return_t ywf;
+  returncode_t ret;
+  ywf = yield_wait_for(DRIVER_NUM_TEXT_SCREEN, 0);
+  ret = (returncode_t) ywf.data0;
+  if (ret != RETURNCODE_SUCCESS) return ret;
+  *width  = (uint32_t) ywf.data1;
+  *height = (uint32_t) ywf.data2;
+  return ret;
+}

libtock-sync/display/syscalls/text_screen_syscalls.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include <libtock/display/syscalls/text_screen_syscalls.h>
+#include <libtock/tock.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Wait for a text screen operation to complete.
+returncode_t libtocksync_text_screen_yield_wait_for_done(void);
+
+// Wait for a text screen get size operation to complete.
+returncode_t libtocksync_text_screen_yield_wait_for_size(uint32_t* width, uint32_t* height);
+
+#ifdef __cplusplus
+}
+#endif