From efcc15accd190e527dfaaace7f05906b1c4b334b Mon Sep 17 00:00:00 2001 From: Vincent Becker Date: Fri, 10 Aug 2012 14:50:03 +0200 Subject: [PATCH] Vibra: Remove vibrator AOSP implementation from libhardware_legacy To enable the vendor implementation of the vibrator HAL, it is needed to use hardware modules, a default one for AOSP and the vendor one. The legacy implementation is no more needed so let's remove it. This change is related to other changes in: - hardware/libhardware - frameworks/base Change-Id: I844279f5535289f079d412fdc44c5cb3c9c1130c Author: Vincent Becker Signed-off-by: Vincent Becker Signed-off-by: Shuo Gao Signed-off-by: Bruce Beare Signed-off-by: Jack Ren Signed-off-by: David Wagner Author-tracking-BZ: 49760 --- Android.mk | 2 +- include/hardware_legacy/vibrator.h | 51 -------------------- vibrator/Android.mk | 4 -- vibrator/vibrator.c | 75 ------------------------------ 4 files changed, 1 insertion(+), 131 deletions(-) delete mode 100644 include/hardware_legacy/vibrator.h delete mode 100644 vibrator/Android.mk delete mode 100644 vibrator/vibrator.c diff --git a/Android.mk b/Android.mk index aab0963..01711dc 100644 --- a/Android.mk +++ b/Android.mk @@ -1,7 +1,7 @@ # Copyright 2006 The Android Open Source Project # Setting LOCAL_PATH will mess up all-subdir-makefiles, so do it beforehand. -legacy_modules := power uevent vibrator wifi qemu qemu_tracing +legacy_modules := power uevent wifi qemu qemu_tracing SAVE_MAKEFILES := $(call all-named-subdir-makefiles,$(legacy_modules)) LEGACY_AUDIO_MAKEFILES := $(call all-named-subdir-makefiles,audio) diff --git a/include/hardware_legacy/vibrator.h b/include/hardware_legacy/vibrator.h deleted file mode 100644 index 7994f62..0000000 --- a/include/hardware_legacy/vibrator.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * 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. - */ - -#ifndef _HARDWARE_VIBRATOR_H -#define _HARDWARE_VIBRATOR_H - -#if __cplusplus -extern "C" { -#endif - -/** - * Return whether the device has a vibrator. - * - * @return 1 if a vibrator exists, 0 if it doesn't. - */ -int vibrator_exists(); - -/** - * Turn on vibrator - * - * @param timeout_ms number of milliseconds to vibrate - * - * @return 0 if successful, -1 if error - */ -int vibrator_on(int timeout_ms); - -/** - * Turn off vibrator - * - * @return 0 if successful, -1 if error - */ -int vibrator_off(); - -#if __cplusplus -} // extern "C" -#endif - -#endif // _HARDWARE_VIBRATOR_H diff --git a/vibrator/Android.mk b/vibrator/Android.mk deleted file mode 100644 index 6681f84..0000000 --- a/vibrator/Android.mk +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright 2006 The Android Open Source Project - -LOCAL_SRC_FILES += vibrator/vibrator.c - diff --git a/vibrator/vibrator.c b/vibrator/vibrator.c deleted file mode 100644 index f946ce1..0000000 --- a/vibrator/vibrator.c +++ /dev/null @@ -1,75 +0,0 @@ -/* - * 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 -#include "qemu.h" - -#include -#include -#include -#include - -#define THE_DEVICE "/sys/class/timed_output/vibrator/enable" - -int vibrator_exists() -{ - int fd; - -#ifdef QEMU_HARDWARE - if (qemu_check()) { - return 1; - } -#endif - - fd = open(THE_DEVICE, O_RDWR); - if(fd < 0) - return 0; - close(fd); - return 1; -} - -static int sendit(int timeout_ms) -{ - int nwr, ret, fd; - char value[20]; - -#ifdef QEMU_HARDWARE - if (qemu_check()) { - return qemu_control_command( "vibrator:%d", timeout_ms ); - } -#endif - - fd = open(THE_DEVICE, O_RDWR); - if(fd < 0) - return errno; - - nwr = sprintf(value, "%d\n", timeout_ms); - ret = write(fd, value, nwr); - - close(fd); - - return (ret == nwr) ? 0 : -1; -} - -int vibrator_on(int timeout_ms) -{ - /* constant on, up to maximum allowed time */ - return sendit(timeout_ms); -} - -int vibrator_off() -{ - return sendit(0); -}