sensor-hal: move sensor_hal.h to sensor-hal-devel package
authorkibak.yoon <kibak.yoon@samsung.com>
Sat, 13 Feb 2016 04:13:05 +0000 (13:13 +0900)
committerkibak.yoon <kibak.yoon@samsung.com>
Sat, 13 Feb 2016 04:13:39 +0000 (13:13 +0900)
Change-Id: I8695389a17dfbfe2a9d7a9461a137a935ddcfc34
Signed-off-by: kibak.yoon <kibak.yoon@samsung.com>
packaging/sensor-hal-tm1.spec
src/accel/accel.h
src/create.cpp
src/proxi/proxi.h
src/sensor_hal.h [deleted file]
src/sensorhub/sensorhub.h
src/sensorhub/sensorhub_controller.h
src/sensorhub/wristup.cpp

index b781fc5..547219a 100644 (file)
@@ -17,6 +17,7 @@ BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(vconf)
+BuildRequires:  sensor-hal-devel
 
 %description
 TM1 Sensor HAL
index da27f02..b5259ce 100644 (file)
@@ -18,7 +18,7 @@
 #ifndef _ACCEL_DEVICE_H_
 #define _ACCEL_DEVICE_H_
 
-#include <sensor_hal.h>
+#include <sensor/sensor_hal.h>
 #include <string>
 #include <vector>
 
index 5140fb3..0b6e2cd 100644 (file)
@@ -15,7 +15,7 @@
  *
  */
 
-#include <sensor_hal.h>
+#include <sensor/sensor_hal.h>
 #include <sensor_logs.h>
 #include <vector>
 
index 49fcff0..488cf27 100644 (file)
@@ -18,7 +18,7 @@
 #ifndef _PROXI_DEVICE_H_
 #define _PROXI_DEVICE_H_
 
-#include <sensor_hal.h>
+#include <sensor/sensor_hal.h>
 #include <string>
 #include <vector>
 
