diff options
author | Pawit Pornkitprasan <p.pawit@gmail.com> | 2011-12-23 19:31:26 +0700 |
---|---|---|
committer | Pawit Pornkitprasan <p.pawit@gmail.com> | 2011-12-23 19:34:39 +0700 |
commit | 91c2ee3f53227cecf4c720171d9379955c9a4463 (patch) | |
tree | 95f54ddddb561070518ffcec8ec91f0058e1aac7 /libsensors/Smb380Sensor.cpp | |
parent | da0068d8e9e2120069e306ec71a1544e5bff45e1 (diff) | |
download | device_samsung_aries-common-91c2ee3f53227cecf4c720171d9379955c9a4463.zip device_samsung_aries-common-91c2ee3f53227cecf4c720171d9379955c9a4463.tar.gz device_samsung_aries-common-91c2ee3f53227cecf4c720171d9379955c9a4463.tar.bz2 |
libsensors: Fix line ending
Diffstat (limited to 'libsensors/Smb380Sensor.cpp')
-rw-r--r-- | libsensors/Smb380Sensor.cpp | 354 |
1 files changed, 177 insertions, 177 deletions
diff --git a/libsensors/Smb380Sensor.cpp b/libsensors/Smb380Sensor.cpp index feb1b22..e7565b1 100644 --- a/libsensors/Smb380Sensor.cpp +++ b/libsensors/Smb380Sensor.cpp @@ -1,177 +1,177 @@ -/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * 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.
- */
-
-#include <fcntl.h>
-#include <errno.h>
-#include <math.h>
-#include <poll.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <sys/select.h>
-#include <cutils/log.h>
-
-
-#include "Smb380Sensor.h"
-
-
-/*****************************************************************************/
-Smb380Sensor::Smb380Sensor()
- : SensorBase(NULL, "accelerometer_sensor"),
- mEnabled(0),
-
- mInputReader(4),
- mHasPendingEvent(false)
-{
- LOGD("Smb380Sensor::Smb380Sensor()");
- mPendingEvent.version = sizeof(sensors_event_t);
- mPendingEvent.sensor = ID_A;
- mPendingEvent.type = SENSOR_TYPE_ACCELEROMETER;
- memset(mPendingEvent.data, 0, sizeof(mPendingEvent.data));
-
- LOGD("Smb380Sensor::Smb380Sensor() open data_fd");
-
- if (data_fd) {
- strcpy(input_sysfs_path, "/sys/class/input/");
- strcat(input_sysfs_path, input_name);
- strcat(input_sysfs_path, "/device/");
- input_sysfs_path_len = strlen(input_sysfs_path);
-
- //enable(0, 1);
- }
-}
-
-Smb380Sensor::~Smb380Sensor() {
-
- LOGD("Smb380Sensor::~Smb380Sensor()");
- if (mEnabled) {
- enable(0, 0);
- }
-}
-
-
-
-int Smb380Sensor::enable(int32_t, int en) {
-
-
- LOGD("Smb380Sensor::~enable(0, %d)", en);
- int flags = en ? 1 : 0;
- if (flags != mEnabled) {
- int fd;
- strcpy(&input_sysfs_path[input_sysfs_path_len], "enable");
- LOGD("Smb380Sensor::~enable(0, %d) open %s",en, input_sysfs_path);
- fd = open(input_sysfs_path, O_RDWR);
- if (fd >= 0) {
- LOGD("Smb380Sensor::~enable(0, %d) opened %s",en, input_sysfs_path);
- char buf[2];
- int err;
- buf[1] = 0;
- if (flags) {
- buf[0] = '1';
- } else {
- buf[0] = '0';
- }
- err = write(fd, buf, sizeof(buf));
- close(fd);
- mEnabled = flags;
- //setInitialState();
- return 0;
- }
- return -1;
- }
- return 0;
-}
-
-
-bool Smb380Sensor::hasPendingEvents() const {
- /* FIXME probably here should be returning mEnabled but instead
- mHasPendingEvents. It does not work, so we cheat.*/
- //LOGD("Smb380Sensor::~hasPendingEvents %d", mHasPendingEvent ? 1 : 0 );
- return mHasPendingEvent;
-}
-
-
-int Smb380Sensor::setDelay(int32_t handle, int64_t ns)
-{
- LOGD("Smb380Sensor::~setDelay(%d, %lld)", handle, ns);
-
- int fd;
-
- if (ns < 10000000) {
- ns = 10000000; // Minimum on stock
- }
-
- strcpy(&input_sysfs_path[input_sysfs_path_len], "delay");
- fd = open(input_sysfs_path, O_RDWR);
- if (fd >= 0) {
- char buf[80];
- sprintf(buf, "%lld", ns / 10000000 * 10); // Some flooring to match stock value
- write(fd, buf, strlen(buf)+1);
- close(fd);
- return 0;
- }
- return -1;
-}
-
-
-int Smb380Sensor::readEvents(sensors_event_t* data, int count)
-{
- //LOGD("Smb380Sensor::~readEvents() %d", count);
- if (count < 1)
- return -EINVAL;
-
- if (mHasPendingEvent) {
- mHasPendingEvent = false;
- mPendingEvent.timestamp = getTimestamp();
- *data = mPendingEvent;
- return mEnabled ? 1 : 0;
- }
-
- ssize_t n = mInputReader.fill(data_fd);
- if (n < 0)
- return n;
-
- int numEventReceived = 0;
- input_event const* event;
-
- while (count && mInputReader.readEvent(&event)) {
- int type = event->type;
- if (type == EV_REL) {
- float value = event->value;
- if (event->code == EVENT_TYPE_ACCEL_X) {
- mPendingEvent.acceleration.x = value * CONVERT_A_X;
- } else if (event->code == EVENT_TYPE_ACCEL_Y) {
- mPendingEvent.acceleration.y = value * CONVERT_A_Y;
- } else if (event->code == EVENT_TYPE_ACCEL_Z) {
- mPendingEvent.acceleration.z = value * CONVERT_A_Z;
- }
- } else if (type == EV_SYN) {
- mPendingEvent.timestamp = timevalToNano(event->time);
- if (mEnabled) {
- *data++ = mPendingEvent;
- count--;
- numEventReceived++;
- }
- } else {
- LOGE("Smb380Sensor: unknown event (type=%d, code=%d)",
- type, event->code);
- }
- mInputReader.next();
- }
-
- //LOGD("Smb380Sensor::~readEvents() numEventReceived = %d", numEventReceived);
- return numEventReceived++;
-
-}
+/* + * Copyright (C) 2008 The Android Open Source Project + * + * 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. + */ + +#include <fcntl.h> +#include <errno.h> +#include <math.h> +#include <poll.h> +#include <unistd.h> +#include <dirent.h> +#include <sys/select.h> +#include <cutils/log.h> + + +#include "Smb380Sensor.h" + + +/*****************************************************************************/ +Smb380Sensor::Smb380Sensor() + : SensorBase(NULL, "accelerometer_sensor"), + mEnabled(0), + + mInputReader(4), + mHasPendingEvent(false) +{ + LOGD("Smb380Sensor::Smb380Sensor()"); + mPendingEvent.version = sizeof(sensors_event_t); + mPendingEvent.sensor = ID_A; + mPendingEvent.type = SENSOR_TYPE_ACCELEROMETER; + memset(mPendingEvent.data, 0, sizeof(mPendingEvent.data)); + + LOGD("Smb380Sensor::Smb380Sensor() open data_fd"); + + if (data_fd) { + strcpy(input_sysfs_path, "/sys/class/input/"); + strcat(input_sysfs_path, input_name); + strcat(input_sysfs_path, "/device/"); + input_sysfs_path_len = strlen(input_sysfs_path); + + //enable(0, 1); + } +} + +Smb380Sensor::~Smb380Sensor() { + + LOGD("Smb380Sensor::~Smb380Sensor()"); + if (mEnabled) { + enable(0, 0); + } +} + + + +int Smb380Sensor::enable(int32_t, int en) { + + + LOGD("Smb380Sensor::~enable(0, %d)", en); + int flags = en ? 1 : 0; + if (flags != mEnabled) { + int fd; + strcpy(&input_sysfs_path[input_sysfs_path_len], "enable"); + LOGD("Smb380Sensor::~enable(0, %d) open %s",en, input_sysfs_path); + fd = open(input_sysfs_path, O_RDWR); + if (fd >= 0) { + LOGD("Smb380Sensor::~enable(0, %d) opened %s",en, input_sysfs_path); + char buf[2]; + int err; + buf[1] = 0; + if (flags) { + buf[0] = '1'; + } else { + buf[0] = '0'; + } + err = write(fd, buf, sizeof(buf)); + close(fd); + mEnabled = flags; + //setInitialState(); + return 0; + } + return -1; + } + return 0; +} + + +bool Smb380Sensor::hasPendingEvents() const { + /* FIXME probably here should be returning mEnabled but instead + mHasPendingEvents. It does not work, so we cheat.*/ + //LOGD("Smb380Sensor::~hasPendingEvents %d", mHasPendingEvent ? 1 : 0 ); + return mHasPendingEvent; +} + + +int Smb380Sensor::setDelay(int32_t handle, int64_t ns) +{ + LOGD("Smb380Sensor::~setDelay(%d, %lld)", handle, ns); + + int fd; + + if (ns < 10000000) { + ns = 10000000; // Minimum on stock + } + + strcpy(&input_sysfs_path[input_sysfs_path_len], "delay"); + fd = open(input_sysfs_path, O_RDWR); + if (fd >= 0) { + char buf[80]; + sprintf(buf, "%lld", ns / 10000000 * 10); // Some flooring to match stock value + write(fd, buf, strlen(buf)+1); + close(fd); + return 0; + } + return -1; +} + + +int Smb380Sensor::readEvents(sensors_event_t* data, int count) +{ + //LOGD("Smb380Sensor::~readEvents() %d", count); + if (count < 1) + return -EINVAL; + + if (mHasPendingEvent) { + mHasPendingEvent = false; + mPendingEvent.timestamp = getTimestamp(); + *data = mPendingEvent; + return mEnabled ? 1 : 0; + } + + ssize_t n = mInputReader.fill(data_fd); + if (n < 0) + return n; + + int numEventReceived = 0; + input_event const* event; + + while (count && mInputReader.readEvent(&event)) { + int type = event->type; + if (type == EV_REL) { + float value = event->value; + if (event->code == EVENT_TYPE_ACCEL_X) { + mPendingEvent.acceleration.x = value * CONVERT_A_X; + } else if (event->code == EVENT_TYPE_ACCEL_Y) { + mPendingEvent.acceleration.y = value * CONVERT_A_Y; + } else if (event->code == EVENT_TYPE_ACCEL_Z) { + mPendingEvent.acceleration.z = value * CONVERT_A_Z; + } + } else if (type == EV_SYN) { + mPendingEvent.timestamp = timevalToNano(event->time); + if (mEnabled) { + *data++ = mPendingEvent; + count--; + numEventReceived++; + } + } else { + LOGE("Smb380Sensor: unknown event (type=%d, code=%d)", + type, event->code); + } + mInputReader.next(); + } + + //LOGD("Smb380Sensor::~readEvents() numEventReceived = %d", numEventReceived); + return numEventReceived++; + +} |