SET(VERSION ${FULLVER})
SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-INCLUDE_DIRECTORIES(include ${CMAKE_CURRENT_SOURCE_DIR})
+INCLUDE_DIRECTORIES(include include/private ${CMAKE_CURRENT_SOURCE_DIR})
# Build options
FOREACH(flag ${${PROJECT_NAME}_CFLAGS})
ADD_SUBDIRECTORY(tests)
ADD_SUBDIRECTORY(tools)
-INSTALL(FILES include/sensor.h include/sensor-internal.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor)
+INSTALL(DIRECTORY include/ include/private/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor)
+#include <sensor.h>
+
+#ifndef _SENSOR_INFO_PRIVATE_H_
+#define _SENSOR_INFO_PRIVATE_H_
+
#define SENSOR_NUM (sizeof(sensor_info_lists) / sizeof(sensor_info_lists[0]))
struct sensor_info_list {
{SENSOR_HUMAN_SLEEP_MONITOR, "Sleep monitor", "SLEEP_MONITOR", 1},
{SENSOR_HUMAN_SLEEP_DETECTOR, "Sleep detector", "SLEEP_DETECTOR", 1},
};
+
+#endif /* _SENSOR_INFO_PRIVATE_H_ */
+
#include <limits.h>
/*header for common sensor type*/
-#include <sensor-types.h>
#include <sensor.h>
+#include <sensor-types-private.h>
#include <hal-sensor-types.h>
#define SENSOR_BATCH_LATENCY_DEFAULT UINT_MAX
%manifest packaging/capi-system-sensor.manifest
%{_libdir}/pkgconfig/*.pc
%{_includedir}/sensor/*.h
+%{_includedir}/sensor/private/*.h
%{_libdir}/libcapi-system-sensor.so
%files test
#include <sensor-internal.h>
#include <sensor.h>
-#include <sensor-types.h>
+#include <sensor-types-private.h>
#include <sensor_types_private.h>
#include <sensor_utils.h>
#include <channel_handler.h>
#include <sensor_manager.h>
#include <sensor_listener.h>
#include <sensor_provider_internal.h>
-#include <sensor-log.h>
+#include <sensor-log-private.h>
#include <cmutex.h>
#include <command_types.h>
#include "sensor_reader.h"
#include <sensor.h>
#include <sensor-internal.h>
#include <sensor-private.h>
-#include <sensor-log.h>
+#include <sensor-log-private.h>
#define RETURN_VAL_IF(expr, err) \
do { \
#include "sensor_listener.h"
#include <channel_handler.h>
-#include <sensor-log.h>
-#include <sensor-types.h>
+#include <sensor-log-private.h>
+#include <sensor-types-private.h>
#include <command_types.h>
#include <ipc_client.h>
#include <channel_handler.h>
#include <event_loop.h>
#include <sensor_info.h>
-#include <sensor-types.h>
+#include <sensor-types-private.h>
#include <cmutex.h>
#include <map>
#include <atomic>
#include "sensor_manager.h"
-#include <sensor-log.h>
+#include <sensor-log-private.h>
#include <sensor_info.h>
#include <sensor_utils.h>
#include <command_types.h>
#include "sensor_manager_channel_handler.h"
-#include <sensor-log.h>
+#include <sensor-log-private.h>
#include <command_types.h>
#include "sensor_manager.h"
*/
#include <sensor.h>
-#include <sensor-private.h>
#include <sensor-internal.h>
+#include <sensor-private.h>
+#include <sensor-log-private.h>
#include <new>
#include <map>
-#include "include/sensor-log.h"
-
#define RETV_IF(expr, val) \
do { if (expr) { return (val); } } while (0)
#include "sensor_provider_channel_handler.h"
#include <command_types.h>
-#include <sensor-log.h>
+#include <sensor-log-private.h>
#include "sensor_provider_internal.h"
using namespace sensor;
#include <message.h>
#include <channel.h>
-#include <sensor-log.h>
-#include <sensor-types.h>
+#include <sensor-log-private.h>
+#include <sensor-types-private.h>
#include <sensor_utils.h>
#include <ipc_client.h>
#include <command_types.h>
#include <event_loop.h>
#include <sensor-internal.h>
#include <sensor_info.h>
-#include <sensor-types.h>
+#include <sensor-types-private.h>
#include <map>
#include <atomic>
#include "sensor_reader.h"
-#include <sensor-log.h>
-#include <sensor-types.h>
+#include <sensor-log-private.h>
+#include <sensor-types-private.h>
#include <chrono>
using namespace sensor;
#include <stdlib.h>
#include <sensor.h>
-#include <sensor-log.h>
+#include <sensor-log-private.h>
#include <sensor_recorder_internal.h>
#include <map>
#include <string>
#include <stdlib.h>
#include <sensor.h>
-#include <sensor-log.h>
+#include <sensor-log-private.h>
int sensor_recorder_is_supported(sensor_type_e type, bool *supported)
{
#include "accept_event_handler.h"
-#include "sensor-log.h"
+#include "sensor-log-private.h"
#include "ipc_server.h"
using namespace ipc;
#include <errno.h>
#include <sys/time.h>
#include <cbase_lock.h>
-#include <sensor-log.h>
+#include <sensor-log-private.h>
using namespace sensor;
#include <memory>
#include <algorithm>
-#include "sensor-log.h"
+#include "sensor-log-private.h"
#include "channel_event_handler.h"
#define SYSTEMD_SOCK_BUF_SIZE (128*1024)
#include "channel.h"
#include "channel_handler.h"
-#include "sensor-log.h"
+#include "sensor-log-private.h"
using namespace ipc;
*/
#include <cmutex.h>
-#include <sensor-log.h>
+#include <sensor-log-private.h>
using namespace sensor;
#ifndef __COMMAND_TYPES_H__
#define __COMMAND_TYPES_H__
-#include <sensor-types.h>
+#include <sensor-types-private.h>
#include "sensor_info.h"
#define SENSOR_CHANNEL_PATH "/run/.sensord.socket"
#include <queue>
#include "channel_event_handler.h"
-#include "sensor-log.h"
+#include "sensor-log-private.h"
#include "event_handler.h"
#include "channel.h"
#include "ipc_client.h"
-#include "sensor-log.h"
+#include "sensor-log-private.h"
#include "stream_socket.h"
#include "event_handler.h"
#include "channel_event_handler.h"
#include "ipc_server.h"
#include "channel.h"
-#include "sensor-log.h"
+#include "sensor-log-private.h"
#include "event_loop.h"
#include "channel_event_handler.h"
#include "accept_event_handler.h"
#include "message.h"
-#include <sensor-log.h>
+#include <sensor-log-private.h>
#include <atomic>
using namespace ipc;
#include "sensor_info.h"
-#include <sensor-types.h>
+#include <sensor-types-private.h>
#include <sensor_types_private.h>
-#include <sensor-log.h>
+#include <sensor-log-private.h>
#include <cfloat>
#include <algorithm>
#include <string>
#include <string>
#include <vector>
#include <hal/hal-sensor-types.h>
-#include <sensor-types.h>
+#include <sensor-types-private.h>
namespace sensor {
#include <stddef.h>
#include <map>
-#include <sensor-log.h>
-#include <sensor-types.h>
+#include <sensor-log-private.h>
+#include <sensor-types-private.h>
#include <sensor_types_private.h>
#ifndef PATH_MAX
#define __SENSOR_UTILS_H__
#include <time.h>
-#include <sensor-types.h>
+#include <sensor-types-private.h>
#include <string>
#include <vector>
#include <sys/types.h>
#include <sys/socket.h>
-#include "sensor-log.h"
+#include "sensor-log-private.h"
using namespace ipc;
#include <sys/ioctl.h>
#include <systemd/sd-daemon.h>
-#include "sensor-log.h"
+#include "sensor-log-private.h"
#define SOCK_TIMEOUT 10
#include <sys/types.h>
#include <sys/socket.h>
-#include "sensor-log.h"
+#include "sensor-log-private.h"
#define SLEEP_10_MS usleep(10000)
#include "spec_test.h"
#include "stress_test.h"
-#include "sensor_info_list.h"
+#include "sensor-info-private.h"
static void usage(void)
{
#include <sensor.h>
#include "spec_test.h"
-#include "sensor_info_list.h"
+#include "sensor-info-private.h"
#define TEST_COUNT_ONE 100
#define TEST_COUNT_ALL 1000
#include <sensor.h>
#include "stress_test.h"
-#include "sensor_info_list.h"
+#include "sensor-info-private.h"
void sensor_events_callback(sensor_h sensor, sensor_event_s events[], int events_count, void *user_data)
{
}
printf("Test was terminated with error.\n");
-}
\ No newline at end of file
+}
#include <glib.h>
#include <sensor.h>
-#include "sensor_info_list.h"
+#include "sensor-info-private.h"
static GMainLoop *loop;
static bool turned_on[40];