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 <vincentx.becker@intel.com> Signed-off-by: Vincent Becker <vincentx.becker@intel.com> Signed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Signed-off-by: David Wagner <david.wagner@intel.com> Author-tracking-BZ: 49760
This commit is contained in:
parent
f767270d5c
commit
efcc15accd
4 changed files with 1 additions and 131 deletions
|
@ -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)
|
||||
|
|
|
@ -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
|
|
@ -1,4 +0,0 @@
|
|||
# Copyright 2006 The Android Open Source Project
|
||||
|
||||
LOCAL_SRC_FILES += vibrator/vibrator.c
|
||||
|
|
@ -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 <hardware_legacy/vibrator.h>
|
||||
#include "qemu.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <errno.h>
|
||||
|
||||
#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);
|
||||
}
|
Loading…
Reference in a new issue