examples: update header locations

examples/accel-leds/main.c

@@ -1,8 +1,8 @@
 #include <limits.h>
 #include <stdio.h>
 
-#include <led.h>
-#include <ninedof.h>
+#include <interface/led.h>
+#include <sensors/ninedof.h>
 
 int main(void) {
   printf("[App] Accelerometer -> LEDs\n");

examples/adc/main.c

@@ -1,5 +1,6 @@
-#include <adc.h>
 #include <stdio.h>
+
+#include <peripherals/adc.h>
 #include <timer.h>
 
 int main(void) {

examples/ble-uart/main.c

@@ -14,7 +14,7 @@
 
 #include <nrf51_serialization.h>
 
-#include <console.h>
+#include <interface/console.h>
 #include <tock.h>
 
 #include "ble_nus.h"

examples/ble_advertising/main.c

@@ -1,7 +1,9 @@
-#include <ble.h>
-#include <gap.h>
 #include <stdbool.h>
 #include <stdio.h>
+
+#include <gap.h>
+
+#include <net/ble.h>
 #include <tock.h>
 
 // Sizes in bytes

examples/ble_passive_scanning/main.cpp

@@ -1,7 +1,9 @@
+#include <stdio.h>
+
+#include <net/ble.h>
+
 #include "advertisement.h"
 #include "advertisement_list.h"
-#include <ble.h>
-#include <stdio.h>
 
 /*
  * BLE Demo Application

examples/blink/main.c

@@ -1,4 +1,4 @@
-#include <led.h>
+#include <interface/led.h>
 #include <timer.h>
 
 int main(void) {

examples/buttons/main.c

@@ -4,8 +4,8 @@
 // button is pressed, the first LED is toggled. If the third button is pressed,
 // the third LED is toggled.
 
-#include <button.h>
-#include <led.h>
+#include <interface/button.h>
+#include <interface/led.h>
 
 // Callback for button presses.
 //   btn_num: The index of the button associated with the callback

examples/c_hello/main.c

@@ -5,7 +5,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <console.h>
+#include <interface/console.h>
 
 char hello[] = "Hello World!\r\n";
 

examples/find_north/main.c

@@ -1,8 +1,8 @@
 #include <math.h>
 #include <stdio.h>
 
-#include <led.h>
-#include <ninedof.h>
+#include <interface/led.h>
+#include <sensors/ninedof.h>
 
 int main(void) {
   int x, y, z;

examples/i2c-usb-bridge/main.c

@@ -3,8 +3,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <console.h>
-#include <i2c_master.h>
+#include <interface/console.h>
+#include <peripherals/i2c_master.h>
 
 #define DATA_LEN 64
 

examples/ip_sense/main.c

@@ -1,13 +1,13 @@
 #include <stdbool.h>
 #include <stdio.h>
 
-#include <ambient_light.h>
-#include <humidity.h>
-#include <temperature.h>
+#include <sensors/ambient_light.h>
+#include <sensors/humidity.h>
+#include <sensors/temperature.h>
 #include <timer.h>
 
-#include <ieee802154.h>
-#include <udp.h>
+#include <net/ieee802154.h>
+#include <net/udp.h>
 
 static unsigned char BUF_BIND_CFG[2 * sizeof(sock_addr_t)];
 

examples/lora/sensor-receive/main.cc

@@ -12,10 +12,6 @@
 // include the hardware abstraction layer
 #include "libtockHal.h"
 
-// Include some libtock-c helpers
-#include <humidity.h>
-#include <temperature.h>
-
 #define BUFFER_LEN 64
 
 // the entry point for the program

examples/lora/sensor-transmit/main.cc

@@ -13,8 +13,8 @@
 #include "libtockHal.h"
 
 // Include some libtock-c helpers
-#include <humidity.h>
-#include <temperature.h>
+#include <sensors/humidity.h>
+#include <sensors/temperature.h>
 
 #define BUFFER_LEN 64
 

examples/rot13_client/main.c

@@ -1,8 +1,8 @@
 #include <stdio.h>
 #include <string.h>
-#include <timer.h>
 
-#include <ipc.h>
+#include <kernel/ipc.h>
+#include <timer.h>
 
 size_t rot13_svc_num = 0;
 

examples/rot13_service/main.c

@@ -1,4 +1,4 @@
-#include <ipc.h>
+#include <kernel/ipc.h>
 #include <tock.h>
 
 struct rot13_buf {

examples/rtc_app/main.c

@@ -1,4 +1,4 @@
-#include <rtc.h>
+#include <peripheral/rtc.h>
 #include <stdio.h>
 #include <timer.h>
 

examples/screen/main.c

@@ -1,6 +1,7 @@
-#include <screen.h>
 #include <stdio.h>
 #include <stdlib.h>
+
+#include <display/screen.h>
 #include <timer.h>
 
 #define BUFFER_SIZE 10 * 1024

examples/security_app/main.c

@@ -4,10 +4,10 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include "console.h"
-#include "gpio.h"
-#include "led.h"
-#include "tock.h"
+#include <interface/console.h>
+#include <interface/led.h>
+#include <peripherals/gpio.h>
+#include <tock.h>
 
 typedef struct {
   uint8_t pir;

examples/sensors/main.c

@@ -1,16 +1,16 @@
 #include <stdbool.h>
 #include <stdio.h>
 
-#include <ambient_light.h>
-#include <humidity.h>
-#include <lps25hb.h>
-#include <ninedof.h>
-#include <proximity.h>
-#include <sound_pressure.h>
-#include <temperature.h>
+#include <chips/lps25hb.h>
+#include <chips/tsl2561.h>
+#include <sensors/ambient_light.h>
+#include <sensors/humidity.h>
+#include <sensors/ninedof.h>
+#include <sensors/proximity.h>
+#include <sensors/sound_pressure.h>
+#include <sensors/temperature.h>
 #include <timer.h>
 #include <tock.h>
-#include <tsl2561.h>
 
 static tock_timer_t timer;
 static bool light          = false;

examples/services/ble-env-sense/main.c

@@ -6,15 +6,15 @@
 
 #include <ble_advdata.h>
 #include <nordic_common.h>
+#include <nrf.h>
 #include <nrf_error.h>
 
 #include <eddystone.h>
 #include <simple_adv.h>
 #include <simple_ble.h>
 
-#include <ipc.h>
-#include <nrf.h>
-#include <nrf51_serialization.h>
+#include <kernel/ipc.h>
+#include <net/nrf51_serialization.h>
 #include <tock.h>
 
 #include "env_sense_service.h"

examples/touch/main.c

@@ -1,8 +1,9 @@
-#include <screen.h>
 #include <stdio.h>
 #include <stdlib.h>
+
+#include <display/screen.h>
+#include <sensor/touch.h>
 #include <timer.h>
-#include <touch.h>
 
 static void touch_event (int status, int x, int y, void *ud __attribute__ ((unused))) {
   switch (status) {

examples/tutorials/02_button_print/main.c

@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-#include <button.h>
+#include <interface/button.h>
 
 // Callback for button presses.
 //   btn_num: The index of the button associated with the callback

examples/tutorials/03_ble_scan/main.c

@@ -8,7 +8,7 @@
 // Included in the libnrfserialization.a library.
 #include <simple_ble.h>
 
-#include <led.h>
+#include <interface/led.h>
 
 /*******************************************************************************
  * BLE

examples/tutorials/05_ipc/led/main.c

@@ -1,5 +1,5 @@
-#include <ipc.h>
-#include <led.h>
+#include <interface/led.h>
+#include <kernel/ipc.h>
 #include <tock.h>
 
 // This service can control the LEDs on a board.

examples/tutorials/05_ipc/logic/main.c

@@ -1,6 +1,7 @@
-#include <ipc.h>
 #include <stdio.h>
 #include <string.h>
+
+#include <kernel/ipc.h>
 #include <timer.h>
 
 // Every 500 ms use the RNG service to randomly select an LED to turn on or

examples/tutorials/05_ipc/rng/main.c

@@ -1,5 +1,5 @@
-#include <ipc.h>
-#include <rng.h>
+#include <kernel/ipc.h>
+#include <peripherals/rng.h>
 #include <tock.h>
 
 // Random Number Generator Service

examples/tutorials/hotp/hotp_milestone_one/main.c

@@ -18,13 +18,13 @@
 #include <string.h>
 
 // Libtock includes
-#include <app_state.h>
-#include <button.h>
-#include <console.h>
-#include <hmac.h>
-#include <led.h>
+#include <crypto/hmac.h>
+#include <interface/button.h>
+#include <interface/console.h>
+#include <interface/led.h>
+#include <interface/usb_keyboard_hid.h>
+#include <storage/app_state.h>
 #include <timer.h>
-#include <usb_keyboard_hid.h>
 
 // Local includes
 #include "base32.h"

examples/tutorials/hotp/hotp_milestone_three/main.c

@@ -18,13 +18,13 @@
 #include <string.h>
 
 // Libtock includes
-#include <app_state.h>
-#include <button.h>
-#include <console.h>
-#include <hmac.h>
-#include <led.h>
+#include <crypto/hmac.h>
+#include <interface/button.h>
+#include <interface/console.h>
+#include <interface/led.h>
+#include <interface/usb_keyboard_hid.h>
+#include <storage/app_state.h>
 #include <timer.h>
-#include <usb_keyboard_hid.h>
 
 // Local includes
 #include "base32.h"

examples/tutorials/hotp/hotp_milestone_two/main.c

@@ -18,13 +18,13 @@
 #include <string.h>
 
 // Libtock includes
-#include <app_state.h>
-#include <button.h>
-#include <console.h>
-#include <hmac.h>
-#include <led.h>
+#include <crypto/hmac.h>
+#include <interface/button.h>
+#include <interface/console.h>
+#include <interface/led.h>
+#include <interface/usb_keyboard_hid.h>
+#include <storage/app_state.h>
 #include <timer.h>
-#include <usb_keyboard_hid.h>
 
 // Local includes
 #include "base32.h"

examples/tutorials/hotp/hotp_oracle_complete/main.c

@@ -18,13 +18,13 @@
 #include <string.h>
 
 // Libtock includes
-#include <button.h>
-#include <console.h>
-#include <hmac.h>
-#include <kv.h>
-#include <led.h>
+#include <crypto/hmac.h>
+#include <interface/button.h>
+#include <interface/console.h>
+#include <interface/led.h>
+#include <interface/usb_keyboard_hid.h>
+#include <storage/app_state.h>
 #include <timer.h>
-#include <usb_keyboard_hid.h>
 
 // Local includes
 #include "base32.h"

examples/tutorials/hotp/hotp_starter/main.c

@@ -18,13 +18,13 @@
 #include <string.h>
 
 // Libtock includes
-#include <app_state.h>
-#include <button.h>
-#include <console.h>
-#include <hmac.h>
-#include <led.h>
+#include <crypto/hmac.h>
+#include <interface/button.h>
+#include <interface/console.h>
+#include <interface/led.h>
+#include <interface/usb_keyboard_hid.h>
+#include <storage/app_state.h>
 #include <timer.h>
-#include <usb_keyboard_hid.h>
 
 // Local includes
 #include "base32.h"