summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcodeworkx <codeworkx@cyanogenmod.org>2013-02-15 15:50:05 +0000
committercodeworkx <codeworkx@cyanogenmod.org>2013-02-15 15:56:26 +0000
commit98cecf504a77728dcef60a2284870d020e27757d (patch)
tree902e2eb1b64734077ed1de77d594bdadb54c55b1
parent3f0fd1466854639c98e902ac6f5f5df8640e043a (diff)
downloaddevice_samsung_p5100-98cecf504a77728dcef60a2284870d020e27757d.zip
device_samsung_p5100-98cecf504a77728dcef60a2284870d020e27757d.tar.gz
device_samsung_p5100-98cecf504a77728dcef60a2284870d020e27757d.tar.bz2
p51xx: use omap4-common, samsung jb update
Change-Id: I106d3a39f089a2d1ad3f0bfaf58df81d94fdd994
-rw-r--r--BoardConfigCommon.mk20
-rw-r--r--cm.dependencies4
-rwxr-xr-xextract-files.sh2
-rw-r--r--overlay/include/hardware/gps.h686
-rwxr-xr-xp51xx-common.mk54
-rw-r--r--power/Android.mk27
-rw-r--r--power/power_piranha.c161
-rw-r--r--proprietary-common-files.txt20
-rw-r--r--proprietary-p5100-files.txt1
-rw-r--r--rootdir/fstab.espresso10 (renamed from fstab.espresso10)0
-rwxr-xr-xrootdir/init.espresso10.rc (renamed from init.espresso10.rc)49
-rwxr-xr-xrootdir/init.espresso10.usb.rc (renamed from init.espresso10.usb.rc)0
-rw-r--r--rootdir/recovery.rc (renamed from recovery.rc)0
-rw-r--r--rootdir/ueventd.espresso10.rc (renamed from ueventd.espresso10.rc)27
-rwxr-xr-xsetup-makefiles.sh3
-rw-r--r--usr/keychars/Generic.kcm672
-rw-r--r--usr/keychars/Virtual.kcm544
-rw-r--r--usr/keychars/qwerty.kcm508
-rw-r--r--usr/keychars/qwerty2.kcm505
-rw-r--r--usr/keylayout/AVRCP.kl23
-rw-r--r--usr/keylayout/Generic.kl423
-rw-r--r--usr/keylayout/Vendor_045e_Product_028e.kl46
-rw-r--r--usr/keylayout/Vendor_046d_Product_c216.kl37
-rw-r--r--usr/keylayout/Vendor_046d_Product_c294.kl53
-rw-r--r--usr/keylayout/Vendor_046d_Product_c299.kl62
-rw-r--r--usr/keylayout/Vendor_046d_Product_c532.kl133
-rw-r--r--usr/keylayout/Vendor_04e8_Product_7021.kl393
-rw-r--r--usr/keylayout/Vendor_054c_Product_0268.kl76
-rw-r--r--usr/keylayout/Vendor_05ac_Product_0239.kl119
-rw-r--r--usr/keylayout/Vendor_22b8_Product_093d.kl105
-rw-r--r--usr/keylayout/qwerty.kl112
31 files changed, 96 insertions, 4769 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 4bd168d..fa0779b 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -16,6 +16,9 @@
# This variable is set first, so it can be overridden
# by BoardConfigVendor.mk
+
+-include device/samsung/omap4-common/BoardConfigCommon.mk
+
USE_CAMERA_STUB := true
TARGET_ARCH := arm
@@ -31,6 +34,7 @@ TARGET_NO_BOOTLOADER := true
TARGET_NO_RADIOIMAGE := true
TARGET_BOARD_PLATFORM := omap4
+TARGET_BOARD_OMAP_CPU := 4430
TARGET_BOOTLOADER_BOARD_NAME := piranha
BOARD_NAND_PAGE_SIZE := 4096
@@ -53,15 +57,8 @@ BOARD_FLASH_BLOCK_SIZE := 4096
# Egl
BOARD_EGL_CFG := device/samsung/p5100/configs/egl.cfg
USE_OPENGL_RENDERER := true
-COMMON_GLOBAL_CFLAGS += -DSURFACEFLINGER_FORCE_SCREEN_RELEASE
TARGET_BOOTANIMATION_PRELOAD := true
-# HWComposer
-BOARD_USES_HWCOMPOSER := true
-BOARD_USE_SYSFS_VSYNC_NOTIFICATION := true
-# set if the target supports FBIO_WAITFORVSYNC
-TARGET_HAS_WAITFORVSYNC := true
-
# Camera
COMMON_GLOBAL_CFLAGS += -DDISABLE_HW_ID_MATCH_CHECK
@@ -85,9 +82,10 @@ WIFI_DRIVER_FW_PATH_STA := "/system/etc/wifi/bcmdhd_sta.bin"
WIFI_DRIVER_FW_PATH_AP := "/system/etc/wifi/bcmdhd_apsta.bin"
WIFI_DRIVER_FW_PATH_P2P := "/system/etc/wifi/bcmdhd_p2p.bin"
WIFI_DRIVER_MODULE_NAME := "dhd"
-WIFI_DRIVER_MODULE_ARG := "iface_name=wlan0 firmware_path=/system/etc/wifi/bcmdhd_sta.bin nvram_path=/system/etc/wifi/nvram_net.txt"
+WIFI_DRIVER_MODULE_ARG := "firmware_path=/system/etc/wifi/bcmdhd_sta.bin nvram_path=/system/etc/wifi/nvram_net.txt"
+WIFI_DRIVER_MODULE_AP_ARG := "firmware_path=/system/etc/wifi/bcmdhd_apsta.bin nvram_path=/system/etc/wifi/nvram_net.txt"
WIFI_BAND := 802_11_ABG
-BOARD_LEGACY_NL80211_STA_EVENTS := true
+BOARD_HAVE_SAMSUNG_WIFI := true
# Bluetooth
BOARD_HAVE_BLUETOOTH := true
@@ -99,7 +97,7 @@ BOARD_BLUEDROID_VENDOR_CONF := device/samsung/p5100/bluetooth/vnd_espresso10.txt
BOARD_USES_SECURE_SERVICES := true
# Recovery
-TARGET_RECOVERY_INITRC := device/samsung/p5100/recovery.rc
+TARGET_RECOVERY_INITRC := device/samsung/p5100/rootdir/recovery.rc
TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888"
BOARD_UMS_LUNFILE := "/sys/class/android_usb/f_mass_storage/lun0/file"
BOARD_USES_MMCUTILS := true
@@ -109,7 +107,5 @@ BOARD_HAS_NO_SELECT_BUTTON := true
# Charging mode
BOARD_CHARGER_RES := device/samsung/p5100/res/charger
-TARGET_SPECIFIC_HEADER_PATH := device/samsung/p5100/overlay/include
-
# Use the non-open-source parts, if they're present
-include vendor/samsung/p51xx/BoardConfigVendor.mk
diff --git a/cm.dependencies b/cm.dependencies
index 1b9a2f3..4344222 100644
--- a/cm.dependencies
+++ b/cm.dependencies
@@ -1,5 +1,9 @@
[
{
+ "repository": "android_device_samsung_omap4-common",
+ "target_path": "device/samsung/omap4-common"
+ },
+ {
"repository": "android_kernel_samsung_espresso10",
"target_path": "kernel/samsung/espresso10"
},
diff --git a/extract-files.sh b/extract-files.sh
index 1210947..dea73ab 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -41,3 +41,5 @@ for FILE in `cat proprietary-$DEVICE-files.txt | grep -v ^# | grep -v ^$`; do
done
./setup-makefiles.sh
+
+./../../../device/samsung/omap4-common/extract-files.sh
diff --git a/overlay/include/hardware/gps.h b/overlay/include/hardware/gps.h
deleted file mode 100644
index 05b3b11..0000000
--- a/overlay/include/hardware/gps.h
+++ /dev/null
@@ -1,686 +0,0 @@
-/*
- * 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_INCLUDE_HARDWARE_GPS_H
-#define ANDROID_INCLUDE_HARDWARE_GPS_H
-
-#include <stdint.h>
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <pthread.h>
-
-#include <hardware/hardware.h>
-
-__BEGIN_DECLS
-
-/**
- * The id of this module
- */
-#define GPS_HARDWARE_MODULE_ID "gps"
-
-
-/** Milliseconds since January 1, 1970 */
-typedef int64_t GpsUtcTime;
-
-/** Maximum number of SVs for gps_sv_status_callback(). */
-#define GPS_MAX_SVS 32
-
-/** Requested operational mode for GPS operation. */
-typedef uint32_t GpsPositionMode;
-// IMPORTANT: Note that the following values must match
-// constants in GpsLocationProvider.java.
-/** Mode for running GPS standalone (no assistance). */
-#define GPS_POSITION_MODE_STANDALONE 0
-/** AGPS MS-Based mode. */
-#define GPS_POSITION_MODE_MS_BASED 1
-/** AGPS MS-Assisted mode. */
-#define GPS_POSITION_MODE_MS_ASSISTED 2
-
-/** Requested recurrence mode for GPS operation. */
-typedef uint32_t GpsPositionRecurrence;
-// IMPORTANT: Note that the following values must match
-// constants in GpsLocationProvider.java.
-/** Receive GPS fixes on a recurring basis at a specified period. */
-#define GPS_POSITION_RECURRENCE_PERIODIC 0
-/** Request a single shot GPS fix. */
-#define GPS_POSITION_RECURRENCE_SINGLE 1
-
-/** GPS status event values. */
-typedef uint16_t GpsStatusValue;
-// IMPORTANT: Note that the following values must match
-// constants in GpsLocationProvider.java.
-/** GPS status unknown. */
-#define GPS_STATUS_NONE 0
-/** GPS has begun navigating. */
-#define GPS_STATUS_SESSION_BEGIN 1
-/** GPS has stopped navigating. */
-#define GPS_STATUS_SESSION_END 2
-/** GPS has powered on but is not navigating. */
-#define GPS_STATUS_ENGINE_ON 3
-/** GPS is powered off. */
-#define GPS_STATUS_ENGINE_OFF 4
-
-/** Flags to indicate which values are valid in a GpsLocation. */
-typedef uint16_t GpsLocationFlags;
-// IMPORTANT: Note that the following values must match
-// constants in GpsLocationProvider.java.
-/** GpsLocation has valid latitude and longitude. */
-#define GPS_LOCATION_HAS_LAT_LONG 0x0001
-/** GpsLocation has valid altitude. */
-#define GPS_LOCATION_HAS_ALTITUDE 0x0002
-/** GpsLocation has valid speed. */
-#define GPS_LOCATION_HAS_SPEED 0x0004
-/** GpsLocation has valid bearing. */
-#define GPS_LOCATION_HAS_BEARING 0x0008
-/** GpsLocation has valid accuracy. */
-#define GPS_LOCATION_HAS_ACCURACY 0x0010
-
-/** Flags for the gps_set_capabilities callback. */
-
-/** GPS HAL schedules fixes for GPS_POSITION_RECURRENCE_PERIODIC mode.
- If this is not set, then the framework will use 1000ms for min_interval
- and will start and call start() and stop() to schedule the GPS.
- */
-#define GPS_CAPABILITY_SCHEDULING 0x0000001
-/** GPS supports MS-Based AGPS mode */
-#define GPS_CAPABILITY_MSB 0x0000002
-/** GPS supports MS-Assisted AGPS mode */
-#define GPS_CAPABILITY_MSA 0x0000004
-/** GPS supports single-shot fixes */
-#define GPS_CAPABILITY_SINGLE_SHOT 0x0000008
-/** GPS supports on demand time injection */
-#define GPS_CAPABILITY_ON_DEMAND_TIME 0x0000010
-
-/** Flags used to specify which aiding data to delete
- when calling delete_aiding_data(). */
-typedef uint16_t GpsAidingData;
-// IMPORTANT: Note that the following values must match
-// constants in GpsLocationProvider.java.
-#define GPS_DELETE_EPHEMERIS 0x0001
-#define GPS_DELETE_ALMANAC 0x0002
-#define GPS_DELETE_POSITION 0x0004
-#define GPS_DELETE_TIME 0x0008
-#define GPS_DELETE_IONO 0x0010
-#define GPS_DELETE_UTC 0x0020
-#define GPS_DELETE_HEALTH 0x0040
-#define GPS_DELETE_SVDIR 0x0080
-#define GPS_DELETE_SVSTEER 0x0100
-#define GPS_DELETE_SADATA 0x0200
-#define GPS_DELETE_RTI 0x0400
-#define GPS_DELETE_CELLDB_INFO 0x8000
-#define GPS_DELETE_ALL 0xFFFF
-
-/** AGPS type */
-typedef uint16_t AGpsType;
-#define AGPS_TYPE_SUPL 1
-#define AGPS_TYPE_C2K 2
-
-typedef uint16_t AGpsSetIDType;
-#define AGPS_SETID_TYPE_NONE 0
-#define AGPS_SETID_TYPE_IMSI 1
-#define AGPS_SETID_TYPE_MSISDN 2
-
-/**
- * String length constants
- */
-#define GPS_NI_SHORT_STRING_MAXLEN 256
-#define GPS_NI_LONG_STRING_MAXLEN 2048
-
-/**
- * GpsNiType constants
- */
-typedef uint32_t GpsNiType;
-#define GPS_NI_TYPE_VOICE 1
-#define GPS_NI_TYPE_UMTS_SUPL 2
-#define GPS_NI_TYPE_UMTS_CTRL_PLANE 3
-
-/**
- * GpsNiNotifyFlags constants
- */
-typedef uint32_t GpsNiNotifyFlags;
-/** NI requires notification */
-#define GPS_NI_NEED_NOTIFY 0x0001
-/** NI requires verification */
-#define GPS_NI_NEED_VERIFY 0x0002
-/** NI requires privacy override, no notification/minimal trace */
-#define GPS_NI_PRIVACY_OVERRIDE 0x0004
-
-/**
- * GPS NI responses, used to define the response in
- * NI structures
- */
-typedef int GpsUserResponseType;
-#define GPS_NI_RESPONSE_ACCEPT 1
-#define GPS_NI_RESPONSE_DENY 2
-#define GPS_NI_RESPONSE_NORESP 3
-
-/**
- * NI data encoding scheme
- */
-typedef int GpsNiEncodingType;
-#define GPS_ENC_NONE 0
-#define GPS_ENC_SUPL_GSM_DEFAULT 1
-#define GPS_ENC_SUPL_UTF8 2
-#define GPS_ENC_SUPL_UCS2 3
-#define GPS_ENC_UNKNOWN -1
-
-/** AGPS status event values. */
-typedef uint16_t AGpsStatusValue;
-/** GPS requests data connection for AGPS. */
-#define GPS_REQUEST_AGPS_DATA_CONN 1
-/** GPS releases the AGPS data connection. */
-#define GPS_RELEASE_AGPS_DATA_CONN 2
-/** AGPS data connection initiated */
-#define GPS_AGPS_DATA_CONNECTED 3
-/** AGPS data connection completed */
-#define GPS_AGPS_DATA_CONN_DONE 4
-/** AGPS data connection failed */
-#define GPS_AGPS_DATA_CONN_FAILED 5
-
-#define AGPS_REF_LOCATION_TYPE_GSM_CELLID 1
-#define AGPS_REF_LOCATION_TYPE_UMTS_CELLID 2
-#define AGPS_REG_LOCATION_TYPE_MAC 3
-
-/** Network types for update_network_state "type" parameter */
-#define AGPS_RIL_NETWORK_TYPE_MOBILE 0
-#define AGPS_RIL_NETWORK_TYPE_WIFI 1
-#define AGPS_RIL_NETWORK_TYPE_MOBILE_MMS 2
-#define AGPS_RIL_NETWORK_TYPE_MOBILE_SUPL 3
-#define AGPS_RIL_NETWORK_TTYPE_MOBILE_DUN 4
-#define AGPS_RIL_NETWORK_TTYPE_MOBILE_HIPRI 5
-#define AGPS_RIL_NETWORK_TTYPE_WIMAX 6
-
-/**
- * Name for the GPS XTRA interface.
- */
-#define GPS_XTRA_INTERFACE "gps-xtra"
-
-/**
- * Name for the GPS DEBUG interface.
- */
-#define GPS_DEBUG_INTERFACE "gps-debug"
-
-/**
- * Name for the AGPS interface.
- */
-#define AGPS_INTERFACE "agps"
-
-/**
- * Name for NI interface
- */
-#define GPS_NI_INTERFACE "gps-ni"
-
-/**
- * Name for the AGPS-RIL interface.
- */
-#define AGPS_RIL_INTERFACE "agps_ril"
-
-/** Represents a location. */
-typedef struct {
- /** set to sizeof(GpsLocation) */
- size_t size;
- /** Contains GpsLocationFlags bits. */
- uint16_t flags;
- /** Represents latitude in degrees. */
- double latitude;
- /** Represents longitude in degrees. */
- double longitude;
- /** Represents altitude in meters above the WGS 84 reference
- * ellipsoid. */
- double altitude;
- /** Represents speed in meters per second. */
- float speed;
- /** Represents heading in degrees. */
- float bearing;
- /** Represents expected accuracy in meters. */
- float accuracy;
- /** Timestamp for the location fix. */
- GpsUtcTime timestamp;
-} GpsLocation;
-
-/** Represents the status. */
-typedef struct {
- /** set to sizeof(GpsStatus) */
- size_t size;
- GpsStatusValue status;
-} GpsStatus;
-
-/** Represents SV information. */
-typedef struct {
- /** set to sizeof(GpsSvInfo) */
- size_t size;
- /** Pseudo-random number for the SV. */
- int prn;
- /** Signal to noise ratio. */
- float snr;
- /** Elevation of SV in degrees. */
- float elevation;
- /** Azimuth of SV in degrees. */
- float azimuth;
- /** Unknown field in Samsung I9100 libgps
- May be an indicator for constellation type
- (GPS, GLONASS, Galileo)?
- Used on GT-I9100, likely also present on GT-N7000,
- SGH-I717, SGH-I727 but this needs confirmation.
- */
- int unknown_samsung_field;
-} GpsSvInfo;
-
-/** Represents SV status. */
-typedef struct {
- /** set to sizeof(GpsSvStatus) */
- size_t size;
-
- /** Number of SVs currently visible. */
- int num_svs;
-
- /** Contains an array of SV information. */
- GpsSvInfo sv_list[GPS_MAX_SVS];
-
- /** Represents a bit mask indicating which SVs
- * have ephemeris data.
- */
- uint32_t ephemeris_mask;
-
- /** Represents a bit mask indicating which SVs
- * have almanac data.
- */
- uint32_t almanac_mask;
-
- /**
- * Represents a bit mask indicating which SVs
- * were used for computing the most recent position fix.
- */
- uint32_t used_in_fix_mask;
-} GpsSvStatus;
-
-/* 2G and 3G */
-/* In 3G lac is discarded */
-typedef struct {
- uint16_t type;
- uint16_t mcc;
- uint16_t mnc;
- uint16_t lac;
- uint32_t cid;
-} AGpsRefLocationCellID;
-
-typedef struct {
- uint8_t mac[6];
-} AGpsRefLocationMac;
-
-/** Represents ref locations */
-typedef struct {
- uint16_t type;
- union {
- AGpsRefLocationCellID cellID;
- AGpsRefLocationMac mac;
- } u;
-} AGpsRefLocation;
-
-/** Callback with location information.
- * Can only be called from a thread created by create_thread_cb.
- */
-typedef void (* gps_location_callback)(GpsLocation* location);
-
-/** Callback with status information.
- * Can only be called from a thread created by create_thread_cb.
- */
-typedef void (* gps_status_callback)(GpsStatus* status);
-
-/** Callback with SV status information.
- * Can only be called from a thread created by create_thread_cb.
- */
-typedef void (* gps_sv_status_callback)(GpsSvStatus* sv_info);
-
-/** Callback for reporting NMEA sentences.
- * Can only be called from a thread created by create_thread_cb.
- */
-typedef void (* gps_nmea_callback)(GpsUtcTime timestamp, const char* nmea, int length);
-
-/** Callback to inform framework of the GPS engine's capabilities.
- * Capability parameter is a bit field of GPS_CAPABILITY_* flags.
- */
-typedef void (* gps_set_capabilities)(uint32_t capabilities);
-
-/** Callback utility for acquiring the GPS wakelock.
- * This can be used to prevent the CPU from suspending while handling GPS events.
- */
-typedef void (* gps_acquire_wakelock)();
-
-/** Callback utility for releasing the GPS wakelock. */
-typedef void (* gps_release_wakelock)();
-
-/** Callback for requesting NTP time */
-typedef void (* gps_request_utc_time)();
-
-/** Callback for creating a thread that can call into the Java framework code.
- * This must be used to create any threads that report events up to the framework.
- */
-typedef pthread_t (* gps_create_thread)(const char* name, void (*start)(void *), void* arg);
-
-/** GPS callback structure. */
-typedef struct {
- /** set to sizeof(GpsCallbacks) */
- size_t size;
- gps_location_callback location_cb;
- gps_status_callback status_cb;
- gps_sv_status_callback sv_status_cb;
- gps_nmea_callback nmea_cb;
- gps_set_capabilities set_capabilities_cb;
- gps_acquire_wakelock acquire_wakelock_cb;
- gps_release_wakelock release_wakelock_cb;
- gps_create_thread create_thread_cb;
- gps_request_utc_time request_utc_time_cb;
-} GpsCallbacks;
-
-
-/** Represents the standard GPS interface. */
-typedef struct {
- /** set to sizeof(GpsInterface) */
- size_t size;
- /**
- * Opens the interface and provides the callback routines
- * to the implemenation of this interface.
- */
- int (*init)( GpsCallbacks* callbacks );
-
- /** Starts navigating. */
- int (*start)( void );
-
- /** Stops navigating. */
- int (*stop)( void );
-
- /** Closes the interface. */
- void (*cleanup)( void );
-
- /** Injects the current time. */
- int (*inject_time)(GpsUtcTime time, int64_t timeReference,
- int uncertainty);
-
- /** Injects current location from another location provider
- * (typically cell ID).
- * latitude and longitude are measured in degrees
- * expected accuracy is measured in meters
- */
- int (*inject_location)(double latitude, double longitude, float accuracy);
-
- /**
- * Specifies that the next call to start will not use the
- * information defined in the flags. GPS_DELETE_ALL is passed for
- * a cold start.
- */
- void (*delete_aiding_data)(GpsAidingData flags);
-
- /**
- * min_interval represents the time between fixes in milliseconds.
- * preferred_accuracy represents the requested fix accuracy in meters.
- * preferred_time represents the requested time to first fix in milliseconds.
- */
- int (*set_position_mode)(GpsPositionMode mode, GpsPositionRecurrence recurrence,
- uint32_t min_interval, uint32_t preferred_accuracy, uint32_t preferred_time);
-
- /** Get a pointer to extension information. */
- const void* (*get_extension)(const char* name);
-} GpsInterface;
-
-/** Callback to request the client to download XTRA data.
- * The client should download XTRA data and inject it by calling inject_xtra_data().
- * Can only be called from a thread created by create_thread_cb.
- */
-typedef void (* gps_xtra_download_request)();
-
-/** Callback structure for the XTRA interface. */
-typedef struct {
- gps_xtra_download_request download_request_cb;
- gps_create_thread create_thread_cb;
-} GpsXtraCallbacks;
-
-/** Extended interface for XTRA support. */
-typedef struct {
- /** set to sizeof(GpsXtraInterface) */
- size_t size;
- /**
- * Opens the XTRA interface and provides the callback routines
- * to the implemenation of this interface.
- */
- int (*init)( GpsXtraCallbacks* callbacks );
- /** Injects XTRA data into the GPS. */
- int (*inject_xtra_data)( char* data, int length );
-} GpsXtraInterface;
-
-/** Extended interface for DEBUG support. */
-typedef struct {
- /** set to sizeof(GpsDebugInterface) */
- size_t size;
-
- /**
- * This function should return any information that the native
- * implementation wishes to include in a bugreport.
- */
- size_t (*get_internal_state)(char* buffer, size_t bufferSize);
-} GpsDebugInterface;
-
-/** Represents the status of AGPS. */
-typedef struct {
- /** set to sizeof(AGpsStatus) */
- size_t size;
-
- AGpsType type;
- AGpsStatusValue status;
- uint32_t ipaddr;
-} AGpsStatus;
-
-/** Callback with AGPS status information.
- * Can only be called from a thread created by create_thread_cb.
- */
-typedef void (* agps_status_callback)(AGpsStatus* status);
-
-/** Callback structure for the AGPS interface. */
-typedef struct {
- agps_status_callback status_cb;
- gps_create_thread create_thread_cb;
-} AGpsCallbacks;
-
-
-/** Extended interface for AGPS support. */
-typedef struct {
- /** set to sizeof(AGpsInterface) */
- size_t size;
-
- /**
- * Opens the AGPS interface and provides the callback routines
- * to the implemenation of this interface.
- */
- void (*init)( AGpsCallbacks* callbacks );
- /**
- * Notifies that a data connection is available and sets
- * the name of the APN to be used for SUPL.
- */
- int (*data_conn_open)( const char* apn );
- /**
- * Notifies that the AGPS data connection has been closed.
- */
- int (*data_conn_closed)();
- /**
- * Notifies that a data connection is not available for AGPS.
- */
- int (*data_conn_failed)();
- /**
- * Sets the hostname and port for the AGPS server.
- */
- int (*set_server)( AGpsType type, const char* hostname, int port );
-} AGpsInterface;
-
-
-/** Represents an NI request */
-typedef struct {
- /** set to sizeof(GpsNiNotification) */
- size_t size;
-
- /**
- * An ID generated by HAL to associate NI notifications and UI
- * responses
- */
- int notification_id;
-
- /**
- * An NI type used to distinguish different categories of NI
- * events, such as GPS_NI_TYPE_VOICE, GPS_NI_TYPE_UMTS_SUPL, ...
- */
- GpsNiType ni_type;
-
- /**
- * Notification/verification options, combinations of GpsNiNotifyFlags constants
- */
- GpsNiNotifyFlags notify_flags;
-
- /**
- * Timeout period to wait for user response.
- * Set to 0 for no time out limit.
- */
- int timeout;
-
- /**
- * Default response when time out.
- */
- GpsUserResponseType default_response;
-
- /**
- * Requestor ID
- */
- char requestor_id[GPS_NI_SHORT_STRING_MAXLEN];
-
- /**
- * Notification message. It can also be used to store client_id in some cases
- */
- char text[GPS_NI_LONG_STRING_MAXLEN];
-
- /**
- * Client name decoding scheme
- */
- GpsNiEncodingType requestor_id_encoding;
-
- /**
- * Client name decoding scheme
- */
- GpsNiEncodingType text_encoding;
-
- /**
- * A pointer to extra data. Format:
- * key_1 = value_1
- * key_2 = value_2
- */
- char extras[GPS_NI_LONG_STRING_MAXLEN];
-
-} GpsNiNotification;
-
-/** Callback with NI notification.
- * Can only be called from a thread created by create_thread_cb.
- */
-typedef void (*gps_ni_notify_callback)(GpsNiNotification *notification);
-
-/** GPS NI callback structure. */
-typedef struct
-{
- /**
- * Sends the notification request from HAL to GPSLocationProvider.
- */
- gps_ni_notify_callback notify_cb;
- gps_create_thread create_thread_cb;
-} GpsNiCallbacks;
-
-/**
- * Extended interface for Network-initiated (NI) support.
- */
-typedef struct
-{
- /** set to sizeof(GpsNiInterface) */
- size_t size;
-
- /** Registers the callbacks for HAL to use. */
- void (*init) (GpsNiCallbacks *callbacks);
-
- /** Sends a response to HAL. */
- void (*respond) (int notif_id, GpsUserResponseType user_response);
-} GpsNiInterface;
-
-struct gps_device_t {
- struct hw_device_t common;
-
- /**
- * Set the provided lights to the provided values.
- *
- * Returns: 0 on succes, error code on failure.
- */
- const GpsInterface* (*get_gps_interface)(struct gps_device_t* dev);
-};
-
-#define AGPS_RIL_REQUEST_SETID_IMSI (1<<0L)
-#define AGPS_RIL_REQUEST_SETID_MSISDN (1<<1L)
-
-#define AGPS_RIL_REQUEST_REFLOC_CELLID (1<<0L)
-#define AGPS_RIL_REQUEST_REFLOC_MAC (1<<1L)
-
-typedef void (*agps_ril_request_set_id)(uint32_t flags);
-typedef void (*agps_ril_request_ref_loc)(uint32_t flags);
-
-typedef struct {
- agps_ril_request_set_id request_setid;
- agps_ril_request_ref_loc request_refloc;
- gps_create_thread create_thread_cb;
-} AGpsRilCallbacks;
-
-/** Extended interface for AGPS_RIL support. */
-typedef struct {
- /** set to sizeof(AGpsRilInterface) */
- size_t size;
- /**
- * Opens the AGPS interface and provides the callback routines
- * to the implemenation of this interface.
- */
- void (*init)( AGpsRilCallbacks* callbacks );
-
- /**
- * Sets the reference location.
- */
- void (*set_ref_location) (const AGpsRefLocation *agps_reflocation, size_t sz_struct);
- /**
- * Sets the set ID.
- */
- void (*set_set_id) (AGpsSetIDType type, const char* setid);
-
- /**
- * Send network initiated message.
- */
- void (*ni_message) (uint8_t *msg, size_t len);
-
- /**
- * Notify GPS of network status changes.
- * These parameters match values in the android.net.NetworkInfo class.
- */
- void (*update_network_state) (int connected, int type, int roaming, const char* extra_info);
-
- /**
- * Notify GPS of network status changes.
- * These parameters match values in the android.net.NetworkInfo class.
- */
- void (*update_network_availability) (int avaiable, const char* apn);
-} AGpsRilInterface;
-
-__END_DECLS
-
-#endif /* ANDROID_INCLUDE_HARDWARE_GPS_H */
-
diff --git a/p51xx-common.mk b/p51xx-common.mk
index c103ce2..ab2ddcd 100755
--- a/p51xx-common.mk
+++ b/p51xx-common.mk
@@ -14,6 +14,9 @@
# limitations under the License.
#
+# Include omap4 common makefile
+$(call inherit-product, device/samsung/omap4-common/common.mk)
+
DEVICE_PACKAGE_OVERLAYS += device/samsung/p5100/common-overlay
$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
@@ -29,11 +32,11 @@ PRODUCT_AAPT_PREF_CONFIG := mdpi
PRODUCT_LOCALES += mdpi
# Init files
-PRODUCT_COPY_FILES := \
- $(LOCAL_PATH)/init.espresso10.usb.rc:root/init.espresso10.usb.rc \
- $(LOCAL_PATH)/init.espresso10.rc:root/init.espresso10.rc \
- $(LOCAL_PATH)/ueventd.espresso10.rc:root/ueventd.espresso10.rc \
- $(LOCAL_PATH)/fstab.espresso10:root/fstab.espresso10
+PRODUCT_COPY_FILES += \
+ $(LOCAL_PATH)/rootdir/init.espresso10.usb.rc:root/init.espresso10.usb.rc \
+ $(LOCAL_PATH)/rootdir/init.espresso10.rc:root/init.espresso10.rc \
+ $(LOCAL_PATH)/rootdir/ueventd.espresso10.rc:root/ueventd.espresso10.rc \
+ $(LOCAL_PATH)/rootdir/fstab.espresso10:root/fstab.espresso10
# Vold
PRODUCT_COPY_FILES += \
@@ -64,47 +67,17 @@ PRODUCT_COPY_FILES += \
# Keylayout
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/usr/keychars/espresso-gpio-keypad.kcm:system/usr/keychars/espresso-gpio-keypad.kcm \
- $(LOCAL_PATH)/usr/keychars/Generic.kcm:system/usr/keychars/Generic.kcm \
- $(LOCAL_PATH)/usr/keychars/qwerty.kcm:system/usr/keychars/qwerty.kcm \
- $(LOCAL_PATH)/usr/keychars/qwerty2.kcm:system/usr/keychars/qwerty2.kcm \
- $(LOCAL_PATH)/usr/keychars/Virtual.kcm:system/usr/keychars/Virtual.kcm \
- $(LOCAL_PATH)/usr/keylayout/AVRCP.kl:system/usr/keylayout/AVRCP.kl \
$(LOCAL_PATH)/usr/keylayout/espresso-gpio-keypad.kl:system/usr/keylayout/espresso-gpio-keypad.kl \
- $(LOCAL_PATH)/usr/keylayout/Generic.kl:system/usr/keylayout/Generic.kl \
- $(LOCAL_PATH)/usr/keylayout/qwerty.kl:system/usr/keylayout/qwerty.kl \
- $(LOCAL_PATH)/usr/keylayout/sec_keyboard.kl:system/usr/keylayout/sec_keyboard.kl \
- $(LOCAL_PATH)/usr/keylayout/Vendor_04e8_Product_7021.kl:system/usr/keylayout/Vendor_04e8_Product_7021.kl \
- $(LOCAL_PATH)/usr/keylayout/Vendor_05ac_Product_0239.kl:system/usr/keylayout/Vendor_05ac_Product_0239.kl \
- $(LOCAL_PATH)/usr/keylayout/Vendor_22b8_Product_093d.kl:system/usr/keylayout/Vendor_22b8_Product_093d.kl \
- $(LOCAL_PATH)/usr/keylayout/Vendor_045e_Product_028e.kl:system/usr/keylayout/Vendor_045e_Product_028e.kl \
- $(LOCAL_PATH)/usr/keylayout/Vendor_046d_Product_c216.kl:system/usr/keylayout/Vendor_046d_Product_c216.kl \
- $(LOCAL_PATH)/usr/keylayout/Vendor_046d_Product_c294.kl:system/usr/keylayout/Vendor_046d_Product_c294.kl \
- $(LOCAL_PATH)/usr/keylayout/Vendor_046d_Product_c299.kl:system/usr/keylayout/Vendor_046d_Product_c299.kl \
- $(LOCAL_PATH)/usr/keylayout/Vendor_046d_Product_c532.kl:system/usr/keylayout/Vendor_046d_Product_c532.kl \
- $(LOCAL_PATH)/usr/keylayout/Vendor_054c_Product_0268.kl:system/usr/keylayout/Vendor_054c_Product_0268.kl
+ $(LOCAL_PATH)/usr/keylayout/sec_keyboard.kl:system/usr/keylayout/sec_keyboard.kl
# Packages
PRODUCT_PACKAGES += \
- audio.a2dp.default \
audio.primary.piranha \
- audio.usb.default \
camera.piranha \
- hwcomposer.omap4 \
+ hwcomposer.piranha \
lights.piranha \
- libtinyalsa \
- libaudioutils \
libinvensense_mpl \
- libnetcmdiface \
- power.piranha \
- smc_pa_ctrl \
- tf_daemon \
- tinymix
-
-# Filesystem management tools
-PRODUCT_PACKAGES += \
- static_busybox \
- make_ext4fs \
- setup_fs
+ power.piranha
# Charger
PRODUCT_PACKAGES += \
@@ -145,13 +118,8 @@ PRODUCT_COPY_FILES += \
PRODUCT_PROPERTY_OVERRIDES += \
ro.opengles.version=131072
-# Set default USB interface
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
- persist.sys.usb.config=mtp
-
PRODUCT_TAGS += dalvik.gc.type-precise
$(call inherit-product, frameworks/native/build/tablet-dalvik-heap.mk)
-$(call inherit-product, hardware/ti/omap4xxx/omap4.mk)
$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4330/device-bcm.mk)
$(call inherit-product-if-exists, vendor/samsung/p51xx/p51xx-vendor.mk)
diff --git a/power/Android.mk b/power/Android.mk
deleted file mode 100644
index b7ad50f..0000000
--- a/power/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (C) 2012 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.
-
-
-LOCAL_PATH := $(call my-dir)
-
-# HAL module implemenation stored in
-# hw/<POWERS_HARDWARE_MODULE_ID>.<ro.hardware>.so
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
-LOCAL_SHARED_LIBRARIES := liblog libcutils
-LOCAL_SRC_FILES := power_piranha.c
-LOCAL_MODULE := power.piranha
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_SHARED_LIBRARY)
diff --git a/power/power_piranha.c b/power/power_piranha.c
deleted file mode 100644
index 1734c15..0000000
--- a/power/power_piranha.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (C) 2012 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 <errno.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#define LOG_TAG "Piranha PowerHAL"
-#include <utils/Log.h>
-
-#include <hardware/hardware.h>
-#include <hardware/power.h>
-
-#define BOOSTPULSE_PATH "/sys/devices/system/cpu/cpufreq/interactive/boostpulse"
-
-struct piranha_power_module {
- struct power_module base;
- pthread_mutex_t lock;
- int boostpulse_fd;
- int boostpulse_warned;
-};
-
-static void sysfs_write(char *path, char *s)
-{
- char buf[80];
- int len;
- int fd = open(path, O_WRONLY);
-
- if (fd < 0) {
- strerror_r(errno, buf, sizeof(buf));
- ALOGE("Error opening %s: %s\n", path, buf);
- return;
- }
-
- len = write(fd, s, strlen(s));
- if (len < 0) {
- strerror_r(errno, buf, sizeof(buf));
- ALOGE("Error writing to %s: %s\n", path, buf);
- }
-
- close(fd);
-}
-
-static void piranha_power_init(struct power_module *module)
-{
- /*
- * cpufreq interactive governor: timer 20ms, min sample 60ms,
- * hispeed 700MHz at load 50%.
- */
-
- sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/timer_rate",
- "20000");
- sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/min_sample_time",
- "60000");
- sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/hispeed_freq",
- "700000");
- sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/go_hispeed_load",
- "50");
- sysfs_write("/sys/devices/system/cpu/cpufreq/interactive/above_hispeed_delay",
- "100000");
-}
-
-static int boostpulse_open(struct piranha_power_module *piranha)
-{
- char buf[80];
-
- pthread_mutex_lock(&piranha->lock);
-
- if (piranha->boostpulse_fd < 0) {
- piranha->boostpulse_fd = open(BOOSTPULSE_PATH, O_WRONLY);
-
- if (piranha->boostpulse_fd < 0) {
- if (!piranha->boostpulse_warned) {
- strerror_r(errno, buf, sizeof(buf));
- ALOGE("Error opening %s: %s\n", BOOSTPULSE_PATH, buf);
- piranha->boostpulse_warned = 1;
- }
- }
- }
-
- pthread_mutex_unlock(&piranha->lock);
- return piranha->boostpulse_fd;
-}
-
-static void piranha_power_set_interactive(struct power_module *module, int on)
-{
- /*
- * Lower maximum frequency when screen is off. CPU 0 and 1 share a
- * cpufreq policy.
- */
-
- sysfs_write("/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq",
- on ? "1008000" : "600000");
-}
-
-static void piranha_power_hint(struct power_module *module, power_hint_t hint,
- void *data)
-{
- struct piranha_power_module *piranha = (struct piranha_power_module *) module;
- char buf[80];
- int len;
-
- switch (hint) {
- case POWER_HINT_INTERACTION:
- if (boostpulse_open(piranha) >= 0) {
- len = write(piranha->boostpulse_fd, "1", 1);
-
- if (len < 0) {
- strerror_r(errno, buf, sizeof(buf));
- ALOGE("Error writing to %s: %s\n", BOOSTPULSE_PATH, buf);
- }
- }
- break;
-
- case POWER_HINT_VSYNC:
- break;
-
- default:
- break;
- }
-}
-
-static struct hw_module_methods_t power_module_methods = {
- .open = NULL,
-};
-
-struct piranha_power_module HAL_MODULE_INFO_SYM = {
- base: {
- common: {
- tag: HARDWARE_MODULE_TAG,
- module_api_version: POWER_MODULE_API_VERSION_0_2,
- hal_api_version: HARDWARE_HAL_API_VERSION,
- id: POWER_HARDWARE_MODULE_ID,
- name: "Piranha Power HAL",
- author: "The Android Open Source Project",
- methods: &power_module_methods,
- },
-
- init: piranha_power_init,
- setInteractive: piranha_power_set_interactive,
- powerHint: piranha_power_hint,
- },
-
- lock: PTHREAD_MUTEX_INITIALIZER,
- boostpulse_fd: -1,
- boostpulse_warned: 0,
-};
diff --git a/proprietary-common-files.txt b/proprietary-common-files.txt
index 215c36c..4fe4f21 100644
--- a/proprietary-common-files.txt
+++ b/proprietary-common-files.txt
@@ -21,23 +21,13 @@ system/lib/libOMX.TI.DUCATI1.VIDEO.MPEG4E.so
system/lib/libOMX_Core.so
system/lib/libQmageDecoder.so
system/lib/libdomx.so
-system/lib/libion.so
+system/lib/libion.omap4.so
system/lib/libmm_osal.so
system/lib/libsecnativefeature.so
system/lib/libtiutils.so
-system/vendor/bin/pvrsrvctl
system/vendor/firmware/BCM4330.hcd
system/vendor/firmware/ducati-m3.bin
-system/vendor/lib/egl/libEGL_POWERVR_SGX540_120.so
-system/vendor/lib/egl/libGLESv1_CM_POWERVR_SGX540_120.so
-system/vendor/lib/egl/libGLESv2_POWERVR_SGX540_120.so
-system/vendor/lib/hw/gralloc.omap4.so
-system/vendor/lib/libIMGegl.so
-system/vendor/lib/libPVRScopeServices.so
-system/vendor/lib/libglslcompiler.so
-system/vendor/lib/libpvr2d.so
-system/vendor/lib/libpvrANDROID_WSEGL.so
-system/vendor/lib/libsrv_init.so
-system/vendor/lib/libsrv_um.so
-system/vendor/lib/libusc.so
-
+system/vendor/lib/drm/libdrmwvmplugin.so
+system/vendor/lib/libWVStreamControlAPI_L1.so
+system/vendor/lib/libwvdrm_L1.so
+system/vendor/lib/libwvm.so
diff --git a/proprietary-p5100-files.txt b/proprietary-p5100-files.txt
index 4bea0e8..0516e5f 100644
--- a/proprietary-p5100-files.txt
+++ b/proprietary-p5100-files.txt
@@ -1,3 +1,4 @@
+sbin/cbd
system/lib/libril.so
system/lib/libsec-ril.so
system/lib/libsecril-client.so
diff --git a/fstab.espresso10 b/rootdir/fstab.espresso10
index a9e60d6..a9e60d6 100644
--- a/fstab.espresso10
+++ b/rootdir/fstab.espresso10
diff --git a/init.espresso10.rc b/rootdir/init.espresso10.rc
index 87877e8..a42289a 100755
--- a/init.espresso10.rc
+++ b/rootdir/init.espresso10.rc
@@ -40,7 +40,7 @@ loglevel 7
on fs
mkdir /efs
- mount_all fstab.espresso10
+ mount_all /fstab.espresso10
chown radio system /efs
chmod 0775 /efs
@@ -49,6 +49,9 @@ on fs
mount debugfs /sys/kernel/debug /sys/kernel/debug
+# pvr module
+ insmod /system/lib/modules/pvrsrvkm_sgx540_120.ko
+
on post-fs-data
# we will remap this as /storage/sdcard0 with the sdcard fuse tool
mkdir /data/media 0770 media_rw media_rw
@@ -56,6 +59,13 @@ on post-fs-data
mkdir /data/misc/wifi 0770 wifi system
mkdir /data/misc/wifi/sockets 0770 wifi wifi
+# dmrpc
+ mkdir /data/smc 0770 drmrpc drmrpc
+ chown drmrpc drmrpc /data/smc/counter.bin
+ chown drmrpc drmrpc /data/smc/storage.bin
+ chown drmrpc drmrpc /data/smc/system.bin
+
+# radio
mkdir /data/misc/dhcp 0775 dhcp dhcp
mkdir /data/misc/radio 0771 radio system
mkdir /data/misc/radio/hatp 0771 radio system
@@ -63,10 +73,6 @@ on post-fs-data
chown dhcp dhcp /data/misc/dhcp
-# MTP Device permission.
- chmod 0660 /dev/usb_mtp_gadget
- chown system system /dev/usb_mtp_gadget
-
write /sys/devices/system/cpu/cpu0/cpufreq/screen_off_max_freq 800000
chmod 0664 /sys/devices/system/cpu/cpu0/cpufreq/screen_off_max_freq
@@ -248,7 +254,14 @@ on post-fs-data
on boot
-service pvrsrvctl /vendor/bin/pvrsrvctl --start --no-module
+# initialize the SGX driver
+service pvrsrvinit /system/vendor/bin/pvrsrvinit
+ class core
+ user root
+ group root
+ oneshot
+
+service pvrsrvctl /system/vendor/bin/pvrsrvctl_SGX540_120 --start --no-module
class core
user root
group root
@@ -285,18 +298,21 @@ service sdcard /system/bin/sdcard /data/media /mnt/shell/emulated 1023 1023
class late_start
service p2p_supplicant /system/bin/wpa_supplicant \
- -Dnl80211 -iwlan0 -puse_p2p_group_interface=1 -c/data/misc/wifi/wpa_supplicant.conf -e/data/misc/wifi/entropy.bin
- # we will start as root and wpa_supplicant will switch to user wifi
- # after setting up the capabilities required for WEXT
- # user wifi
- # group wifi inet keystore
+ -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf -N \
+ -ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf -e/data/misc/wifi/entropy.bin \
+ -puse_p2p_group_interface=1
+ # we will start as root and wpa_supplicant will switch to user wifi
+ # after setting up the capabilities required for WEXT
+ # user wifi
+ # group wifi inet keystore
class main
socket wpa_wlan0 dgram 660 wifi wifi
disabled
oneshot
service wpa_supplicant /system/bin/wpa_supplicant \
- -Dnl80211 -iwlan0 -puse_p2p_group_interface=1 -c/data/misc/wifi/wpa_supplicant.conf -e/data/misc/wifi/entropy.bin
+ -Dnl80211 -iwlan0 -e/data/misc/wifi/entropy.bin \
+ -c/data/misc/wifi/wpa_supplicant.conf
# we will start as root and wpa_supplicant will switch to user wifi
# after setting up the capabilities required for WEXT
# user wifi
@@ -336,6 +352,15 @@ service iprenew_bnep0 /system/bin/dhcpcd -n
disabled
oneshot
+service cpboot-daemon /sbin/cbd -d -p 8
+ class main
+ user root
+ group radio cache inet misc audio sdcard_rw log sdcard_r
+ disabled
+
+on property:init.svc.pvrsrvinit=stopped
+ start cpboot-daemon
+
# GPS
service gpsd /system/bin/gpsd -c /system/etc/gps.xml
class main
diff --git a/init.espresso10.usb.rc b/rootdir/init.espresso10.usb.rc
index e86a7bd..e86a7bd 100755
--- a/init.espresso10.usb.rc
+++ b/rootdir/init.espresso10.usb.rc
diff --git a/recovery.rc b/rootdir/recovery.rc
index b237846..b237846 100644
--- a/recovery.rc
+++ b/rootdir/recovery.rc
diff --git a/ueventd.espresso10.rc b/rootdir/ueventd.espresso10.rc
index 6804dbd..f67f204 100644
--- a/ueventd.espresso10.rc
+++ b/rootdir/ueventd.espresso10.rc
@@ -15,7 +15,7 @@
/dev/accelirq 0660 system system
/dev/compassirq 0660 system system
/dev/timerirq 0660 system system
-/dev/i2c-4 0660 system system
+/dev/i2c-4 0660 system system
#for HSPA RIL
/dev/umts_boot0 0660 radio radio
@@ -27,9 +27,32 @@
/dev/umts_router 0660 radio system
/dev/umts_csd 0660 radio system
-#hdcp
+# hdcp
/dev/hdcp 0664 root root
# used by RIL and GPS
/dev/ttyO0 0660 system radio
/dev/ttyGS0 0660 system system
+
+# for LTE RIL
+/dev/cdma_boot0 0660 radio radio
+/dev/lte_boot0 0660 radio radio
+/dev/cdma_ipc0 0660 radio radio
+/dev/lte_ipc0 0660 radio radio
+/dev/cdma_rfs0 0660 radio radio
+/dev/lte_rfs0 0660 radio radio
+/dev/lte_spi 0660 radio radio
+/dev/cdma_rmnet5 0660 radio radio
+/dev/cdma_rmnet6 0660 radio radio
+/dev/lte_rmnet4 0660 radio radio
+/dev/ttyGS1 0660 radio radio
+/dev/block/mmcblk0p4 0660 radio radio
+/dev/modem_br 0660 radio radio
+/dev/cdma_ramdump0 0660 radio radio
+/dev/lte_ramdump0 0660 radio radio
+
+# For SGX
+/dev/pvrsrvkm 0666 system system
+
+# For GCX
+/dev/gcioctl 0666 system system
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index ea594bc..00a2453 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -71,6 +71,9 @@ done
# This file is generated by device/$VENDOR/$DEVICE/setup-makefiles.sh
PRODUCT_COPY_FILES += \\
+ \$(LOCAL_PATH)/proprietary/sbin/cbd:root/sbin/cbd
+
+PRODUCT_COPY_FILES += \\
EOF
LINEEND=" \\"
diff --git a/usr/keychars/Generic.kcm b/usr/keychars/Generic.kcm
deleted file mode 100644
index b5f6897..0000000
--- a/usr/keychars/Generic.kcm
+++ /dev/null
@@ -1,672 +0,0 @@
-# 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.
-
-#
-# Generic key character map for full alphabetic US English PC style external keyboards.
-#
-# This file is intentionally very generic and is intended to support a broad rang of keyboards.
-# Do not edit the generic key character map to support a specific keyboard; instead, create
-# a new key character map file with the required keyboard configuration.
-#
-
-type FULL
-
-### Basic QWERTY keys ###
-
-key A {
- label: 'A'
- base: 'a'
- shift, capslock: 'A'
- ctrl, alt, meta: none
-}
-
-key B {
- label: 'B'
- base: 'b'
- shift, capslock: 'B'
- ctrl, alt, meta: none
-}
-
-key C {
- label: 'C'
- base: 'c'
- shift, capslock: 'C'
- alt: '\u00e7'
- shift+alt: '\u00c7'
- ctrl, meta: none
-}
-
-key D {
- label: 'D'
- base: 'd'
- shift, capslock: 'D'
- ctrl, alt, meta: none
-}
-
-key E {
- label: 'E'
- base: 'e'
- shift, capslock: 'E'
- alt: '\u0301'
- ctrl, meta: none
-}
-
-key F {
- label: 'F'
- base: 'f'
- shift, capslock: 'F'
- ctrl, alt, meta: none
-}
-
-key G {
- label: 'G'
- base: 'g'
- shift, capslock: 'G'
- ctrl, alt, meta: none
-}
-
-key H {
- label: 'H'
- base: 'h'
- shift, capslock: 'H'
- ctrl, alt, meta: none
-}
-
-key I {
- label: 'I'
- base: 'i'
- shift, capslock: 'I'
- alt: '\u0302'
- ctrl, meta: none
-}
-
-key J {
- label: 'J'
- base: 'j'
- shift, capslock: 'J'
- ctrl, alt, meta: none
-}
-
-key K {
- label: 'K'
- base: 'k'
- shift, capslock: 'K'
- ctrl, alt, meta: none
-}
-
-key L {
- label: 'L'
- base: 'l'
- shift, capslock: 'L'
- ctrl, alt, meta: none
-}
-
-key M {
- label: 'M'
- base: 'm'
- shift, capslock: 'M'
- ctrl, alt, meta: none
-}
-
-key N {
- label: 'N'
- base: 'n'
- shift, capslock: 'N'
- alt: '\u0303'
- ctrl, meta: none
-}
-
-key O {
- label: 'O'
- base: 'o'
- shift, capslock: 'O'
- ctrl, alt, meta: none
-}
-
-key P {
- label: 'P'
- base: 'p'
- shift, capslock: 'P'
- ctrl, alt, meta: none
-}
-
-key Q {
- label: 'Q'
- base: 'q'
- shift, capslock: 'Q'
- ctrl, alt, meta: none
-}
-
-key R {
- label: 'R'
- base: 'r'
- shift, capslock: 'R'
- ctrl, alt, meta: none
-}
-
-key S {
- label: 'S'
- base: 's'
- shift, capslock: 'S'
- alt: '\u00df'
- ctrl, meta: none
-}
-
-key T {
- label: 'T'
- base: 't'
- shift, capslock: 'T'
- ctrl, alt, meta: none
-}
-
-key U {
- label: 'U'
- base: 'u'
- shift, capslock: 'U'
- alt: '\u0308'
- ctrl, meta: none
-}
-
-key V {
- label: 'V'
- base: 'v'
- shift, capslock: 'V'
- ctrl, alt, meta: none
-}
-
-key W {
- label: 'W'
- base: 'w'
- shift, capslock: 'W'
- ctrl, alt, meta: none
-}
-
-key X {
- label: 'X'
- base: 'x'
- shift, capslock: 'X'
- ctrl, alt, meta: none
-}
-
-key Y {
- label: 'Y'
- base: 'y'
- shift, capslock: 'Y'
- ctrl, alt, meta: none
-}
-
-key Z {
- label: 'Z'
- base: 'z'
- shift, capslock: 'Z'
- ctrl, alt, meta: none
-}
-
-key 0 {
- label, number: '0'
- base: '0'
- shift: ')'
- ctrl, alt, meta: none
-}
-
-key 1 {
- label, number: '1'
- base: '1'
- shift: '!'
- ctrl, alt, meta: none
-}
-
-key 2 {
- label, number: '2'
- base: '2'
- shift: '@'
- ctrl, alt, meta: none
-}
-
-key 3 {
- label, number: '3'
- base: '3'
- shift: '#'
- ctrl, alt, meta: none
-}
-
-key 4 {
- label, number: '4'
- base: '4'
- shift: '$'
- ctrl, alt, meta: none
-}
-
-key 5 {
- label, number: '5'
- base: '5'
- shift: '%'
- ctrl, alt, meta: none
-}
-
-key 6 {
- label, number: '6'
- base: '6'
- shift: '^'
- ctrl, alt, meta: none
- alt+shift: '\u0302'
-}
-
-key 7 {
- label, number: '7'
- base: '7'
- shift: '&'
- ctrl, alt, meta: none
-}
-
-key 8 {
- label, number: '8'
- base: '8'
- shift: '*'
- ctrl, alt, meta: none
-}
-
-key 9 {
- label, number: '9'
- base: '9'
- shift: '('
- ctrl, alt, meta: none
-}
-
-key SPACE {
- label: ' '
- base: ' '
- ctrl: none
- alt, meta: fallback SEARCH
-}
-
-key ENTER {
- label: '\n'
- base: '\n'
- ctrl, alt, meta: none
-}
-
-key TAB {
- label: '\t'
- base: '\t'
- ctrl, alt, meta: none
-}
-
-key COMMA {
- label, number: ','
- base: ','
- shift: '<'
- ctrl, alt, meta: none
-}
-
-key PERIOD {
- label, number: '.'
- base: '.'
- shift: '>'
- ctrl, alt, meta: none
-}
-
-key SLASH {
- label, number: '/'
- base: '/'
- shift: '?'
- ctrl, alt, meta: none
-}
-
-key GRAVE {
- label, number: '`'
- base: '`'
- shift: '~'
- alt: '\u0300'
- alt+shift: '\u0303'
- ctrl, meta: none
-}
-
-key MINUS {
- label, number: '-'
- base: '-'
- shift: '_'
- ctrl, alt, meta: none
-}
-
-key EQUALS {
- label, number: '='
- base: '='
- shift: '+'
- ctrl, alt, meta: none
-}
-
-key LEFT_BRACKET {
- label, number: '['
- base: '['
- shift: '{'
- ctrl, alt, meta: none
-}
-
-key RIGHT_BRACKET {
- label, number: ']'
- base: ']'
- shift: '}'
- ctrl, alt, meta: none
-}
-
-key BACKSLASH {
- label, number: '\\'
- base: '\\'
- shift: '|'
- ctrl, alt, meta: none
-}
-
-key SEMICOLON {
- label, number: ';'
- base: ';'
- shift: ':'
- ctrl, alt, meta: none
-}
-
-key APOSTROPHE {
- label, number: '\''
- base: '\''
- shift: '"'
- ctrl, alt, meta: none
-}
-
-### Numeric keypad ###
-
-key NUMPAD_0 {
- label, number: '0'
- base: fallback INSERT
- numlock: '0'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_1 {
- label, number: '1'
- base: fallback MOVE_END
- numlock: '1'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_2 {
- label, number: '2'
- base: fallback DPAD_DOWN
- numlock: '2'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_3 {
- label, number: '3'
- base: fallback PAGE_DOWN
- numlock: '3'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_4 {
- label, number: '4'
- base: fallback DPAD_LEFT
- numlock: '4'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_5 {
- label, number: '5'
- base: fallback DPAD_CENTER
- numlock: '5'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_6 {
- label, number: '6'
- base: fallback DPAD_RIGHT
- numlock: '6'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_7 {
- label, number: '7'
- base: fallback MOVE_HOME
- numlock: '7'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_8 {
- label, number: '8'
- base: fallback DPAD_UP
- numlock: '8'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_9 {
- label, number: '9'
- base: fallback PAGE_UP
- numlock: '9'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_LEFT_PAREN {
- label, number: '('
- base: '('
- ctrl, alt, meta: none
-}
-
-key NUMPAD_RIGHT_PAREN {
- label, number: ')'
- base: ')'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_DIVIDE {
- label, number: '/'
- base: '/'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_MULTIPLY {
- label, number: '*'
- base: '*'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_SUBTRACT {
- label, number: '-'
- base: '-'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_ADD {
- label, number: '+'
- base: '+'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_DOT {
- label, number: '.'
- base: fallback FORWARD_DEL
- numlock: '.'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_COMMA {
- label, number: ','
- base: ','
- ctrl, alt, meta: none
-}
-
-key NUMPAD_EQUALS {
- label, number: '='
- base: '='
- ctrl, alt, meta: none
-}
-
-key NUMPAD_ENTER {
- label: '\n'
- base: '\n' fallback ENTER
- ctrl, alt, meta: none fallback ENTER
-}
-
-### Special keys on phones ###
-
-key AT {
- label, number: '@'
- base: '@'
-}
-
-key STAR {
- label, number: '*'
- base: '*'
-}
-
-key POUND {
- label, number: '#'
- base: '#'
-}
-
-key PLUS {
- label, number: '+'
- base: '+'
-}
-
-### Non-printing keys ###
-
-key ESCAPE {
- base: fallback BACK
- alt, meta: fallback HOME
- ctrl: fallback MENU
-}
-
-### Gamepad buttons ###
-
-key BUTTON_A {
- base: fallback BACK
-}
-
-key BUTTON_B {
- base: fallback BACK
-}
-
-key BUTTON_C {
- base: fallback BACK
-}
-
-key BUTTON_X {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_Y {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_Z {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_L1 {
- base: none
-}
-
-key BUTTON_R1 {
- base: none
-}
-
-key BUTTON_L2 {
- base: none
-}
-
-key BUTTON_R2 {
- base: none
-}
-
-key BUTTON_THUMBL {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_THUMBR {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_START {
- base: fallback HOME
-}
-
-key BUTTON_SELECT {
- base: fallback MENU
-}
-
-key BUTTON_MODE {
- base: fallback MENU
-}
-
-key BUTTON_1 {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_2 {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_3 {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_4 {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_5 {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_6 {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_7 {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_8 {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_9 {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_10 {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_11 {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_12 {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_13 {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_14 {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_15 {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_16 {
- base: fallback DPAD_CENTER
-}
diff --git a/usr/keychars/Virtual.kcm b/usr/keychars/Virtual.kcm
deleted file mode 100644
index 0ce4a68..0000000
--- a/usr/keychars/Virtual.kcm
+++ /dev/null
@@ -1,544 +0,0 @@
-# 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.
-
-#
-# Key character map for a built-in generic virtual keyboard primarily used
-# for instrumentation and testing purposes.
-#
-
-type FULL
-
-### Basic QWERTY keys ###
-
-key A {
- label: 'A'
- base: 'a'
- shift, capslock: 'A'
- ctrl, alt, meta: none
-}
-
-key B {
- label: 'B'
- base: 'b'
- shift, capslock: 'B'
- ctrl, alt, meta: none
-}
-
-key C {
- label: 'C'
- base: 'c'
- shift, capslock: 'C'
- alt: '\u00e7'
- shift+alt: '\u00c7'
- ctrl, meta: none
-}
-
-key D {
- label: 'D'
- base: 'd'
- shift, capslock: 'D'
- ctrl, alt, meta: none
-}
-
-key E {
- label: 'E'
- base: 'e'
- shift, capslock: 'E'
- alt: '\u0301'
- ctrl, meta: none
-}
-
-key F {
- label: 'F'
- base: 'f'
- shift, capslock: 'F'
- ctrl, alt, meta: none
-}
-
-key G {
- label: 'G'
- base: 'g'
- shift, capslock: 'G'
- ctrl, alt, meta: none
-}
-
-key H {
- label: 'H'
- base: 'h'
- shift, capslock: 'H'
- ctrl, alt, meta: none
-}
-
-key I {
- label: 'I'
- base: 'i'
- shift, capslock: 'I'
- alt: '\u0302'
- ctrl, meta: none
-}
-
-key J {
- label: 'J'
- base: 'j'
- shift, capslock: 'J'
- ctrl, alt, meta: none
-}
-
-key K {
- label: 'K'
- base: 'k'
- shift, capslock: 'K'
- ctrl, alt, meta: none
-}
-
-key L {
- label: 'L'
- base: 'l'
- shift, capslock: 'L'
- ctrl, alt, meta: none
-}
-
-key M {
- label: 'M'
- base: 'm'
- shift, capslock: 'M'
- ctrl, alt, meta: none
-}
-
-key N {
- label: 'N'
- base: 'n'
- shift, capslock: 'N'
- alt: '\u0303'
- ctrl, meta: none
-}
-
-key O {
- label: 'O'
- base: 'o'
- shift, capslock: 'O'
- ctrl, alt, meta: none
-}
-
-key P {
- label: 'P'
- base: 'p'
- shift, capslock: 'P'
- ctrl, alt, meta: none
-}
-
-key Q {
- label: 'Q'
- base: 'q'
- shift, capslock: 'Q'
- ctrl, alt, meta: none
-}
-
-key R {
- label: 'R'
- base: 'r'
- shift, capslock: 'R'
- ctrl, alt, meta: none
-}
-
-key S {
- label: 'S'
- base: 's'
- shift, capslock: 'S'
- alt: '\u00df'
- ctrl, meta: none
-}
-
-key T {
- label: 'T'
- base: 't'
- shift, capslock: 'T'
- ctrl, alt, meta: none
-}
-
-key U {
- label: 'U'
- base: 'u'
- shift, capslock: 'U'
- alt: '\u0308'
- ctrl, meta: none
-}
-
-key V {
- label: 'V'
- base: 'v'
- shift, capslock: 'V'
- ctrl, alt, meta: none
-}
-
-key W {
- label: 'W'
- base: 'w'
- shift, capslock: 'W'
- ctrl, alt, meta: none
-}
-
-key X {
- label: 'X'
- base: 'x'
- shift, capslock: 'X'
- ctrl, alt, meta: none
-}
-
-key Y {
- label: 'Y'
- base: 'y'
- shift, capslock: 'Y'
- ctrl, alt, meta: none
-}
-
-key Z {
- label: 'Z'
- base: 'z'
- shift, capslock: 'Z'
- ctrl, alt, meta: none
-}
-
-key 0 {
- label, number: '0'
- base: '0'
- shift: ')'
- ctrl, alt, meta: none
-}
-
-key 1 {
- label, number: '1'
- base: '1'
- shift: '!'
- ctrl, alt, meta: none
-}
-
-key 2 {
- label, number: '2'
- base: '2'
- shift: '@'
- ctrl, alt, meta: none
-}
-
-key 3 {
- label, number: '3'
- base: '3'
- shift: '#'
- ctrl, alt, meta: none
-}
-
-key 4 {
- label, number: '4'
- base: '4'
- shift: '$'
- ctrl, alt, meta: none
-}
-
-key 5 {
- label, number: '5'
- base: '5'
- shift: '%'
- ctrl, alt, meta: none
-}
-
-key 6 {
- label, number: '6'
- base: '6'
- shift: '^'
- ctrl, alt, meta: none
- alt+shift: '\u0302'
-}
-
-key 7 {
- label, number: '7'
- base: '7'
- shift: '&'
- ctrl, alt, meta: none
-}
-
-key 8 {
- label, number: '8'
- base: '8'
- shift: '*'
- ctrl, alt, meta: none
-}
-
-key 9 {
- label, number: '9'
- base: '9'
- shift: '('
- ctrl, alt, meta: none
-}
-
-key SPACE {
- label: ' '
- base: ' '
- ctrl, alt: none
- meta: fallback SEARCH
-}
-
-key ENTER {
- label: '\n'
- base: '\n'
- ctrl, alt, meta: none
-}
-
-key TAB {
- label: '\t'
- base: '\t'
- ctrl, alt: none
- meta: fallback APP_SWITCH
-}
-
-key COMMA {
- label, number: ','
- base: ','
- shift: '<'
- ctrl, alt, meta: none
-}
-
-key PERIOD {
- label, number: '.'
- base: '.'
- shift: '>'
- ctrl, alt, meta: none
-}
-
-key SLASH {
- label, number: '/'
- base: '/'
- shift: '?'
- ctrl, alt, meta: none
-}
-
-key GRAVE {
- label, number: '`'
- base: '`'
- shift: '~'
- alt: '\u0300'
- alt+shift: '\u0303'
- ctrl, meta: none
-}
-
-key MINUS {
- label, number: '-'
- base: '-'
- shift: '_'
- ctrl, alt, meta: none
-}
-
-key EQUALS {
- label, number: '='
- base: '='
- shift: '+'
- ctrl, alt, meta: none
-}
-
-key LEFT_BRACKET {
- label, number: '['
- base: '['
- shift: '{'
- ctrl, alt, meta: none
-}
-
-key RIGHT_BRACKET {
- label, number: ']'
- base: ']'
- shift: '}'
- ctrl, alt, meta: none
-}
-
-key BACKSLASH {
- label, number: '\\'
- base: '\\'
- shift: '|'
- ctrl, alt, meta: none
-}
-
-key SEMICOLON {
- label, number: ';'
- base: ';'
- shift: ':'
- ctrl, alt, meta: none
-}
-
-key APOSTROPHE {
- label, number: '\''
- base: '\''
- shift: '"'
- ctrl, alt, meta: none
-}
-
-### Numeric keypad ###
-
-key NUMPAD_0 {
- label, number: '0'
- base: fallback INSERT
- numlock: '0'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_1 {
- label, number: '1'
- base: fallback MOVE_END
- numlock: '1'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_2 {
- label, number: '2'
- base: fallback DPAD_DOWN
- numlock: '2'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_3 {
- label, number: '3'
- base: fallback PAGE_DOWN
- numlock: '3'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_4 {
- label, number: '4'
- base: fallback DPAD_LEFT
- numlock: '4'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_5 {
- label, number: '5'
- base: fallback DPAD_CENTER
- numlock: '5'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_6 {
- label, number: '6'
- base: fallback DPAD_RIGHT
- numlock: '6'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_7 {
- label, number: '7'
- base: fallback MOVE_HOME
- numlock: '7'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_8 {
- label, number: '8'
- base: fallback DPAD_UP
- numlock: '8'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_9 {
- label, number: '9'
- base: fallback PAGE_UP
- numlock: '9'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_LEFT_PAREN {
- label, number: '('
- base: '('
- ctrl, alt, meta: none
-}
-
-key NUMPAD_RIGHT_PAREN {
- label, number: ')'
- base: ')'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_DIVIDE {
- label, number: '/'
- base: '/'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_MULTIPLY {
- label, number: '*'
- base: '*'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_SUBTRACT {
- label, number: '-'
- base: '-'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_ADD {
- label, number: '+'
- base: '+'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_DOT {
- label, number: '.'
- base: fallback FORWARD_DEL
- numlock: '.'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_COMMA {
- label, number: ','
- base: ','
- ctrl, alt, meta: none
-}
-
-key NUMPAD_EQUALS {
- label, number: '='
- base: '='
- ctrl, alt, meta: none
-}
-
-key NUMPAD_ENTER {
- label: '\n'
- base: '\n' fallback ENTER
- ctrl, alt, meta: none fallback ENTER
-}
-
-### Special keys on phones ###
-
-key AT {
- label, number: '@'
- base: '@'
-}
-
-key STAR {
- label, number: '*'
- base: '*'
-}
-
-key POUND {
- label, number: '#'
- base: '#'
-}
-
-key PLUS {
- label, number: '+'
- base: '+'
-}
-
-### Non-printing keys ###
-
-key ESCAPE {
- base: fallback BACK
- meta: fallback HOME
- alt: fallback MENU
-}
diff --git a/usr/keychars/qwerty.kcm b/usr/keychars/qwerty.kcm
deleted file mode 100644
index f3e1524..0000000
--- a/usr/keychars/qwerty.kcm
+++ /dev/null
@@ -1,508 +0,0 @@
-# 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.
-
-#
-# Emulator keyboard character map #1.
-#
-# This file is no longer used as the platform's default keyboard character map.
-# Refer to Generic.kcm and Virtual.kcm instead.
-#
-
-type ALPHA
-
-key A {
- label: 'A'
- number: '2'
- base: 'a'
- shift, capslock: 'A'
- alt: '#'
- shift+alt, capslock+alt: none
-}
-
-key B {
- label: 'B'
- number: '2'
- base: 'b'
- shift, capslock: 'B'
- alt: '<'
- shift+alt, capslock+alt: none
-}
-
-key C {
- label: 'C'
- number: '2'
- base: 'c'
- shift, capslock: 'C'
- alt: '9'
- shift+alt, capslock+alt: '\u00e7'
-}
-
-key D {
- label: 'D'
- number: '3'
- base: 'd'
- shift, capslock: 'D'
- alt: '5'
- shift+alt, capslock+alt: none
-}
-
-key E {
- label: 'E'
- number: '3'
- base: 'e'
- shift, capslock: 'E'
- alt: '2'
- shift+alt, capslock+alt: '\u0301'
-}
-
-key F {
- label: 'F'
- number: '3'
- base: 'f'
- shift, capslock: 'F'
- alt: '6'
- shift+alt, capslock+alt: '\u00a5'
-}
-
-key G {
- label: 'G'
- number: '4'
- base: 'g'
- shift, capslock: 'G'
- alt: '-'
- shift+alt, capslock+alt: '_'
-}
-
-key H {
- label: 'H'
- number: '4'
- base: 'h'
- shift, capslock: 'H'
- alt: '['
- shift+alt, capslock+alt: '{'
-}
-
-key I {
- label: 'I'
- number: '4'
- base: 'i'
- shift, capslock: 'I'
- alt: '$'
- shift+alt, capslock+alt: '\u0302'
-}
-
-key J {
- label: 'J'
- number: '5'
- base: 'j'
- shift, capslock: 'J'
- alt: ']'
- shift+alt, capslock+alt: '}'
-}
-
-key K {
- label: 'K'
- number: '5'
- base: 'k'
- shift, capslock: 'K'
- alt: '"'
- shift+alt, capslock+alt: '~'
-}
-
-key L {
- label: 'L'
- number: '5'
- base: 'l'
- shift, capslock: 'L'
- alt: '\''
- shift+alt, capslock+alt: '`'
-}
-
-key M {
- label: 'M'
- number: '6'
- base: 'm'
- shift, capslock: 'M'
- alt: '!'
- shift+alt, capslock+alt: none
-}
-
-key N {
- label: 'N'
- number: '6'
- base: 'n'
- shift, capslock: 'N'
- alt: '>'
- shift+alt, capslock+alt: '\u0303'
-}
-
-key O {
- label: 'O'
- number: '6'
- base: 'o'
- shift, capslock: 'O'
- alt: '('
- shift+alt, capslock+alt: none
-}
-
-key P {
- label: 'P'
- number: '7'
- base: 'p'
- shift, capslock: 'P'
- alt: ')'
- shift+alt, capslock+alt: none
-}
-
-key Q {
- label: 'Q'
- number: '7'
- base: 'q'
- shift, capslock: 'Q'
- alt: '*'
- shift+alt, capslock+alt: '\u0300'
-}
-
-key R {
- label: 'R'
- number: '7'
- base: 'r'
- shift, capslock: 'R'
- alt: '3'
- shift+alt, capslock+alt: '\u20ac'
-}
-
-key S {
- label: 'S'
- number: '7'
- base: 's'
- shift, capslock: 'S'
- alt: '4'
- shift+alt, capslock+alt: '\u00df'
-}
-
-key T {
- label: 'T'
- number: '8'
- base: 't'
- shift, capslock: 'T'
- alt: '+'
- shift+alt, capslock+alt: '\u00a3'
-}
-
-key U {
- label: 'U'
- number: '8'
- base: 'u'
- shift, capslock: 'U'
- alt: '&'
- shift+alt, capslock+alt: '\u0308'
-}
-
-key V {
- label: 'V'
- number: '8'
- base: 'v'
- shift, capslock: 'V'
- alt: '='
- shift+alt, capslock+alt: '^'
-}
-
-key W {
- label: 'W'
- number: '9'
- base: 'w'
- shift, capslock: 'W'
- alt: '1'
- shift+alt, capslock+alt: none
-}
-
-key X {
- label: 'X'
- number: '9'
- base: 'x'
- shift, capslock: 'X'
- alt: '8'
- shift+alt, capslock+alt: '\uef00'
-}
-
-key Y {
- label: 'Y'
- number: '9'
- base: 'y'
- shift, capslock: 'Y'
- alt: '%'
- shift+alt, capslock+alt: '\u00a1'
-}
-
-key Z {
- label: 'Z'
- number: '9'
- base: 'z'
- shift, capslock: 'Z'
- alt: '7'
- shift+alt, capslock+alt: none
-}
-
-key COMMA {
- label: ','
- number: ','
- base: ','
- shift: ';'
- alt: ';'
- shift+alt: '|'
-}
-
-key PERIOD {
- label: '.'
- number: '.'
- base: '.'
- shift: ':'
- alt: ':'
- shift+alt: '\u2026'
-}
-
-key AT {
- label: '@'
- number: '0'
- base: '@'
- shift: '0'
- alt: '0'
- shift+alt: '\u2022'
-}
-
-key SLASH {
- label: '/'
- number: '/'
- base: '/'
- shift: '?'
- alt: '?'
- shift+alt: '\\'
-}
-
-key SPACE {
- label: ' '
- number: ' '
- base: ' '
- shift: ' '
- alt: '\uef01'
- shift+alt: '\uef01'
-}
-
-key ENTER {
- label: '\n'
- number: '\n'
- base: '\n'
- shift: '\n'
- alt: '\n'
- shift+alt: '\n'
-}
-
-key TAB {
- label: '\t'
- number: '\t'
- base: '\t'
- shift: '\t'
- alt: '\t'
- shift+alt: '\t'
-}
-
-key 0 {
- label: '0'
- number: '0'
- base: '0'
- shift: ')'
- alt: ')'
- shift+alt: ')'
-}
-
-key 1 {
- label: '1'
- number: '1'
- base: '1'
- shift: '!'
- alt: '!'
- shift+alt: '!'
-}
-
-key 2 {
- label: '2'
- number: '2'
- base: '2'
- shift: '@'
- alt: '@'
- shift+alt: '@'
-}
-
-key 3 {
- label: '3'
- number: '3'
- base: '3'
- shift: '#'
- alt: '#'
- shift+alt: '#'
-}
-
-key 4 {
- label: '4'
- number: '4'
- base: '4'
- shift: '$'
- alt: '$'
- shift+alt: '$'
-}
-
-key 5 {
- label: '5'
- number: '5'
- base: '5'
- shift: '%'
- alt: '%'
- shift+alt: '%'
-}
-
-key 6 {
- label: '6'
- number: '6'
- base: '6'
- shift: '^'
- alt: '^'
- shift+alt: '^'
-}
-
-key 7 {
- label: '7'
- number: '7'
- base: '7'
- shift: '&'
- alt: '&'
- shift+alt: '&'
-}
-
-key 8 {
- label: '8'
- number: '8'
- base: '8'
- shift: '*'
- alt: '*'
- shift+alt: '*'
-}
-
-key 9 {
- label: '9'
- number: '9'
- base: '9'
- shift: '('
- alt: '('
- shift+alt: '('
-}
-
-key GRAVE {
- label: '`'
- number: '`'
- base: '`'
- shift: '~'
- alt: '`'
- shift+alt: '~'
-}
-
-key MINUS {
- label: '-'
- number: '-'
- base: '-'
- shift: '_'
- alt: '-'
- shift+alt: '_'
-}
-
-key EQUALS {
- label: '='
- number: '='
- base: '='
- shift: '+'
- alt: '='
- shift+alt: '+'
-}
-
-key LEFT_BRACKET {
- label: '['
- number: '['
- base: '['
- shift: '{'
- alt: '['
- shift+alt: '{'
-}
-
-key RIGHT_BRACKET {
- label: ']'
- number: ']'
- base: ']'
- shift: '}'
- alt: ']'
- shift+alt: '}'
-}
-
-key BACKSLASH {
- label: '\\'
- number: '\\'
- base: '\\'
- shift: '|'
- alt: '\\'
- shift+alt: '|'
-}
-
-key SEMICOLON {
- label: ';'
- number: ';'
- base: ';'
- shift: ':'
- alt: ';'
- shift+alt: ':'
-}
-
-key APOSTROPHE {
- label: '\''
- number: '\''
- base: '\''
- shift: '"'
- alt: '\''
- shift+alt: '"'
-}
-
-key STAR {
- label: '*'
- number: '*'
- base: '*'
- shift: '*'
- alt: '*'
- shift+alt: '*'
-}
-
-key POUND {
- label: '#'
- number: '#'
- base: '#'
- shift: '#'
- alt: '#'
- shift+alt: '#'
-}
-
-key PLUS {
- label: '+'
- number: '+'
- base: '+'
- shift: '+'
- alt: '+'
- shift+alt: '+'
-}
diff --git a/usr/keychars/qwerty2.kcm b/usr/keychars/qwerty2.kcm
deleted file mode 100644
index d96914f..0000000
--- a/usr/keychars/qwerty2.kcm
+++ /dev/null
@@ -1,505 +0,0 @@
-# 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.
-
-#
-# Emulator keyboard character map #2.
-#
-
-type ALPHA
-
-key A {
- label: 'A'
- number: '2'
- base: 'a'
- shift, capslock: 'A'
- alt: 'a'
- shift+alt, capslock+alt: 'A'
-}
-
-key B {
- label: 'B'
- number: '2'
- base: 'b'
- shift, capslock: 'B'
- alt: 'b'
- shift+alt, capslock+alt: 'B'
-}
-
-key C {
- label: 'C'
- number: '2'
- base: 'c'
- shift, capslock: 'C'
- alt: '\u00e7'
- shift+alt, capslock+alt: '\u00e7'
-}
-
-key D {
- label: 'D'
- number: '3'
- base: 'd'
- shift, capslock: 'D'
- alt: '\''
- shift+alt, capslock+alt: '\''
-}
-
-key E {
- label: 'E'
- number: '3'
- base: 'e'
- shift, capslock: 'E'
- alt: '"'
- shift+alt, capslock+alt: '\u0301'
-}
-
-key F {
- label: 'F'
- number: '3'
- base: 'f'
- shift, capslock: 'F'
- alt: '['
- shift+alt, capslock+alt: '['
-}
-
-key G {
- label: 'G'
- number: '4'
- base: 'g'
- shift, capslock: 'G'
- alt: ']'
- shift+alt, capslock+alt: ']'
-}
-
-key H {
- label: 'H'
- number: '4'
- base: 'h'
- shift, capslock: 'H'
- alt: '<'
- shift+alt, capslock+alt: '<'
-}
-
-key I {
- label: 'I'
- number: '4'
- base: 'i'
- shift, capslock: 'I'
- alt: '-'
- shift+alt, capslock+alt: '\u0302'
-}
-
-key J {
- label: 'J'
- number: '5'
- base: 'j'
- shift, capslock: 'J'
- alt: '>'
- shift+alt, capslock+alt: '>'
-}
-
-key K {
- label: 'K'
- number: '5'
- base: 'k'
- shift, capslock: 'K'
- alt: ';'
- shift+alt, capslock+alt: '~'
-}
-
-key L {
- label: 'L'
- number: '5'
- base: 'l'
- shift, capslock: 'L'
- alt: ':'
- shift+alt, capslock+alt: '`'
-}
-
-key M {
- label: 'M'
- number: '6'
- base: 'm'
- shift, capslock: 'M'
- alt: '%'
- shift+alt, capslock+alt: none
-}
-
-key N {
- label: 'N'
- number: '6'
- base: 'n'
- shift, capslock: 'N'
- alt: none
- shift+alt, capslock+alt: '\u0303'
-}
-
-key O {
- label: 'O'
- number: '6'
- base: 'o'
- shift, capslock: 'O'
- alt: '+'
- shift+alt, capslock+alt: '+'
-}
-
-key P {
- label: 'P'
- number: '7'
- base: 'p'
- shift, capslock: 'P'
- alt: '='
- shift+alt, capslock+alt: '\u00a5'
-}
-
-key Q {
- label: 'Q'
- number: '7'
- base: 'q'
- shift, capslock: 'Q'
- alt: '|'
- shift+alt, capslock+alt: '\u0300'
-}
-
-key R {
- label: 'R'
- number: '7'
- base: 'r'
- shift, capslock: 'R'
- alt: '`'
- shift+alt, capslock+alt: '\u20ac'
-}
-
-key S {
- label: 'S'
- number: '7'
- base: 's'
- shift, capslock: 'S'
- alt: '\\'
- shift+alt, capslock+alt: '\u00df'
-}
-
-key T {
- label: 'T'
- number: '8'
- base: 't'
- shift, capslock: 'T'
- alt: '{'
- shift+alt, capslock+alt: '\u00a3'
-}
-
-key U {
- label: 'U'
- number: '8'
- base: 'u'
- shift, capslock: 'U'
- alt: '_'
- shift+alt, capslock+alt: '\u0308'
-}
-
-key V {
- label: 'V'
- number: '8'
- base: 'v'
- shift, capslock: 'V'
- alt: 'v'
- shift+alt, capslock+alt: 'V'
-}
-
-key W {
- label: 'W'
- number: '9'
- base: 'w'
- shift, capslock: 'W'
- alt: '~'
- shift+alt, capslock+alt: '~'
-}
-
-key X {
- label: 'X'
- number: '9'
- base: 'x'
- shift, capslock: 'X'
- alt: 'x'
- shift+alt, capslock+alt: '\uef00'
-}
-
-key Y {
- label: 'Y'
- number: '9'
- base: 'y'
- shift, capslock: 'Y'
- alt: '}'
- shift+alt, capslock+alt: '\u00a1'
-}
-
-key Z {
- label: 'Z'
- number: '9'
- base: 'z'
- shift, capslock: 'Z'
- alt: 'z'
- shift+alt, capslock+alt: 'Z'
-}
-
-key COMMA {
- label: ','
- number: ','
- base: ','
- shift: '<'
- alt: ','
- shift+alt: ','
-}
-
-key PERIOD {
- label: '.'
- number: '.'
- base: '.'
- shift: '>'
- alt: '.'
- shift+alt: '\u2026'
-}
-
-key AT {
- label: '@'
- number: '@'
- base: '@'
- shift: '@'
- alt: '@'
- shift+alt: '\u2022'
-}
-
-key SLASH {
- label: '/'
- number: '/'
- base: '/'
- shift: '?'
- alt: '?'
- shift+alt: '?'
-}
-
-key SPACE {
- label: ' '
- number: ' '
- base: ' '
- shift: ' '
- alt: '\uef01'
- shift+alt: '\uef01'
-}
-
-key ENTER {
- label: '\n'
- number: '\n'
- base: '\n'
- shift: '\n'
- alt: '\n'
- shift+alt: '\n'
-}
-
-key TAB {
- label: '\t'
- number: '\t'
- base: '\t'
- shift: '\t'
- alt: '\t'
- shift+alt: '\t'
-}
-
-key 0 {
- label: '0'
- number: '0'
- base: '0'
- shift: ')'
- alt: ')'
- shift+alt: ')'
-}
-
-key 1 {
- label: '1'
- number: '1'
- base: '1'
- shift: '!'
- alt: '!'
- shift+alt: '!'
-}
-
-key 2 {
- label: '2'
- number: '2'
- base: '2'
- shift: '@'
- alt: '@'
- shift+alt: '@'
-}
-
-key 3 {
- label: '3'
- number: '3'
- base: '3'
- shift: '#'
- alt: '#'
- shift+alt: '#'
-}
-
-key 4 {
- label: '4'
- number: '4'
- base: '4'
- shift: '$'
- alt: '$'
- shift+alt: '$'
-}
-
-key 5 {
- label: '5'
- number: '5'
- base: '5'
- shift: '%'
- alt: '%'
- shift+alt: '%'
-}
-
-key 6 {
- label: '6'
- number: '6'
- base: '6'
- shift: '^'
- alt: '^'
- shift+alt: '^'
-}
-
-key 7 {
- label: '7'
- number: '7'
- base: '7'
- shift: '&'
- alt: '&'
- shift+alt: '&'
-}
-
-key 8 {
- label: '8'
- number: '8'
- base: '8'
- shift: '*'
- alt: '*'
- shift+alt: '*'
-}
-
-key 9 {
- label: '9'
- number: '9'
- base: '9'
- shift: '('
- alt: '('
- shift+alt: '('
-}
-
-key GRAVE {
- label: '`'
- number: '`'
- base: '`'
- shift: '~'
- alt: '`'
- shift+alt: '~'
-}
-
-key MINUS {
- label: '-'
- number: '-'
- base: '-'
- shift: '_'
- alt: '-'
- shift+alt: '_'
-}
-
-key EQUALS {
- label: '='
- number: '='
- base: '='
- shift: '+'
- alt: '='
- shift+alt: '+'
-}
-
-key LEFT_BRACKET {
- label: '['
- number: '['
- base: '['
- shift: '{'
- alt: '['
- shift+alt: '{'
-}
-
-key RIGHT_BRACKET {
- label: ']'
- number: ']'
- base: ']'
- shift: '}'
- alt: ']'
- shift+alt: '}'
-}
-
-key BACKSLASH {
- label: '\\'
- number: '\\'
- base: '\\'
- shift: '|'
- alt: '\\'
- shift+alt: '|'
-}
-
-key SEMICOLON {
- label: ';'
- number: ';'
- base: ';'
- shift: ':'
- alt: ';'
- shift+alt: ':'
-}
-
-key APOSTROPHE {
- label: '\''
- number: '\''
- base: '\''
- shift: '"'
- alt: '\''
- shift+alt: '"'
-}
-
-key STAR {
- label: '*'
- number: '*'
- base: '*'
- shift: '*'
- alt: '*'
- shift+alt: '*'
-}
-
-key POUND {
- label: '#'
- number: '#'
- base: '#'
- shift: '#'
- alt: '#'
- shift+alt: '#'
-}
-
-key PLUS {
- label: '+'
- number: '+'
- base: '+'
- shift: '+'
- alt: '+'
- shift+alt: '+'
-}
diff --git a/usr/keylayout/AVRCP.kl b/usr/keylayout/AVRCP.kl
deleted file mode 100644
index 736b43c..0000000
--- a/usr/keylayout/AVRCP.kl
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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.
-
-# Key layout used for Bluetooth AVRCP support.
-
-key 200 MEDIA_PLAY WAKE
-key 201 MEDIA_PAUSE WAKE
-key 166 MEDIA_STOP WAKE
-key 163 MEDIA_NEXT WAKE
-key 165 MEDIA_PREVIOUS WAKE
-key 168 MEDIA_REWIND WAKE
-key 208 MEDIA_FAST_FORWARD WAKE
diff --git a/usr/keylayout/Generic.kl b/usr/keylayout/Generic.kl
deleted file mode 100644
index 8fab924..0000000
--- a/usr/keylayout/Generic.kl
+++ /dev/null
@@ -1,423 +0,0 @@
-# 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.
-
-#
-# Generic key layout file for full alphabetic US English PC style external keyboards.
-#
-# This file is intentionally very generic and is intended to support a broad rang of keyboards.
-# Do not edit the generic key layout to support a specific keyboard; instead, create
-# a new key layout file with the required keyboard configuration.
-#
-
-key 1 ESCAPE
-key 2 1
-key 3 2
-key 4 3
-key 5 4
-key 6 5
-key 7 6
-key 8 7
-key 9 8
-key 10 9
-key 11 0
-key 12 MINUS
-key 13 EQUALS
-key 14 DEL
-key 15 TAB
-key 16 Q
-key 17 W
-key 18 E
-key 19 R
-key 20 T
-key 21 Y
-key 22 U
-key 23 I
-key 24 O
-key 25 P
-key 26 LEFT_BRACKET
-key 27 RIGHT_BRACKET
-key 28 ENTER
-key 29 CTRL_LEFT
-key 30 A
-key 31 S
-key 32 D
-key 33 F
-key 34 G
-key 35 H
-key 36 J
-key 37 K
-key 38 L
-key 39 SEMICOLON
-key 40 APOSTROPHE
-key 41 GRAVE
-key 42 SHIFT_LEFT
-key 43 BACKSLASH
-key 44 Z
-key 45 X
-key 46 C
-key 47 V
-key 48 B
-key 49 N
-key 50 M
-key 51 COMMA
-key 52 PERIOD
-key 53 SLASH
-key 54 SHIFT_RIGHT
-key 55 NUMPAD_MULTIPLY
-key 56 ALT_LEFT
-key 57 SPACE
-key 58 CAPS_LOCK
-key 59 F1
-key 60 F2
-key 61 F3
-key 62 F4
-key 63 F5
-key 64 F6
-key 65 F7
-key 66 F8
-key 67 F9
-key 68 F10
-key 69 NUM_LOCK
-key 70 SCROLL_LOCK
-key 71 NUMPAD_7
-key 72 NUMPAD_8
-key 73 NUMPAD_9
-key 74 NUMPAD_SUBTRACT
-key 75 NUMPAD_4
-key 76 NUMPAD_5
-key 77 NUMPAD_6
-key 78 NUMPAD_ADD
-key 79 NUMPAD_1
-key 80 NUMPAD_2
-key 81 NUMPAD_3
-key 82 NUMPAD_0
-key 83 NUMPAD_DOT
-# key 84 (undefined)
-# key 85 "KEY_ZENKAKUHANKAKU"
-key 86 BACKSLASH
-key 87 F11
-key 88 F12
-# key 89 "KEY_RO"
-# key 90 "KEY_KATAKANA"
-# key 91 "KEY_HIRAGANA"
-# key 92 "KEY_HENKAN"
-# key 93 "KEY_KATAKANAHIRAGANA"
-# key 94 "KEY_MUHENKAN"
-key 95 NUMPAD_COMMA
-key 96 NUMPAD_ENTER
-key 97 CTRL_RIGHT
-key 98 NUMPAD_DIVIDE
-key 99 SYSRQ
-key 100 ALT_RIGHT
-# key 101 "KEY_LINEFEED"
-key 102 MOVE_HOME
-key 103 DPAD_UP
-key 104 PAGE_UP
-key 105 DPAD_LEFT
-key 106 DPAD_RIGHT
-key 107 MOVE_END
-key 108 DPAD_DOWN
-key 109 PAGE_DOWN
-key 110 INSERT
-key 111 FORWARD_DEL
-# key 112 "KEY_MACRO"
-key 113 VOLUME_MUTE
-key 114 VOLUME_DOWN
-key 115 VOLUME_UP
-key 116 POWER WAKE
-key 117 NUMPAD_EQUALS
-# key 118 "KEY_KPPLUSMINUS"
-key 119 BREAK
-# key 120 (undefined)
-key 121 NUMPAD_COMMA
-key 122 LANG
-# key 122 "KEY_HANGEUL"
-# key 123 "KEY_HANJA"
-# key 124 "KEY_YEN"
-key 125 META_LEFT
-key 126 META_RIGHT
-key 127 MENU WAKE_DROPPED
-key 128 MEDIA_STOP
-# key 129 "KEY_AGAIN"
-# key 130 "KEY_PROPS"
-# key 131 "KEY_UNDO"
-# key 132 "KEY_FRONT"
-# key 133 "KEY_COPY"
-# key 134 "KEY_OPEN"
-# key 135 "KEY_PASTE"
-# key 136 "KEY_FIND"
-# key 137 "KEY_CUT"
-# key 138 "KEY_HELP"
-key 139 MENU WAKE_DROPPED
-key 140 CALCULATOR
-# key 141 "KEY_SETUP"
-key 142 POWER WAKE
-key 143 POWER WAKE
-# key 144 "KEY_FILE"
-# key 145 "KEY_SENDFILE"
-# key 146 "KEY_DELETEFILE"
-# key 147 "KEY_XFER"
-# key 148 "KEY_PROG1"
-# key 149 "KEY_PROG2"
-key 150 EXPLORER
-# key 151 "KEY_MSDOS"
-key 152 POWER WAKE
-# key 153 "KEY_DIRECTION"
-# key 154 "KEY_CYCLEWINDOWS"
-key 155 ENVELOPE
-key 156 BOOKMARK
-# key 157 "KEY_COMPUTER"
-key 158 BACK WAKE_DROPPED
-key 159 FORWARD
-key 160 MEDIA_CLOSE
-key 161 MEDIA_EJECT
-key 162 MEDIA_EJECT
-key 163 MEDIA_NEXT
-key 164 MEDIA_PLAY_PAUSE
-key 165 MEDIA_PREVIOUS
-key 166 MEDIA_STOP
-key 167 MEDIA_RECORD
-key 168 MEDIA_REWIND
-key 169 CALL
-# key 170 "KEY_ISO"
-key 171 MUSIC
-key 172 HOME
-# key 173 "KEY_REFRESH"
-# key 174 "KEY_EXIT"
-# key 175 "KEY_MOVE"
-# key 176 "KEY_EDIT"
-key 177 PAGE_UP
-key 178 PAGE_DOWN
-key 179 NUMPAD_LEFT_PAREN
-key 180 NUMPAD_RIGHT_PAREN
-# key 181 "KEY_NEW"
-# key 182 "KEY_REDO"
-# key 183 F13
-# key 184 F14
-# key 185 F15
-# key 186 F16
-# key 187 F17
-# key 188 F18
-# key 189 F19
-# key 190 F20
-# key 191 F21
-# key 192 F22
-# key 193 F23
-# key 194 F24
-# key 195 (undefined)
-# key 196 (undefined)
-# key 197 (undefined)
-# key 198 (undefined)
-# key 199 (undefined)
-key 200 MEDIA_PLAY
-key 201 MEDIA_PAUSE
-# key 202 "KEY_PROG3"
-# key 203 "KEY_PROG4"
-# key 204 (undefined)
-# key 205 "KEY_SUSPEND"
-# key 206 "KEY_CLOSE"
-key 207 MEDIA_PLAY
-key 208 MEDIA_FAST_FORWARD
-# key 209 "KEY_BASSBOOST"
-# key 210 "KEY_PRINT"
-# key 211 "KEY_HP"
-key 212 CAMERA
-key 213 MUSIC
-# key 214 "KEY_QUESTION"
-key 215 ENVELOPE
-# key 216 "KEY_CHAT"
-key 217 SEARCH
-# key 218 "KEY_CONNECT"
-# key 219 "KEY_FINANCE"
-# key 220 "KEY_SPORT"
-# key 221 "KEY_SHOP"
-# key 222 "KEY_ALTERASE"
-# key 223 "KEY_CANCEL"
-# key 224 "KEY_BRIGHTNESSDOWN"
-# key 225 "KEY_BRIGHTNESSUP"
-key 226 HEADSETHOOK
-
-key 256 BUTTON_1
-key 257 BUTTON_2
-key 258 BUTTON_3
-key 259 BUTTON_4
-key 260 BUTTON_5
-key 261 BUTTON_6
-key 262 BUTTON_7
-key 263 BUTTON_8
-key 264 BUTTON_9
-key 265 BUTTON_10
-key 266 BUTTON_11
-key 267 BUTTON_12
-key 268 BUTTON_13
-key 269 BUTTON_14
-key 270 BUTTON_15
-key 271 BUTTON_16
-
-key 288 BUTTON_1
-key 289 BUTTON_2
-key 290 BUTTON_3
-key 291 BUTTON_4
-key 292 BUTTON_5
-key 293 BUTTON_6
-key 294 BUTTON_7
-key 295 BUTTON_8
-key 296 BUTTON_9
-key 297 BUTTON_10
-key 298 BUTTON_11
-key 299 BUTTON_12
-key 300 BUTTON_13
-key 301 BUTTON_14
-key 302 BUTTON_15
-key 303 BUTTON_16
-
-
-key 304 BUTTON_A
-key 305 BUTTON_B
-key 306 BUTTON_C
-key 307 BUTTON_X
-key 308 BUTTON_Y
-key 309 BUTTON_Z
-key 310 BUTTON_L1
-key 311 BUTTON_R1
-key 312 BUTTON_L2
-key 313 BUTTON_R2
-key 314 BUTTON_SELECT
-key 315 BUTTON_START
-key 316 BUTTON_MODE
-key 317 BUTTON_THUMBL
-key 318 BUTTON_THUMBR
-
-
-# key 352 "KEY_OK"
-# key 353 "KEY_SELECT"
-# key 354 "KEY_GOTO"
-# key 355 "KEY_CLEAR"
-# key 356 "KEY_POWER2"
-# key 357 "KEY_OPTION"
-# key 358 "KEY_INFO"
-# key 359 "KEY_TIME"
-# key 360 "KEY_VENDOR"
-# key 361 "KEY_ARCHIVE"
-key 362 GUIDE
-# key 363 "KEY_CHANNEL"
-# key 364 "KEY_FAVORITES"
-# key 365 "KEY_EPG"
-key 366 DVR
-# key 367 "KEY_MHP"
-# key 368 "KEY_LANGUAGE"
-# key 369 "KEY_TITLE"
-# key 370 "KEY_SUBTITLE"
-# key 371 "KEY_ANGLE"
-# key 372 "KEY_ZOOM"
-# key 373 "KEY_MODE"
-# key 374 "KEY_KEYBOARD"
-# key 375 "KEY_SCREEN"
-# key 376 "KEY_PC"
-key 377 TV
-# key 378 "KEY_TV2"
-# key 379 "KEY_VCR"
-# key 380 "KEY_VCR2"
-# key 381 "KEY_SAT"
-# key 382 "KEY_SAT2"
-# key 383 "KEY_CD"
-# key 384 "KEY_TAPE"
-# key 385 "KEY_RADIO"
-# key 386 "KEY_TUNER"
-# key 387 "KEY_PLAYER"
-# key 388 "KEY_TEXT"
-# key 389 "KEY_DVD"
-# key 390 "KEY_AUX"
-# key 391 "KEY_MP3"
-# key 392 "KEY_AUDIO"
-# key 393 "KEY_VIDEO"
-# key 394 "KEY_DIRECTORY"
-# key 395 "KEY_LIST"
-# key 396 "KEY_MEMO"
-key 397 CALENDAR
-# key 398 "KEY_RED"
-# key 399 "KEY_GREEN"
-# key 400 "KEY_YELLOW"
-# key 401 "KEY_BLUE"
-key 402 CHANNEL_UP
-key 403 CHANNEL_DOWN
-# key 404 "KEY_FIRST"
-# key 405 "KEY_LAST"
-# key 406 "KEY_AB"
-# key 407 "KEY_NEXT"
-# key 408 "KEY_RESTART"
-# key 409 "KEY_SLOW"
-# key 410 "KEY_SHUFFLE"
-# key 411 "KEY_BREAK"
-# key 412 "KEY_PREVIOUS"
-# key 413 "KEY_DIGITS"
-# key 414 "KEY_TEEN"
-# key 415 "KEY_TWEN"
-
-key 429 CONTACTS
-
-# key 448 "KEY_DEL_EOL"
-# key 449 "KEY_DEL_EOS"
-# key 450 "KEY_INS_LINE"
-# key 451 "KEY_DEL_LINE"
-
-
-key 464 FUNCTION
-key 465 ESCAPE FUNCTION
-key 466 F1 FUNCTION
-key 467 F2 FUNCTION
-key 468 F3 FUNCTION
-key 469 F4 FUNCTION
-key 470 F5 FUNCTION
-key 471 F6 FUNCTION
-key 472 F7 FUNCTION
-key 473 F8 FUNCTION
-key 474 F9 FUNCTION
-key 475 F10 FUNCTION
-key 476 F11 FUNCTION
-key 477 F12 FUNCTION
-key 478 1 FUNCTION
-key 479 2 FUNCTION
-key 480 D FUNCTION
-key 481 E FUNCTION
-key 482 F FUNCTION
-key 483 S FUNCTION
-key 484 B FUNCTION
-
-
-# key 497 KEY_BRL_DOT1
-# key 498 KEY_BRL_DOT2
-# key 499 KEY_BRL_DOT3
-# key 500 KEY_BRL_DOT4
-# key 501 KEY_BRL_DOT5
-# key 502 KEY_BRL_DOT6
-# key 503 KEY_BRL_DOT7
-# key 504 KEY_BRL_DOT8
-
-
-# Joystick and game controller axes.
-# Axes that are not mapped will be assigned generic axis numbers by the input subsystem.
-axis 0x00 X
-axis 0x01 Y
-axis 0x02 Z
-axis 0x03 RX
-axis 0x04 RY
-axis 0x05 RZ
-axis 0x06 THROTTLE
-axis 0x07 RUDDER
-axis 0x08 WHEEL
-axis 0x09 GAS
-axis 0x0a BRAKE
-axis 0x10 HAT_X
-axis 0x11 HAT_Y
diff --git a/usr/keylayout/Vendor_045e_Product_028e.kl b/usr/keylayout/Vendor_045e_Product_028e.kl
deleted file mode 100644
index 99f046a..0000000
--- a/usr/keylayout/Vendor_045e_Product_028e.kl
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright (C) 2011 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.
-
-#
-# XBox 360 USB Controller
-#
-
-key 304 BUTTON_A
-key 305 BUTTON_B
-key 307 BUTTON_X
-key 308 BUTTON_Y
-key 310 BUTTON_L1
-key 311 BUTTON_R1
-key 314 BUTTON_SELECT
-key 315 BUTTON_START
-key 316 BUTTON_MODE
-key 317 BUTTON_THUMBL
-key 318 BUTTON_THUMBR
-
-# Left and right stick.
-# The reported value for flat is 128 out of a range from -32767 to 32768, which is absurd.
-# This confuses applications that rely on the flat value because the joystick actually
-# settles in a flat range of +/- 4096 or so.
-axis 0x00 X flat 4096
-axis 0x01 Y flat 4096
-axis 0x03 Z flat 4096
-axis 0x04 RZ flat 4096
-
-# Triggers.
-axis 0x02 LTRIGGER
-axis 0x05 RTRIGGER
-
-# Hat.
-axis 0x10 HAT_X
-axis 0x11 HAT_Y
diff --git a/usr/keylayout/Vendor_046d_Product_c216.kl b/usr/keylayout/Vendor_046d_Product_c216.kl
deleted file mode 100644
index 6743323..0000000
--- a/usr/keylayout/Vendor_046d_Product_c216.kl
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (C) 2011 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.
-
-#
-# Logitech Dual Action Controller
-#
-
-key 0x120 BUTTON_A
-key 0x123 BUTTON_B
-key 0x121 BUTTON_X
-key 0x122 BUTTON_Y
-key 0x124 BUTTON_L1
-key 0x125 BUTTON_R1
-key 0x126 BUTTON_L2
-key 0x127 BUTTON_R2
-key 0x128 BUTTON_SELECT
-key 0x129 BUTTON_START
-key 0x12a BUTTON_THUMBL
-key 0x12b BUTTON_THUMBR
-
-axis 0x00 X
-axis 0x01 Y
-axis 0x02 Z
-axis 0x05 RZ
-axis 0x10 HAT_X
-axis 0x11 HAT_Y
diff --git a/usr/keylayout/Vendor_046d_Product_c294.kl b/usr/keylayout/Vendor_046d_Product_c294.kl
deleted file mode 100644
index 5492f49..0000000
--- a/usr/keylayout/Vendor_046d_Product_c294.kl
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright (C) 2011 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.
-
-#
-# Logitech G25 Racing Wheel (in Compatibility Mode)
-#
-
-# 4 way buttons above hat
-key 0x121 BUTTON_A
-key 0x123 BUTTON_B
-key 0x120 BUTTON_X
-key 0x122 BUTTON_Y
-
-# Row of buttons under hat
-key 0x12b BUTTON_1
-key 0x128 BUTTON_2
-key 0x129 BUTTON_3
-key 0x12a BUTTON_4
-
-# Gear shift positions
-# 0x12a top-left gear (aliased as BUTTON_4)
-# 0x12b bottom-left gear (aliased as BUTTON_1)
-
-# Buttons on wheel
-key 0x127 BUTTON_L1
-key 0x126 BUTTON_R1
-
-# Toggles under wheel
-key 0x125 BUTTON_L2
-key 0x124 BUTTON_R2
-
-# Hat
-axis 0x10 HAT_X
-axis 0x11 HAT_Y
-
-# Steering Wheel
-axis 0x00 WHEEL
-
-# Accelerator / Brake
-# 00..7e : accelerator
-# 80..ff : brake
-axis 0x01 split 0x7f GAS BRAKE
diff --git a/usr/keylayout/Vendor_046d_Product_c299.kl b/usr/keylayout/Vendor_046d_Product_c299.kl
deleted file mode 100644
index d42963d..0000000
--- a/usr/keylayout/Vendor_046d_Product_c299.kl
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright (C) 2011 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.
-
-#
-# Logitech G25 Racing Wheel (in Native Mode)
-#
-
-# 4 way buttons above hat
-key 0x121 BUTTON_A
-key 0x123 BUTTON_B
-key 0x120 BUTTON_X
-key 0x122 BUTTON_Y
-
-# Row of buttons under hat
-key 0x12b BUTTON_1
-key 0x128 BUTTON_2
-key 0x129 BUTTON_3
-key 0x12a BUTTON_4
-
-# Gear shift positions
-key 0x12c BUTTON_5
-key 0x12d BUTTON_6
-key 0x12e BUTTON_7
-key 0x12f BUTTON_8
-key 0x2d0 BUTTON_9
-key 0x2d1 BUTTON_10
-key 0x2d2 BUTTON_11
-
-# Buttons on wheel
-key 0x127 BUTTON_L1
-key 0x126 BUTTON_R1
-
-# Toggles under wheel
-key 0x125 BUTTON_L2
-key 0x124 BUTTON_R2
-
-# Hat
-axis 0x10 HAT_X
-axis 0x11 HAT_Y
-
-# Steering Wheel
-axis 0x00 WHEEL
-
-# Clutch
-axis 0x01 invert GENERIC_1
-
-# Accelerator
-axis 0x02 invert GAS
-
-# Brake
-axis 0x05 invert BRAKE
diff --git a/usr/keylayout/Vendor_046d_Product_c532.kl b/usr/keylayout/Vendor_046d_Product_c532.kl
deleted file mode 100644
index 741c2e1..0000000
--- a/usr/keylayout/Vendor_046d_Product_c532.kl
+++ /dev/null
@@ -1,133 +0,0 @@
-# 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.
-
-#
-# Logitech Revue Wireless keyboard
-#
-# Notes:
-# - The GRAVE key is emulated by the keyboard.
-# ALT + LEFT_BRACKET produces GRAVE.
-# ALT + RIGHT_BRACKET produces SHIFT + GRAVE.
-# - FORWARD_DEL is produced by fn + BACKSPACE
-# - PAGE_UP / PAGE_DOWN is produced by fn + CHANNEL_UP / CHANNEL_DOWN
-# - The AVR / STB / TV power and input buttons seem to be non-functional
-# as well as several of the other fn buttons and the PIP button?
-
-key 1 ESCAPE
-key 2 1
-key 3 2
-key 4 3
-key 5 4
-key 6 5
-key 7 6
-key 8 7
-key 9 8
-key 10 9
-key 11 0
-key 12 MINUS
-key 13 EQUALS
-key 14 DEL
-key 15 TAB
-key 16 Q
-key 17 W
-key 18 E
-key 19 R
-key 20 T
-key 21 Y
-key 22 U
-key 23 I
-key 24 O
-key 25 P
-key 26 LEFT_BRACKET
-key 27 RIGHT_BRACKET
-key 28 ENTER
-key 29 CTRL_LEFT
-key 30 A
-key 31 S
-key 32 D
-key 33 F
-key 34 G
-key 35 H
-key 36 J
-key 37 K
-key 38 L
-key 39 SEMICOLON
-key 40 APOSTROPHE
-key 41 GRAVE
-key 42 SHIFT_LEFT
-key 43 BACKSLASH
-key 44 Z
-key 45 X
-key 46 C
-key 47 V
-key 48 B
-key 49 N
-key 50 M
-key 51 COMMA
-key 52 PERIOD
-key 53 SLASH
-key 54 SHIFT_RIGHT
-key 56 ALT_RIGHT
-key 57 SPACE
-key 58 CAPS_LOCK
-key 59 F1
-key 60 F2
-key 61 F3
-key 62 F4
-key 63 F5
-key 64 F6
-key 65 F7
-key 66 F8
-key 67 F9
-key 68 F10
-key 87 F11
-key 88 F12
-key 96 DPAD_CENTER
-key 97 CTRL_RIGHT
-key 102 MOVE_HOME
-key 103 DPAD_UP
-key 104 PAGE_UP
-key 105 DPAD_LEFT
-key 106 DPAD_RIGHT
-key 107 MOVE_END
-key 108 DPAD_DOWN
-key 109 PAGE_DOWN
-key 110 NUMPAD_ENTER
-key 111 FORWARD_DEL
-key 113 VOLUME_MUTE
-key 114 VOLUME_DOWN
-key 115 VOLUME_UP
-key 119 MEDIA_PAUSE
-key 125 SEARCH
-key 127 MENU
-key 156 BOOKMARK
-key 158 BACK
-key 163 MEDIA_NEXT
-key 165 MEDIA_PREVIOUS
-key 166 MEDIA_STOP
-key 167 MEDIA_RECORD
-key 168 MEDIA_REWIND
-key 172 HOME
-key 207 MEDIA_PLAY
-key 208 MEDIA_FAST_FORWARD
-# key 288 left mouse button
-# key 289 right mouse button (fn + button)
-key 362 GUIDE
-key 366 DVR
-key 377 TV
-key 402 CHANNEL_UP
-key 403 CHANNEL_DOWN
-key 418 ZOOM_IN
-key 419 ZOOM_OUT
-
diff --git a/usr/keylayout/Vendor_04e8_Product_7021.kl b/usr/keylayout/Vendor_04e8_Product_7021.kl
deleted file mode 100644
index 4eddce0..0000000
--- a/usr/keylayout/Vendor_04e8_Product_7021.kl
+++ /dev/null
@@ -1,393 +0,0 @@
-# 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.
-
-#
-# Generic key layout file for full alphabetic US English PC style external keyboards.
-#
-# This file is intentionally very generic and is intended to support a broad rang of keyboards.
-# Do not edit the generic key layout to support a specific keyboard; instead, create
-# a new key layout file with the required keyboard configuration.
-#
-
-key 1 BACK
-key 2 1
-key 3 2
-key 4 3
-key 5 4
-key 6 5
-key 7 6
-key 8 7
-key 9 8
-key 10 9
-key 11 0
-key 12 MINUS
-key 13 EQUALS
-key 14 DEL
-key 15 TAB
-key 16 Q
-key 17 W
-key 18 E
-key 19 R
-key 20 T
-key 21 Y
-key 22 U
-key 23 I
-key 24 O
-key 25 P
-key 26 LEFT_BRACKET
-key 27 RIGHT_BRACKET
-key 28 ENTER
-key 29 CTRL_LEFT
-key 30 A
-key 31 S
-key 32 D
-key 33 F
-key 34 G
-key 35 H
-key 36 J
-key 37 K
-key 38 L
-key 39 SEMICOLON
-key 40 APOSTROPHE
-key 41 GRAVE
-key 42 SHIFT_LEFT
-key 43 BACKSLASH
-key 44 Z
-key 45 X
-key 46 C
-key 47 V
-key 48 B
-key 49 N
-key 50 M
-key 51 COMMA
-key 52 PERIOD
-key 53 SLASH
-key 54 SHIFT_RIGHT
-key 55 NUMPAD_MULTIPLY
-key 56 ALT_LEFT
-key 57 SPACE
-key 58 CAPS_LOCK
-key 59 F1
-key 60 F2
-key 61 F3
-key 62 F4
-key 63 F5
-key 64 F6
-key 65 F7
-key 66 F8
-key 67 F9
-key 68 F10
-key 69 NUM_LOCK
-key 70 SCROLL_LOCK
-key 71 NUMPAD_7
-key 72 NUMPAD_8
-key 73 NUMPAD_9
-key 74 NUMPAD_SUBTRACT
-key 75 NUMPAD_4
-key 76 NUMPAD_5
-key 77 NUMPAD_6
-key 78 NUMPAD_ADD
-key 79 NUMPAD_1
-key 80 NUMPAD_2
-key 81 NUMPAD_3
-key 82 NUMPAD_0
-key 83 NUMPAD_DOT
-# key 84 (undefined)
-# key 85 "KEY_ZENKAKUHANKAKU"
-key 86 BACKSLASH
-key 87 F11
-key 88 F12
-# key 89 "KEY_RO"
-# key 90 "KEY_KATAKANA"
-# key 91 "KEY_HIRAGANA"
-# key 92 "KEY_HENKAN"
-# key 93 "KEY_KATAKANAHIRAGANA"
-# key 94 "KEY_MUHENKAN"
-key 95 NUMPAD_COMMA
-key 96 NUMPAD_ENTER
-key 97 CTRL_RIGHT
-key 98 NUMPAD_DIVIDE
-key 99 SYSRQ
-key 100 ALT_GR
-# key 101 "KEY_LINEFEED"
-key 102 MOVE_HOME
-key 103 DPAD_UP
-key 104 PAGE_UP
-key 105 DPAD_LEFT
-key 106 DPAD_RIGHT
-key 107 MOVE_END
-key 108 DPAD_DOWN
-key 109 PAGE_DOWN
-key 110 INSERT
-key 111 FORWARD_DEL
-# key 112 "KEY_MACRO"
-key 113 MUTE
-key 114 VOLUME_DOWN
-key 115 VOLUME_UP
-key 116 POWER WAKE
-key 117 NUMPAD_EQUALS
-# key 118 "KEY_KPPLUSMINUS"
-key 119 BREAK
-# key 120 (undefined)
-key 121 NUMPAD_COMMA
-# key 122 "KEY_HANGEUL"
-# key 123 "KEY_HANJA"
-# key 124 "KEY_YEN"
-key 125 META_LEFT
-key 126 META_RIGHT
-key 127 MENU WAKE_DROPPED
-key 128 MEDIA_STOP
-# key 129 "KEY_AGAIN"
-# key 130 "KEY_PROPS"
-# key 131 "KEY_UNDO"
-# key 132 "KEY_FRONT"
-# key 133 "KEY_COPY"
-# key 134 "KEY_OPEN"
-# key 135 "KEY_PASTE"
-# key 136 "KEY_FIND"
-# key 137 "KEY_CUT"
-# key 138 "KEY_HELP"
-key 139 MENU WAKE_DROPPED
-# key 140 "KEY_CALC"
-# key 141 "KEY_SETUP"
-# key 142 "KEY_SLEEP"
-# key 143 "KEY_WAKEUP"
-# key 144 "KEY_FILE"
-# key 145 "KEY_SENDFILE"
-# key 146 "KEY_DELETEFILE"
-# key 147 "KEY_XFER"
-# key 148 "KEY_PROG1"
-# key 149 "KEY_PROG2"
-key 150 EXPLORER
-# key 151 "KEY_MSDOS"
-# key 152 "KEY_COFFEE"
-key 152 POWER WAKE
-# key 153 "KEY_DIRECTION"
-# key 154 "KEY_CYCLEWINDOWS"
-key 155 EMAIL
-key 156 BOOKMARK
-# key 157 "KEY_COMPUTER"
-key 158 BACK WAKE_DROPPED
-key 159 FORWARD
-key 160 MEDIA_CLOSE
-key 161 MEDIA_EJECT
-key 162 MEDIA_EJECT
-key 163 MEDIA_NEXT
-key 164 MEDIA_PLAY_PAUSE
-key 165 MEDIA_PREVIOUS
-key 166 MEDIA_STOP
-key 167 MEDIA_RECORD
-key 168 MEDIA_REWIND
-key 169 CALL
-# key 170 "KEY_ISO"
-# key 171 "KEY_CONFIG"
-key 172 HOME
-# key 173 "KEY_REFRESH"
-# key 174 "KEY_EXIT"
-# key 175 "KEY_MOVE"
-# key 176 "KEY_EDIT"
-key 177 PAGE_UP
-key 178 PAGE_DOWN
-key 179 NUMPAD_LEFT_PAREN
-key 180 NUMPAD_RIGHT_PAREN
-# key 181 "KEY_NEW"
-# key 182 "KEY_REDO"
-# key 183 F13
-# key 184 F14
-# key 185 F15
-# key 186 F16
-# key 187 F17
-# key 188 F18
-# key 189 F19
-# key 190 F20
-# key 191 F21
-# key 192 F22
-# key 193 F23
-# key 194 F24
-# key 195 (undefined)
-# key 196 (undefined)
-# key 197 (undefined)
-# key 198 (undefined)
-# key 199 (undefined)
-key 200 MEDIA_PLAY
-key 201 MEDIA_PAUSE
-# key 202 "KEY_PROG3"
-# key 203 "KEY_PROG4"
-# key 204 (undefined)
-# key 205 "KEY_SUSPEND"
-# key 206 "KEY_CLOSE"
-key 207 MEDIA_PLAY
-key 208 MEDIA_FAST_FORWARD
-# key 209 "KEY_BASSBOOST"
-# key 210 "KEY_PRINT"
-# key 211 "KEY_HP"
-key 212 CAMERA
-# key 213 "KEY_SOUND"
-# key 214 "KEY_QUESTION"
-key 215 ENVELOPE
-# key 216 "KEY_CHAT"
-key 217 SEARCH
-# key 218 "KEY_CONNECT"
-# key 219 "KEY_FINANCE"
-# key 220 "KEY_SPORT"
-# key 221 "KEY_SHOP"
-# key 222 "KEY_ALTERASE"
-# key 223 "KEY_CANCEL"
-key 224 BRIGHTNESS_DOWN
-key 225 BRIGHTNESS_UP
-key 226 HEADSETHOOK
-key 227 STAR
-key 228 POUND
-key 229 SOFT_LEFT
-key 230 SOFT_RIGHT
-key 231 CALL
-key 232 DPAD_CENTER
-key 233 HEADSETHOOK
-# key 234 "KEY_0_5" or "KEY_SAVE"
-# key 235 "KEY_2_5" or "KEY_DOCUMENTS"
-# key 236 "KEY_SWITCHVIDEOMODE" or "KEY_BATTERY"
-# key 237 "KEY_KBDILLUMTOGGLE"
-# key 238 "KEY_KBDILLUMDOWN"
-# key 239 "KEY_KBDILLUMUP"
-# key 240 "KEY_UNKNOWN"
-
-
-key 304 BUTTON_A
-key 305 BUTTON_B
-key 306 BUTTON_C
-key 307 BUTTON_X
-key 308 BUTTON_Y
-key 309 BUTTON_Z
-key 310 BUTTON_L1
-key 311 BUTTON_R1
-key 312 BUTTON_L2
-key 313 BUTTON_R2
-key 314 BUTTON_SELECT
-key 315 BUTTON_START
-key 316 BUTTON_MODE
-key 317 BUTTON_THUMBL
-key 318 BUTTON_THUMBR
-
-
-# key 352 "KEY_OK"
-# key 353 "KEY_SELECT"
-# key 354 "KEY_GOTO"
-# key 355 "KEY_CLEAR"
-# key 356 "KEY_POWER2"
-# key 357 "KEY_OPTION"
-# key 358 "KEY_INFO"
-# key 359 "KEY_TIME"
-# key 360 "KEY_VENDOR"
-# key 361 "KEY_ARCHIVE"
-key 362 GUIDE
-# key 363 "KEY_CHANNEL"
-# key 364 "KEY_FAVORITES"
-# key 365 "KEY_EPG"
-key 366 DVR
-# key 367 "KEY_MHP"
-# key 368 "KEY_LANGUAGE"
-key 368 LANG
-# key 369 "KEY_TITLE"
-# key 370 "KEY_SUBTITLE"
-# key 371 "KEY_ANGLE"
-# key 372 "KEY_ZOOM"
-# key 373 "KEY_MODE"
-# key 374 "KEY_KEYBOARD"
-# key 375 "KEY_SCREEN"
-# key 376 "KEY_PC"
-key 377 TV
-# key 378 "KEY_TV2"
-# key 379 "KEY_VCR"
-# key 380 "KEY_VCR2"
-# key 381 "KEY_SAT"
-# key 382 "KEY_SAT2"
-# key 383 "KEY_CD"
-# key 384 "KEY_TAPE"
-# key 385 "KEY_RADIO"
-# key 386 "KEY_TUNER"
-# key 387 "KEY_PLAYER"
-# key 388 "KEY_TEXT"
-# key 389 "KEY_DVD"
-# key 390 "KEY_AUX"
-# key 391 "KEY_MP3"
-# key 392 "KEY_AUDIO"
-# key 393 "KEY_VIDEO"
-# key 394 "KEY_DIRECTORY"
-# key 395 "KEY_LIST"
-# key 396 "KEY_MEMO"
-# key 397 "KEY_CALENDAR"
-# key 398 "KEY_RED"
-# key 399 "KEY_GREEN"
-# key 400 "KEY_YELLOW"
-# key 401 "KEY_BLUE"
-key 402 CHANNEL_UP
-key 403 CHANNEL_DOWN
-# key 404 "KEY_FIRST"
-# key 405 "KEY_LAST"
-# key 406 "KEY_AB"
-# key 407 "KEY_NEXT"
-# key 408 "KEY_RESTART"
-# key 409 "KEY_SLOW"
-# key 410 "KEY_SHUFFLE"
-# key 411 "KEY_BREAK"
-# key 412 "KEY_PREVIOUS"
-# key 413 "KEY_DIGITS"
-# key 414 "KEY_TEEN"
-# key 415 "KEY_TWEN"
-
-
-# key 448 "KEY_DEL_EOL"
-# key 449 "KEY_DEL_EOS"
-# key 450 "KEY_INS_LINE"
-# key 451 "KEY_DEL_LINE"
-
-
-key 464 FUNCTION
-key 465 ESCAPE FUNCTION
-key 466 F1 FUNCTION
-key 467 F2 FUNCTION
-key 468 F3 FUNCTION
-key 469 F4 FUNCTION
-key 470 F5 FUNCTION
-key 471 F6 FUNCTION
-key 472 F7 FUNCTION
-key 473 F8 FUNCTION
-key 474 F9 FUNCTION
-key 475 F10 FUNCTION
-key 476 F11 FUNCTION
-key 477 F12 FUNCTION
-key 478 1 FUNCTION
-key 479 2 FUNCTION
-key 480 D FUNCTION
-key 481 E FUNCTION
-key 482 F FUNCTION
-key 483 S FUNCTION
-key 484 B FUNCTION
-
-
-# key 497 KEY_BRL_DOT1
-# key 498 KEY_BRL_DOT2
-# key 499 KEY_BRL_DOT3
-# key 500 KEY_BRL_DOT4
-# key 501 KEY_BRL_DOT5
-# key 502 KEY_BRL_DOT6
-# key 503 KEY_BRL_DOT7
-# key 504 KEY_BRL_DOT8
-
-
-key 704 RECENTAPPS
-key 705 APPLICATION
-key 706 SIP_ON_OFF
-key 707 VOICESEARCH
-key 708 QPANEL_ON_OFF \ No newline at end of file
diff --git a/usr/keylayout/Vendor_054c_Product_0268.kl b/usr/keylayout/Vendor_054c_Product_0268.kl
deleted file mode 100644
index f8ac6a3..0000000
--- a/usr/keylayout/Vendor_054c_Product_0268.kl
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright (C) 2011 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.
-
-#
-# Sony Playstation(R)3 Controller
-#
-
-key 0x124 DPAD_UP
-key 0x125 DPAD_RIGHT
-key 0x126 DPAD_DOWN
-key 0x127 DPAD_LEFT
-
-key 0x120 BUTTON_SELECT
-key 0x123 BUTTON_START
-key 0x12f BUTTON_A
-key 0x12c BUTTON_B
-key 0x12e BUTTON_X
-key 0x12d BUTTON_Y
-key 0x12a BUTTON_L1
-key 0x12b BUTTON_R1
-key 0x128 BUTTON_L2
-key 0x129 BUTTON_R2
-key 0x121 BUTTON_THUMBL
-key 0x122 BUTTON_THUMBR
-
-# PS key
-key 0x2d0 BUTTON_1
-
-# Left Analog Stick
-axis 0x00 X
-axis 0x01 Y
-
-# Right Analog Stick
-axis 0x02 Z
-axis 0x05 RZ
-
-# DPAD
-# axis 0x2c -HAT_Y
-# axis 0x2d +HAT_X
-# axis 0x2e +HAT_Y
-# axis 0x2f -HAT_X
-
-# L2 trigger
-axis 0x30 LTRIGGER
-
-# R2 trigger
-axis 0x31 RTRIGGER
-
-# L1 trigger
-# axis 0x32
-
-# R1 trigger
-# axis 0x33
-
-# Triangle
-# axis 0x34
-
-# Circle
-# axis 0x35
-
-# Cross
-# axis 0x36
-
-# Square
-# axis 0x37
diff --git a/usr/keylayout/Vendor_05ac_Product_0239.kl b/usr/keylayout/Vendor_05ac_Product_0239.kl
deleted file mode 100644
index 6bd3753..0000000
--- a/usr/keylayout/Vendor_05ac_Product_0239.kl
+++ /dev/null
@@ -1,119 +0,0 @@
-# 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.
-
-#
-# Apple Wireless Keyboard
-#
-# Notes:
-# - Keys such as PAGE_UP and FORWARD_DEL are produced using the
-# function key.
-# - Special function keys for brightness control, etc. are not
-# implemented here.
-
-key 1 ESCAPE
-key 2 1
-key 3 2
-key 4 3
-key 5 4
-key 6 5
-key 7 6
-key 8 7
-key 9 8
-key 10 9
-key 11 0
-key 12 MINUS
-key 13 EQUALS
-key 14 DEL
-key 15 TAB
-key 16 Q
-key 17 W
-key 18 E
-key 19 R
-key 20 T
-key 21 Y
-key 22 U
-key 23 I
-key 24 O
-key 25 P
-key 26 LEFT_BRACKET
-key 27 RIGHT_BRACKET
-key 28 ENTER
-key 29 CTRL_LEFT
-key 30 A
-key 31 S
-key 32 D
-key 33 F
-key 34 G
-key 35 H
-key 36 J
-key 37 K
-key 38 L
-key 39 SEMICOLON
-key 40 APOSTROPHE
-key 41 GRAVE
-key 42 SHIFT_LEFT
-key 43 BACKSLASH
-key 44 Z
-key 45 X
-key 46 C
-key 47 V
-key 48 B
-key 49 N
-key 50 M
-key 51 COMMA
-key 52 PERIOD
-key 53 SLASH
-key 54 SHIFT_RIGHT
-key 56 ALT_LEFT
-key 57 SPACE
-key 58 CAPS_LOCK
-key 59 F1
-key 60 F2
-key 61 F3
-key 62 F4
-key 63 F5
-key 64 F6
-key 65 F7
-key 66 F8
-key 67 F9
-key 68 F10
-key 87 F11
-key 88 F12
-key 100 ALT_RIGHT
-key 102 MOVE_HOME
-key 103 DPAD_UP
-key 104 PAGE_UP
-key 105 DPAD_LEFT
-key 106 DPAD_RIGHT
-key 107 MOVE_END
-key 108 DPAD_DOWN
-key 109 PAGE_DOWN
-key 110 NUMPAD_ENTER
-key 111 FORWARD_DEL
-key 113 VOLUME_MUTE
-key 114 VOLUME_DOWN
-key 115 VOLUME_UP
-key 120 APP_SWITCH
-key 125 META_LEFT
-key 126 META_RIGHT
-key 161 MEDIA_EJECT
-key 163 MEDIA_NEXT
-key 164 MEDIA_PLAY_PAUSE
-key 165 MEDIA_PREVIOUS
-# key 204 show gadgets
-# key 224 reduce brightness
-# key 225 increase brightness
-# key 229 blank special function on F5
-# key 230 blank special function on F6
-key 464 FUNCTION
diff --git a/usr/keylayout/Vendor_22b8_Product_093d.kl b/usr/keylayout/Vendor_22b8_Product_093d.kl
deleted file mode 100644
index 2749c5b..0000000
--- a/usr/keylayout/Vendor_22b8_Product_093d.kl
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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.
-
-#
-# Motorola Bluetooth Wireless Keyboard.
-#
-
-key 1 BACK
-key 2 1
-key 3 2
-key 4 3
-key 5 4
-key 6 5
-key 7 6
-key 8 7
-key 9 8
-key 10 9
-key 11 0
-key 12 MINUS
-key 13 EQUALS
-key 14 DEL
-key 15 TAB
-key 16 Q
-key 17 W
-key 18 E
-key 19 R
-key 20 T
-key 21 Y
-key 22 U
-key 23 I
-key 24 O
-key 25 P
-key 26 LEFT_BRACKET
-key 27 RIGHT_BRACKET
-key 28 ENTER
-key 29 CTRL_LEFT
-key 30 A
-key 31 S
-key 32 D
-key 33 F
-key 34 G
-key 35 H
-key 36 J
-key 37 K
-key 38 L
-key 39 SEMICOLON
-key 40 APOSTROPHE
-key 41 GRAVE
-key 42 SHIFT_LEFT
-key 43 BACKSLASH
-key 44 Z
-key 45 X
-key 46 C
-key 47 V
-key 48 B
-key 49 N
-key 50 M
-key 51 COMMA
-key 52 PERIOD
-key 53 SLASH
-key 54 SHIFT_RIGHT
-key 56 ALT_LEFT
-key 57 SPACE
-key 58 CAPS_LOCK
-key 59 F1
-key 60 F2
-key 61 F3
-key 62 F4
-key 63 F5
-key 64 F6
-key 65 F7
-key 66 F8
-key 67 F9
-key 68 F10
-key 87 F11
-key 88 F12
-key 97 CTRL_RIGHT
-key 102 HOME
-key 103 DPAD_UP
-key 105 DPAD_LEFT
-key 106 DPAD_RIGHT
-key 107 MOVE_END
-key 108 DPAD_DOWN
-key 111 FORWARD_DEL
-key 113 VOLUME_MUTE
-key 114 VOLUME_DOWN
-key 115 VOLUME_UP
-key 125 MENU
-key 127 SEARCH
-key 163 MEDIA_NEXT
-key 164 MEDIA_PLAY_PAUSE
-key 165 MEDIA_PREVIOUS
-key 166 MEDIA_STOP
-# key 226 tbd reserved key
diff --git a/usr/keylayout/qwerty.kl b/usr/keylayout/qwerty.kl
deleted file mode 100644
index f1caacd..0000000
--- a/usr/keylayout/qwerty.kl
+++ /dev/null
@@ -1,112 +0,0 @@
-# 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.
-
-#
-# Emulator keyboard layout #1.
-#
-# This file is no longer used as the platform's default keyboard layout.
-# Refer to Generic.kl instead.
-#
-
-key 399 GRAVE
-key 2 1
-key 3 2
-key 4 3
-key 5 4
-key 6 5
-key 7 6
-key 8 7
-key 9 8
-key 10 9
-key 11 0
-key 158 BACK WAKE_DROPPED
-key 230 SOFT_RIGHT WAKE
-key 60 SOFT_RIGHT WAKE
-key 107 ENDCALL WAKE_DROPPED
-key 62 ENDCALL WAKE_DROPPED
-key 229 MENU WAKE_DROPPED
-key 139 MENU WAKE_DROPPED
-key 59 MENU WAKE_DROPPED
-key 127 SEARCH WAKE_DROPPED
-key 217 SEARCH WAKE_DROPPED
-key 228 POUND
-key 227 STAR
-key 231 CALL WAKE_DROPPED
-key 61 CALL WAKE_DROPPED
-key 232 DPAD_CENTER WAKE_DROPPED
-key 108 DPAD_DOWN WAKE_DROPPED
-key 103 DPAD_UP WAKE_DROPPED
-key 102 HOME WAKE
-key 105 DPAD_LEFT WAKE_DROPPED
-key 106 DPAD_RIGHT WAKE_DROPPED
-key 115 VOLUME_UP WAKE
-key 114 VOLUME_DOWN WAKE
-key 116 POWER WAKE
-key 212 CAMERA
-
-key 16 Q
-key 17 W
-key 18 E
-key 19 R
-key 20 T
-key 21 Y
-key 22 U
-key 23 I
-key 24 O
-key 25 P
-key 26 LEFT_BRACKET
-key 27 RIGHT_BRACKET
-key 43 BACKSLASH
-
-key 30 A
-key 31 S
-key 32 D
-key 33 F
-key 34 G
-key 35 H
-key 36 J
-key 37 K
-key 38 L
-key 39 SEMICOLON
-key 40 APOSTROPHE
-key 14 DEL
-
-key 44 Z
-key 45 X
-key 46 C
-key 47 V
-key 48 B
-key 49 N
-key 50 M
-key 51 COMMA
-key 52 PERIOD
-key 53 SLASH
-key 28 ENTER
-
-key 56 ALT_LEFT
-key 100 ALT_RIGHT
-key 42 SHIFT_LEFT
-key 54 SHIFT_RIGHT
-key 15 TAB
-key 57 SPACE
-key 150 EXPLORER
-key 155 ENVELOPE
-
-key 12 MINUS
-key 13 EQUALS
-key 215 AT
-
-# On an AT keyboard: ESC, F10
-key 1 BACK WAKE_DROPPED
-key 68 MENU WAKE_DROPPED