diff --git a/src/sensor_hal.h b/src/sensor_hal.h
deleted file mode 100644 (file)
index ded1a90..0000000
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#ifndef _SENSOR_HAL_H_
-#define _SENSOR_HAL_H_
-
-#include <stdint.h>
-#include <stdbool.h>
-
-#define SENSOR_HAL_VERSION(maj,min) \
-                       ((((maj) & 0xffff) << 24) | ((min) & 0xffff))
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-/*
- * Sensor Types
- * These types are used to controll the sensors
- *
- * - base unit
- *   acceleration values : meter per second^2 (m/s^2)
- *   magnetic values     : micro-Tesla (uT)
- *   orientation values  : degrees
- *   gyroscope values    : degree/s
- *   temperature values  : degrees centigrade
- *   proximity valeus    : distance
- *   light values        : lux
- *   pressure values     : hectopascal (hPa)
- *   humidity            : relative humidity (%)
- */
-typedef enum {
-       SENSOR_DEVICE_UNKNOWN = -2,
-       SENSOR_DEVICE_ALL = -1,
-       SENSOR_DEVICE_ACCELEROMETER,
-       SENSOR_DEVICE_GRAVITY,
-       SENSOR_DEVICE_LINEAR_ACCELERATION,
-       SENSOR_DEVICE_GEOMAGNETIC,
-       SENSOR_DEVICE_ROTATION_VECTOR,
-       SENSOR_DEVICE_ORIENTATION,
-       SENSOR_DEVICE_GYROSCOPE,
-       SENSOR_DEVICE_LIGHT,
-       SENSOR_DEVICE_PROXIMITY,
-       SENSOR_DEVICE_PRESSURE,
-       SENSOR_DEVICE_ULTRAVIOLET,
-       SENSOR_DEVICE_TEMPERATURE,
-       SENSOR_DEVICE_HUMIDITY,
-       SENSOR_DEVICE_HRM,
-       SENSOR_DEVICE_HRM_LED_GREEN,
-       SENSOR_DEVICE_HRM_LED_IR,
-       SENSOR_DEVICE_HRM_LED_RED,
-       SENSOR_DEVICE_GYROSCOPE_UNCAL,
-       SENSOR_DEVICE_GEOMAGNETIC_UNCAL,
-       SENSOR_DEVICE_GYROSCOPE_RV,
-       SENSOR_DEVICE_GEOMAGNETIC_RV,
-
-       SENSOR_DEVICE_ACTIVITY_STATIONARY = 0x100,
-       SENSOR_DEVICE_ACTIVITY_WALK,
-       SENSOR_DEVICE_ACTIVITY_RUN,
-       SENSOR_DEVICE_ACTIVITY_IN_VEHICLE,
-       SENSOR_DEVICE_ACTIVITY_ON_BICYCLE,
-
-       SENSOR_DEVICE_GESTURE_MOVEMENT = 0x200,
-       SENSOR_DEVICE_GESTURE_WRIST_UP,
-       SENSOR_DEVICE_GESTURE_WRIST_DOWN,
-
-       SENSOR_DEVICE_HUMAN_PEDOMETER = 0x300,
-       SENSOR_DEVICE_HUMAN_SLEEP_MONITOR,
-
-       SENSOR_DEVICE_FUSION = 0x900,
-       SENSOR_DEVICE_AUTO_ROTATION,
-
-       SENSOR_DEVICE_CONTEXT = 0x1000,
-       SENSOR_DEVICE_MOTION,
-       SENSOR_DEVICE_PIR,
-       SENSOR_DEVICE_PIR_LONG,
-       SENSOR_DEVICE_DUST,
-       SENSOR_DEVICE_THERMOMETER,
-       SENSOR_DEVICE_PEDOMETER,
-       SENSOR_DEVICE_FLAT,
-       SENSOR_DEVICE_HRM_RAW,
-       SENSOR_DEVICE_TILT,
-       SENSOR_DEVICE_ROTATION_VECTOR_RAW,
-} sensor_device_type;
-
-/*
- * A platform sensor handler is generated based on this handle
- * ID can be assigned from HAL developer. so it has to be unique in HAL.
- */
-typedef struct sensor_handle_t {
-       uint32_t id;
-       const char *name;
-       sensor_device_type type;
-       unsigned int event_type; // for Internal API
-       const char *model_name;
-       const char *vendor;
-       float min_range;
-       float max_range;
-       float resolution;
-       int min_interval;
-       int max_batch_count;
-       bool wakeup_supported;
-} sensor_handle_t;
-
-enum sensor_accuracy_t {
-       SENSOR_ACCURACY_UNDEFINED = -1,
-       SENSOR_ACCURACY_BAD = 0,
-       SENSOR_ACCURACY_NORMAL =1,
-       SENSOR_ACCURACY_GOOD = 2,
-       SENSOR_ACCURACY_VERYGOOD = 3
-};
-
-#define SENSOR_DATA_VALUE_SIZE 16
-
-/* sensor_data_t */
-typedef struct sensor_data_t {
-       int accuracy;
-       unsigned long long timestamp;
-       int value_count;
-       float values[SENSOR_DATA_VALUE_SIZE];
-} sensor_data_t;
-
-#define SENSORHUB_DATA_VALUE_SIZE 4096
-
-/* sensorhub_data_t */
-typedef struct sensorhub_data_t {
-       int accuracy;
-       unsigned long long timestamp;
-       int value_count;
-       char values[SENSORHUB_DATA_VALUE_SIZE];
-} sensorhub_data_t;
-
-/*
- * Create devices
- */
-typedef void *sensor_device_t;
-typedef int (*create_t)(sensor_device_t **devices);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-/*
- * Sensor device interface
- * 1 device must be abstracted from 1 device event node
- */
-class sensor_device {
-public:
-       virtual ~sensor_device() {}
-
-       uint32_t get_hal_version(void)
-       {
-               return SENSOR_HAL_VERSION(1, 0);
-       }
-
-       virtual int get_poll_fd(void) = 0;
-       virtual int get_sensors(const sensor_handle_t **sensors) = 0;
-
-       virtual bool enable(uint32_t id) = 0;
-       virtual bool disable(uint32_t id) = 0;
-
-       virtual bool set_interval(uint32_t id, unsigned long val) = 0;
-       virtual bool set_batch_latency(uint32_t id, unsigned long val) = 0;
-       virtual bool set_attribute_int(uint32_t id, int32_t attribute, int32_t value) = 0;
-       virtual bool set_attribute_str(uint32_t id, int32_t attribute, char *value, int value_len) = 0;
-
-       virtual int read_fd(uint32_t **ids) = 0;
-       virtual int get_data(uint32_t id, sensor_data_t **data, int *length) = 0;
-
-       virtual bool flush(uint32_t id) = 0;
-};
-#endif /* __cplusplus */
-
-#endif /* _SENSOR_HAL_H_ */
index dc59974..02dadb6 100644 (file)
@@ -19,7 +19,7 @@
 #define _SENSORHUB_DEVICE_H_
 
 #include <vector>
-#include <sensor_hal.h>
+#include <sensor/sensor_hal.h>
 
 #include "sensorhub_controller.h"
 #include "sensorhub_manager.h"
index b80aff0..0aa5d7c 100644 (file)
@@ -18,7 +18,7 @@
 #ifndef _SENSORHUB_CONTROLLER_H_
 #define _SENSORHUB_CONTROLLER_H_
 
-#include <sensor_hal.h>
+#include <sensor/sensor_hal.h>
 
 class sensorhub_controller {
 public:
index 4a8e5aa..9a994d5 100644 (file)
@@ -16,7 +16,7 @@
  */
 
 #include <algorithm>
-#include <sensor_hal.h>
+#include <sensor/sensor_hal.h>
 #include <sensor_logs.h>
 
 #include "sensorhub_manager.h"