Skip to content

Commit 427d031

Browse files
bradjcppannuto
authored andcommitted
libtock: do not export syscalls
1 parent 1ee3dbf commit 427d031

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+151
-46
lines changed

libtock/net/ble.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "tock.h"
1313

1414
bool libtock_ble_exists(void) {
15-
return libtock_ble_driver_exists();
15+
return driver_exists(BLE_DRIVER_NUMBER);
1616
}
1717

1818
int ble_start_advertising(int pdu_type, uint8_t* advd, int len, uint16_t interval) {

libtock/sensors/ambient_light.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "ambient_light.h"
2+
#include "syscalls/ambient_light_syscalls.h"
23

34
// callback for synchronous reads
45
static void ambient_light_upcall(int intensity,
@@ -8,6 +9,10 @@ static void ambient_light_upcall(int intensity,
89
cb(RETURNCODE_SUCCESS, intensity);
910
}
1011

12+
bool libtock_ambient_light_exists(void) {
13+
return libtock_ambient_light_driver_exists();
14+
}
15+
1116
returncode_t libtock_ambient_light_read_intensity(libtock_ambient_light_callback cb) {
1217
returncode_t err;
1318

libtock/sensors/ambient_light.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#pragma once
22

33
#include "../tock.h"
4-
#include "syscalls/ambient_light_syscalls.h"
54

65
#ifdef __cplusplus
76
extern "C" {
@@ -14,6 +13,9 @@ extern "C" {
1413
typedef void (*libtock_ambient_light_callback)(returncode_t, int);
1514

1615

16+
// Check if the driver exists.
17+
bool libtock_ambient_light_exists(void);
18+
1719
// Request an ambient light reading.
1820
//
1921
// The callback will be triggered with the result in lux.

libtock/sensors/humidity.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "humidity.h"
2+
#include "syscalls/humidity_syscalls.h"
23

34
static void humidity_upcall(int humidity,
45
__attribute__ ((unused)) int unused1,
@@ -7,6 +8,10 @@ static void humidity_upcall(int humidity,
78
cb(RETURNCODE_SUCCESS, humidity);
89
}
910

11+
bool libtock_humidity_exists(void) {
12+
return libtock_humidity_driver_exists();
13+
}
14+
1015
returncode_t libtock_humidity_read(libtock_humidity_callback cb) {
1116
returncode_t err;
1217

libtock/sensors/humidity.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#pragma once
22

33
#include "../tock.h"
4-
#include "syscalls/humidity_syscalls.h"
54

65
#ifdef __cplusplus
76
extern "C" {
@@ -13,6 +12,9 @@ extern "C" {
1312
// - `arg2` (`int`): Humidity in hundredths of percent.
1413
typedef void (*libtock_humidity_callback)(returncode_t, int);
1514

15+
// Check if the driver exists.
16+
bool libtock_humidity_exists(void);
17+
1618
// Start a humidity measurement. The reading will be provided via the callback.
1719
returncode_t libtock_humidity_read(libtock_humidity_callback cb);
1820

libtock/sensors/moisture.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "moisture.h"
2+
#include "syscalls/moisture_syscalls.h"
23

34
static void moisture_upcall(int status,
45
int moisture,
@@ -7,6 +8,10 @@ static void moisture_upcall(int status,
78
cb(tock_status_to_returncode(status), moisture);
89
}
910

11+
bool libtock_moisture_exists(void) {
12+
return libtock_moisture_driver_exists();
13+
}
14+
1015
returncode_t libtock_moisture_read(libtock_moisture_callback cb) {
1116
returncode_t err;
1217

libtock/sensors/moisture.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#pragma once
22

33
#include "../tock.h"
4-
#include "syscalls/moisture_syscalls.h"
54

65
#ifdef __cplusplus
76
extern "C" {
@@ -13,6 +12,9 @@ extern "C" {
1312
// - `arg2` (`int`): moisture in hundredths of percent.
1413
typedef void (*libtock_moisture_callback)(returncode_t, int);
1514

15+
// Check if the driver exists.
16+
bool libtock_moisture_exists(void);
17+
1618
// Start a moisture measurement. The reading will be provided via the callback.
1719
returncode_t libtock_moisture_read(libtock_moisture_callback cb);
1820

libtock/sensors/ninedof.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "ninedof.h"
2+
#include "syscalls/ninedof_syscalls.h"
23

34
// internal callback for faking synchronous reads
45
static void ninedof_upcall(int x, int y, int z, void* opaque) {
@@ -7,6 +8,10 @@ static void ninedof_upcall(int x, int y, int z, void* opaque) {
78
}
89

910

11+
bool libtock_ninedof_exists(void) {
12+
return libtock_ninedof_driver_exists();
13+
}
14+
1015
returncode_t libtock_ninedof_read_accelerometer(libtock_ninedof_callback cb) {
1116
returncode_t err;
1217

libtock/sensors/ninedof.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#pragma once
22

33
#include "../tock.h"
4-
#include "syscalls/ninedof_syscalls.h"
54

65
#ifdef __cplusplus
76
extern "C" {
@@ -17,6 +16,9 @@ extern "C" {
1716
typedef void (*libtock_ninedof_callback)(returncode_t, int, int, int);
1817

1918

19+
// Check if the driver exists.
20+
bool libtock_ninedof_exists(void);
21+
2022
// Read the accelerometer.
2123
//
2224
// The X, Y, Z and measurements will be returned via the callback.

libtock/sensors/pressure.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "pressure.h"
2+
#include "syscalls/pressure_syscalls.h"
23

34
static void pressure_upcall(int pressure,
45
__attribute__ ((unused)) int unused,
@@ -8,6 +9,10 @@ static void pressure_upcall(int pressure,
89
cb(RETURNCODE_SUCCESS, pressure);
910
}
1011

12+
bool libtock_pressure_exists(void) {
13+
return libtock_pressure_driver_exists();
14+
}
15+
1116
returncode_t libtock_pressure_read(libtock_pressure_callback cb) {
1217
returncode_t err;
1318

0 commit comments

Comments
 (0)