| Revision | 84048675daaf09be430c3f6cedbb551b67282d64 (tree) |
|---|---|
| Time | 2019-06-26 12:30:18 |
| Author | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Merge branch 'lineage-16.0' of https://github.com/me176c-dev/android_hardware_iio-sensors-hal into oreo-x86
Android.mk (diff)
activity_event_utils.h (diff) common.h (diff)
description.c (diff)| @@ -56,7 +56,7 @@ LOCAL_MODULE := sens | ||
| 56 | 56 | LOCAL_CFLAGS := -DLOG_TAG=\"Sensors\" -fvisibility=hidden |
| 57 | 57 | LOCAL_SHARED_LIBRARIES := liblog libcutils libdl |
| 58 | 58 | LOCAL_SRC_FILES := sens.c |
| 59 | -LOCAL_MODULE_TAGS := eng | |
| 59 | +LOCAL_MODULE_TAGS := optional | |
| 60 | 60 | LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_EXECUTABLES) |
| 61 | 61 | include $(BUILD_EXECUTABLE) |
| 62 | 62 |
| @@ -87,6 +87,6 @@ LOCAL_MODULE := activity | ||
| 87 | 87 | LOCAL_CFLAGS := -DLOG_TAG=\"Activity\" -fvisibility=hidden |
| 88 | 88 | LOCAL_SHARED_LIBRARIES := liblog libcutils libdl |
| 89 | 89 | LOCAL_SRC_FILES := activity.c |
| 90 | -LOCAL_MODULE_TAGS := eng | |
| 90 | +LOCAL_MODULE_TAGS := optional | |
| 91 | 91 | LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_EXECUTABLES) |
| 92 | 92 | include $(BUILD_EXECUTABLE) |
| @@ -24,10 +24,6 @@ | ||
| 24 | 24 | #define MAX_ACTIVITIES 6 |
| 25 | 25 | #define MAX_EVENTS_PER_ACTIVITY 2 |
| 26 | 26 | |
| 27 | -typedef unsigned bool; | |
| 28 | -#define true 1 | |
| 29 | -#define false 0 | |
| 30 | - | |
| 31 | 27 | /* For each activity in activity_recognition.h we can monitor 2 events at most : |
| 32 | 28 | * ENTER and EXIT */ |
| 33 | 29 | struct activity_event_info { |
| @@ -40,6 +40,7 @@ | ||
| 40 | 40 | #define SENSOR_OFFSET_PATH BASE_PATH "in_%s_offset" |
| 41 | 41 | #define SENSOR_SCALE_PATH BASE_PATH "in_%s_scale" |
| 42 | 42 | #define SENSOR_SAMPLING_PATH BASE_PATH "in_%s_sampling_frequency" |
| 43 | +#define SENSOR_AVAIL_FREQ_PATH BASE_PATH "in_%s_sampling_frequency_available" | |
| 43 | 44 | #define DEVICE_SAMPLING_PATH BASE_PATH "sampling_frequency" |
| 44 | 45 | #define DEVICE_AVAIL_FREQ_PATH BASE_PATH "sampling_frequency_available" |
| 45 | 46 | #define ILLUMINATION_CALIBPATH BASE_PATH "in_illuminance_calibscale" |
| @@ -482,6 +482,7 @@ int sensor_get_order (int s, unsigned char map[MAX_CHANNELS]) | ||
| 482 | 482 | int sensor_get_available_frequencies (int s) |
| 483 | 483 | { |
| 484 | 484 | int dev_num = sensor[s].dev_num, err, i; |
| 485 | + const char *prefix = sensor_catalog[sensor[s].catalog_index].tag; | |
| 485 | 486 | char avail_sysfs_path[PATH_MAX], freqs_buf[100]; |
| 486 | 487 | char *p, *end; |
| 487 | 488 | float f; |
| @@ -492,8 +493,12 @@ int sensor_get_available_frequencies (int s) | ||
| 492 | 493 | sprintf(avail_sysfs_path, DEVICE_AVAIL_FREQ_PATH, dev_num); |
| 493 | 494 | |
| 494 | 495 | err = sysfs_read_str(avail_sysfs_path, freqs_buf, sizeof(freqs_buf)); |
| 495 | - if (err < 0) | |
| 496 | - return 0; | |
| 496 | + if (err < 0) { | |
| 497 | + sprintf(avail_sysfs_path, SENSOR_AVAIL_FREQ_PATH, dev_num, prefix); | |
| 498 | + err = sysfs_read_str(avail_sysfs_path, freqs_buf, sizeof(freqs_buf)); | |
| 499 | + if (err < 0) | |
| 500 | + return 0; | |
| 501 | + } | |
| 497 | 502 | |
| 498 | 503 | for (p = freqs_buf, f = strtof(p, &end); p != end; p = end, f = strtof(p, &end)) |
| 499 | 504 | sensor[s].avail_freqs_count++; |
Android-x86
Fork