Merge "first step at implementing the native sensor support" into gingerbread (e1ea0811) · Commits · e / os / android_frameworks_native-old

include/gui/ISensorEventConnection.h

0 → 100644

+57 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 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.
		*/

		#ifndef ANDROID_GUI_ISENSOR_EVENT_CONNECTION_H
		#define ANDROID_GUI_ISENSOR_EVENT_CONNECTION_H

		#include <stdint.h>
		#include <sys/types.h>

		#include <utils/Errors.h>
		#include <utils/RefBase.h>

		#include <binder/IInterface.h>

		namespace android {
		// ----------------------------------------------------------------------------

		class SensorChannel;

		class ISensorEventConnection : public IInterface
		{
		public:
		DECLARE_META_INTERFACE(SensorEventConnection);

		virtual sp<SensorChannel> getSensorChannel() const = 0;
		virtual status_t enableDisable(int handle, bool enabled) = 0;
		virtual status_t setEventRate(int handle, nsecs_t ns) = 0;
		};

		// ----------------------------------------------------------------------------

		class BnSensorEventConnection : public BnInterface<ISensorEventConnection>
		{
		public:
		virtual status_t onTransact( uint32_t code,
		const Parcel& data,
		Parcel* reply,
		uint32_t flags = 0);
		};

		// ----------------------------------------------------------------------------
		}; // namespace android

		#endif // ANDROID_GUI_ISENSOR_EVENT_CONNECTION_H

include/gui/ISensorServer.h

0 → 100644

+57 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 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.
		*/

		#ifndef ANDROID_GUI_ISENSORSERVER_H
		#define ANDROID_GUI_ISENSORSERVER_H

		#include <stdint.h>
		#include <sys/types.h>

		#include <utils/Errors.h>
		#include <utils/RefBase.h>

		#include <binder/IInterface.h>

		namespace android {
		// ----------------------------------------------------------------------------

		class Sensor;
		class ISensorEventConnection;

		class ISensorServer : public IInterface
		{
		public:
		DECLARE_META_INTERFACE(SensorServer);

		virtual Vector<Sensor> getSensorList()= 0;
		virtual sp<ISensorEventConnection> createSensorEventConnection() = 0;
		};

		// ----------------------------------------------------------------------------

		class BnSensorServer : public BnInterface<ISensorServer>
		{
		public:
		virtual status_t onTransact( uint32_t code,
		const Parcel& data,
		Parcel* reply,
		uint32_t flags = 0);
		};

		// ----------------------------------------------------------------------------
		}; // namespace android

		#endif // ANDROID_GUI_ISENSORSERVER_H

include/gui/Sensor.h

0 → 100644

+88 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 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.
		*/

		#ifndef ANDROID_GUI_SENSOR_H
		#define ANDROID_GUI_SENSOR_H

		#include <stdint.h>
		#include <sys/types.h>

		#include <utils/Errors.h>
		#include <utils/String8.h>
		#include <utils/Flattenable.h>

		#include <hardware/sensors.h>

		#include <android/sensor.h>

		// ----------------------------------------------------------------------------
		// Concrete types for the NDK
		struct ASensor { };

		// ----------------------------------------------------------------------------
		namespace android {
		// ----------------------------------------------------------------------------

		class Parcel;

		// ----------------------------------------------------------------------------

		class Sensor : public ASensor, public Flattenable
		{
		public:
		enum {
		TYPE_ACCELEROMETER = ASENSOR_TYPE_ACCELEROMETER,
		TYPE_MAGNETIC_FIELD = ASENSOR_TYPE_MAGNETIC_FIELD,
		TYPE_GYROSCOPE = ASENSOR_TYPE_GYROSCOPE,
		TYPE_LIGHT = ASENSOR_TYPE_LIGHT,
		TYPE_PROXIMITY = ASENSOR_TYPE_PROXIMITY
		};

		Sensor();
		virtual ~Sensor();

		const String8& getName() const;
		const String8& getVendor() const;
		int32_t getHandle() const;
		int32_t getType() const;
		float getMinValue() const;
		float getMaxValue() const;
		float getResolution() const;
		float getPowerUsage() const;

		// Flattenable interface
		virtual size_t getFlattenedSize() const;
		virtual size_t getFdCount() const;
		virtual status_t flatten(void* buffer, size_t size,
		int fds[], size_t count) const;
		virtual status_t unflatten(void const* buffer, size_t size,
		int fds[], size_t count);

		private:
		String8 mName;
		String8 mVendor;
		int32_t mHandle;
		int32_t mType;
		float mMinValue;
		float mMaxValue;
		float mResolution;
		float mPower;
		};

		// ----------------------------------------------------------------------------
		}; // namespace android

		#endif // ANDROID_GUI_SENSOR_H

include/gui/SensorChannel.h

0 → 100644

+53 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 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.
		*/

		#ifndef ANDROID_GUI_SENSOR_CHANNEL_H
		#define ANDROID_GUI_SENSOR_CHANNEL_H

		#include <stdint.h>
		#include <sys/types.h>

		#include <utils/Errors.h>
		#include <utils/RefBase.h>


		namespace android {
		// ----------------------------------------------------------------------------
		class Parcel;

		class SensorChannel : public RefBase
		{
		public:

		SensorChannel();
		SensorChannel(const Parcel& data);
		virtual ~SensorChannel();

		int getFd() const;
		ssize_t write(void const* vaddr, size_t size);
		ssize_t read(void* vaddr, size_t size);

		status_t writeToParcel(Parcel* reply) const;

		private:
		int mSendFd;
		mutable int mReceiveFd;
		};

		// ----------------------------------------------------------------------------
		}; // namespace android

		#endif // ANDROID_GUI_SENSOR_CHANNEL_H

include/gui/SensorEventQueue.h

0 → 100644

+71 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 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.
		*/

		#ifndef ANDROID_SENSOR_EVENT_QUEUE_H
		#define ANDROID_SENSOR_EVENT_QUEUE_H

		#include <stdint.h>
		#include <sys/types.h>

		#include <utils/Errors.h>
		#include <utils/RefBase.h>
		#include <utils/Timers.h>

		#include <gui/SensorChannel.h>

		// ----------------------------------------------------------------------------

		struct ALooper;
		struct ASensorEvent;

		// Concrete types for the NDK
		struct ASensorEventQueue {
		ALooper* looper;
		};

		// ----------------------------------------------------------------------------
		namespace android {
		// ----------------------------------------------------------------------------

		class ISensorEventConnection;
		class Sensor;

		// ----------------------------------------------------------------------------

		class SensorEventQueue : public ASensorEventQueue, public RefBase
		{
		public:
		SensorEventQueue(const sp<ISensorEventConnection>& connection);
		virtual ~SensorEventQueue();
		virtual void onFirstRef();

		int getFd() const;
		ssize_t write(ASensorEvent const* events, size_t numEvents);
		ssize_t read(ASensorEvent* events, size_t numEvents);

		status_t enableSensor(Sensor const* sensor) const;
		status_t disableSensor(Sensor const* sensor) const;
		status_t setEventRate(Sensor const* sensor, nsecs_t ns) const;

		private:
		sp<ISensorEventConnection> mSensorEventConnection;
		sp<SensorChannel> mSensorChannel;
		};

		// ----------------------------------------------------------------------------
		}; // namespace android

		#endif // ANDROID_SENSOR_EVENT_QUEUE_H