From af6a75109ed68e89998f221ba27fe15980f01714 Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Mon, 15 Jun 2015 16:22:16 +0200 Subject: espresso-common: libsensors: sync with replicant Change-Id: Idcb9a57af699833c504f236692a6bdb1ef33c98e --- libsensors/piranha_sensors.h | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) (limited to 'libsensors/piranha_sensors.h') diff --git a/libsensors/piranha_sensors.h b/libsensors/piranha_sensors.h index b93f65e..4de8c99 100644 --- a/libsensors/piranha_sensors.h +++ b/libsensors/piranha_sensors.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Paul Kocialkowski + * Copyright (C) 2013 Paul Kocialkowski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,16 +17,16 @@ #include #include - #include #include #include -#ifndef _SENSORS_H_ -#define _SENSORS_H_ +#ifndef _PIRANHA_SENSORS_H_ +#define _PIRANHA_SENSORS_H_ -#define PIRANHA_POLL_DELAY 100 +#define PIRANHA_SENSORS_NEEDED_API (1 << 0) +#define PIRANHA_SENSORS_NEEDED_ORIENTATION (1 << 1) struct piranha_sensors_device; @@ -34,14 +34,18 @@ struct piranha_sensors_handlers { char *name; int handle; - int (*init)(struct piranha_sensors_handlers *handlers, struct piranha_sensors_device *device); + int (*init)(struct piranha_sensors_handlers *handlers, + struct piranha_sensors_device *device); int (*deinit)(struct piranha_sensors_handlers *handlers); int (*activate)(struct piranha_sensors_handlers *handlers); int (*deactivate)(struct piranha_sensors_handlers *handlers); - int (*set_delay)(struct piranha_sensors_handlers *handlers, int64_t delay); - int (*get_data)(struct piranha_sensors_handlers *handlers, struct sensors_event_t *event); + int (*set_delay)(struct piranha_sensors_handlers *handlers, + long int delay); + int (*get_data)(struct piranha_sensors_handlers *handlers, + struct sensors_event_t *event); int activated; + int needed; int poll_fd; void *data; @@ -60,8 +64,10 @@ struct piranha_sensors_device { extern struct piranha_sensors_handlers *piranha_sensors_handlers[]; extern int piranha_sensors_handlers_count; -int piranha_sensors_activate(struct sensors_poll_device_t *dev, int handle, int enabled); -int piranha_sensors_set_delay(struct sensors_poll_device_t *dev, int handle, int64_t ns); +int piranha_sensors_activate(struct sensors_poll_device_t *dev, int handle, + int enabled); +int piranha_sensors_set_delay(struct sensors_poll_device_t *dev, int handle, + int64_t ns); int piranha_sensors_poll(struct sensors_poll_device_t *dev, struct sensors_event_t* data, int count); @@ -69,16 +75,27 @@ int piranha_sensors_poll(struct sensors_poll_device_t *dev, * Input */ -int64_t input_timestamp(struct input_event *event); +void input_event_set(struct input_event *event, int type, int code, int value); +long int timestamp(struct timeval *time); +long int input_timestamp(struct input_event *event); +int uinput_rel_create(const char *name); +void uinput_destroy(int uinput_fd); int input_open(char *name); int sysfs_path_prefix(char *name, char *path_prefix); +int sysfs_value_read(char *path); +int sysfs_value_write(char *path, int value); +int sysfs_string_read(char *path, char *buffer, size_t length); +int sysfs_string_write(char *path, char *buffer, size_t length); /* * Sensors */ +int orientation_fill(struct piranha_sensors_handlers *handlers, + sensors_vec_t *acceleration, sensors_vec_t *magnetic); + extern struct piranha_sensors_handlers bma250; -extern struct piranha_sensors_handlers yas530c; +extern struct piranha_sensors_handlers yas530; extern struct piranha_sensors_handlers yas_orientation; extern struct piranha_sensors_handlers bh1721; extern struct piranha_sensors_handlers gp2a_light; -- cgit v1.1