diff options
author | Mike Lockwood <lockwood@android.com> | 2009-05-22 10:03:00 -0400 |
---|---|---|
committer | Mike Lockwood <lockwood@android.com> | 2009-05-22 10:03:00 -0400 |
commit | 9bce44dfa198f3859f1677b2d693e2f709d1cca8 (patch) | |
tree | 109d92e715d6e11f456b772a5fbe81e19b531dd1 /emulator | |
parent | 8d7d7920982f0c141490f1b2b4986287a7a53f91 (diff) | |
download | sdk-9bce44dfa198f3859f1677b2d693e2f709d1cca8.zip sdk-9bce44dfa198f3859f1677b2d693e2f709d1cca8.tar.gz sdk-9bce44dfa198f3859f1677b2d693e2f709d1cca8.tar.bz2 |
Sensors: Use a native_handle for the data channel instead of a single file descriptor.
This eliminates the requirement that all sensors share a single file descriptor.
This, along with concurrent changes in other projects, fixes bugs b/1614524 and b/1614481
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'emulator')
-rw-r--r-- | emulator/sensors/sensors_qemu.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/emulator/sensors/sensors_qemu.c b/emulator/sensors/sensors_qemu.c index 85a5af4..0cc636a 100644 --- a/emulator/sensors/sensors_qemu.c +++ b/emulator/sensors/sensors_qemu.c @@ -34,6 +34,7 @@ #include <errno.h> #include <string.h> #include <cutils/log.h> +#include <cutils/native_handle.h> #include <cutils/sockets.h> #include <hardware/sensors.h> @@ -123,16 +124,19 @@ typedef struct SensorControl { /* this must return a file descriptor that will be used to read * the sensors data (it is passed to data__data_open() below */ -static int +static native_handle_t* control__open_data_source(struct sensors_control_device_t *dev) { SensorControl* ctl = (void*)dev; + native_handle_t* handle; if (ctl->fd < 0) { ctl->fd = qemud_channel_open(SENSORS_SERVICE_NAME); } D("%s: fd=%d", __FUNCTION__, ctl->fd); - return ctl->fd; + handle = native_handle_create(1, 0); + handle->data[0] = ctl->fd; + return handle; } static int @@ -244,7 +248,7 @@ data__now_ns(void) } static int -data__data_open(struct sensors_data_device_t *dev, int fd) +data__data_open(struct sensors_data_device_t *dev, native_handle_t* handle) { SensorData* data = (void*)dev; int i; @@ -258,7 +262,9 @@ data__data_open(struct sensors_data_device_t *dev, int fd) data->timeStart = 0; data->timeOffset = 0; - data->events_fd = dup(fd); + data->events_fd = dup(handle->data[0]); + native_handle_close(handle); + native_handle_delete(handle); return 0; } |