Permalink
Browse files

Update prebuilt stuff, update extract-files, bluetooth etc

Change-Id: I38be014ff10080b1dfcdb189d9c5d1e63594286b
  • Loading branch information...
1 parent 4597d95 commit ab98a80743e1288aad1f8355ad99a6a260575826 @charansingh charansingh committed Feb 19, 2011
View
3 BoardConfig.mk
@@ -66,13 +66,16 @@ BOARD_VENDOR_USE_AKMD := akm8973
BOARD_EGL_CFG := device/htc/leo/egl.cfg
BOARD_USES_QCOM_LIBS := true
+BOARD_USES_QCOM_LIBRPC := true
BOARD_USE_OPENSSL_ENGINE := true
BOARD_USE_FROYO_LIBCAMERA := true
BOARD_USE_REVERSE_FFC := true
+# to enable the GPS HAL
BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := leo
+# AMSS version to use for GPS
BOARD_VENDOR_QCOM_GPS_LOC_API_AMSS_VERSION := 1240
# Use RGB565 surfaces until userspace drivers are upgraded
View
11 extract-files.sh
@@ -29,6 +29,7 @@ adb pull /system/etc/AdieHWCodecSetting.csv ../../../vendor/$MANUFACTURER/$DEVIC
adb pull /system/etc/firmware/BCM4329B1_002.002.023.0360.0362.hcd ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/BCM4329B1_002.002.023.0360.0362.hcd
adb pull /system/etc/firmware/BCM4329B1_002.002.023.0436.0439.hcd ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/BCM4329B1_002.002.023.0436.0439.hcd
adb pull /system/etc/firmware/BCM4329B1_002.002.023.0436.0439.hcd ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/BCM4329B1_002.002.023.0436.0439.hcd
+adb pull /system/etc/firmware/BCM4329B1_002.002.023.0511.0538.hcd ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/BCM4329B1_002.002.023.0511.0538.hcd
adb pull /system/etc/firmware/bcm4329.hcd ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/bcm4329.hcd
adb pull /system/etc/firmware/htcleo.acdb ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/htcleo.acdb
adb pull /system/etc/firmware/default.acdb ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/default.acdb
@@ -40,7 +41,6 @@ adb pull /system/lib/egl/libGLESv2_adreno200.so ../../../vendor/$MANUFACTURER/$D
adb pull /system/lib/egl/libq3dtools_adreno200.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libq3dtools_adreno200.so
adb pull /system/lib/libcamera.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libcamera.so
adb pull /system/lib/libgsl.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libgsl.so
-adb pull /system/lib/libgps.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libgps.so
adb pull /system/lib/libhtc_acoustic.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libhtc_acoustic.so
adb pull /system/lib/libhtc_ril.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libhtc_ril.so
adb pull /system/lib/libhtc_ril_wrapper.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libhtc_ril_wrapper.so
@@ -49,6 +49,9 @@ adb pull /system/lib/libOmxVdec.so ../../../vendor/$MANUFACTURER/$DEVICE/proprie
adb pull /system/lib/libOmxVidEnc.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libOmxVidEnc.so
adb pull /system/lib/libOmxCore.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libOmxCore.so
adb pull /system/lib/libmm-omxcore.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libmm-omxcore.so
+adb pull /system/lib/libgps.so ..h/../../vendor/$MANUFACTURER/$DEVICE/proprietary/libgps.so
+adb pull /system/lib/hw/gps.htcleo.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/gps.htcleo.so
+adb pull /system/lib/hw/sensors.bravo.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/sensors.bravo.so
(cat << EOF) | sed s/__DEVICE__/$DEVICE/g | sed s/__MANUFACTURER__/$MANUFACTURER/g > ../../../vendor/$MANUFACTURER/$DEVICE/device-vendor-blobs.mk
# Copyright (C) 2010 The Android Open Source Project
@@ -81,6 +84,7 @@ PRODUCT_COPY_FILES += \\
vendor/__MANUFACTURER__/__DEVICE__/proprietary/BCM4329B1_002.002.023.0360.0362.hcd:system/etc/firmware/BCM4329B1_002.002.023.0360.0362.hcd \\
vendor/__MANUFACTURER__/__DEVICE__/proprietary/BCM4329B1_002.002.023.0436.0439.hcd:system/etc/firmware/BCM4329B1_002.002.023.0436.0439.hcd \\
vendor/__MANUFACTURER__/__DEVICE__/proprietary/BCM4329B1_002.002.023.0511.0538.hcd:system/etc/firmware/BCM4329B1_002.002.023.0511.0538.hcd \\
+vendor/__MANUFACTURER__/__DEVICE__/proprietary/htcleo.acdb:system/etc/firmware/htcleo.acdb \\
vendor/__MANUFACTURER__/__DEVICE__/proprietary/bcm4329.hcd:system/etc/firmware/bcm4329.hcd \\
vendor/__MANUFACTURER__/__DEVICE__/proprietary/htcleo.acdb:system/etc/firmware/htcleo.acdb \\
vendor/__MANUFACTURER__/__DEVICE__/proprietary/default.acdb:system/etc/firmware/default.acdb \\
@@ -96,11 +100,12 @@ PRODUCT_COPY_FILES += \\
vendor/__MANUFACTURER__/__DEVICE__/proprietary/libhtc_ril.so:system/lib/libhtc_ril.so \\
vendor/__MANUFACTURER__/__DEVICE__/proprietary/libhtc_ril_wrapper.so:system/lib/libhtc_ril_wrapper.so \\
vendor/__MANUFACTURER__/__DEVICE__/proprietary/liboemcamera.so:system/lib/liboemcamera.so \\
- vendor/__MANUFACTURER__/__DEVICE__/proprietary/libgps.so:system/lib/libgps.so \\
vendor/__MANUFACTURER__/__DEVICE__/proprietary/libOmxVdec.so:system/lib/libOmxVdec.so \\
vendor/__MANUFACTURER__/__DEVICE__/proprietary/libOmxVidEnc.so:system/lib/libOmxVidEnc.so \\
vendor/__MANUFACTURER__/__DEVICE__/proprietary/libOmxCore.so:system/lib/libOmxCore.so \\
- vendor/__MANUFACTURER__/__DEVICE__/proprietary/libmm-omxcore.so:system/lib/libmm-omxcore.so \\
+ vendor/__MANUFACTURER__/__DEVICE__/proprietary/libgps.so:system/lib/libgps.so \\
+ vendor/__MANUFACTURER__/__DEVICE__/proprietary/gps.htcleo.so:system/lib/hw/gps.htcleo.so \\
+ vendor/__MANUFACTURER__/__DEVICE__/proprietary/sensors.bravo.so:system/lib/hw/sensors.bravo.so \\
EOF
./setup-makefiles.sh
View
BIN initrd.gz
Binary file not shown.
View
1 leo.mk
@@ -109,6 +109,7 @@ PRODUCT_PACKAGES += \
librs_jni \
gralloc.qsd8k \
copybit.qsd8k \
+ lights.leo \
leo-reference-ril \
gps.leo
View
57 overlay/frameworks/base/core/res/res/values/config.xml
@@ -20,6 +20,13 @@
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
+
+ <!-- Flag indicating whether the surface flinger has limited
+ alpha compositing functionality in hardware. If set, the window
+ manager will disable alpha trasformation in animations where not
+ strictly needed. -->
+ <bool name="config_sf_limitedAlpha">true</bool>
+
<!-- Flag indicating whether we should enable the automatic brightness in Settings.
config_hardware_automatic_brightness_available is not set, so we will use software implementation -->
<bool name="config_automatic_brightness_available">true</bool>
@@ -39,36 +46,51 @@
Zone N: array[N - 1] <= LUX < array[N]
Zone N + 1: array[N] <= LUX < infinity
- Must be overridden in platform specific overlays -->
+ Must be overridden in platform specific overlays -->
<integer-array name="config_autoBrightnessLevels">
- <item>200</item>
- <item>400</item>
- <item>1000</item>
- <item>3000</item>
+ <item>11</item>
+ <item>41</item>
+ <item>91</item>
+ <item>161</item>
+ <item>226</item>
+ <item>321</item>
+ <item>641</item>
+ <item>1281</item>
+ <item>2601</item>
</integer-array>
<!-- Array of output values for LCD backlight corresponding to the LUX values
in the config_autoBrightnessLevels array. This array should have size one greater
than the size of the config_autoBrightnessLevels array.
-->
<integer-array name="config_autoBrightnessLcdBacklightValues">
- <item>35</item>
- <item>55</item>
- <item>70</item>
- <item>70</item>
- <item>250</item>
+ <item>89</item>
+ <item>89</item>
+ <item>126</item>
+ <item>164</item>
+ <item>164</item>
+ <item>164</item>
+ <item>187</item>
+ <item>210</item>
+ <item>233</item>
+ <item>255</item>
</integer-array>
<!-- Array of output values for button backlight corresponding to the LUX values
in the config_autoBrightnessLevels array. This array should have size one greater
than the size of the config_autoBrightnessLevels array.
-->
- <integer-array name="config_autoBrightnessButtonBacklightValues">
+ <integer-array name="config_autoBrightnessButtonBacklightValues">
+ <item>255</item>
+ <item>255</item>
<item>255</item>
<item>255</item>
<item>0</item>
<item>0</item>
<item>0</item>
+ <item>0</item>
+ <item>0</item>
+ <item>0</item>
</integer-array>
<!-- Array of output values for keyboard backlight corresponding to the LUX values
@@ -139,8 +161,17 @@
Wifi interfaces. If the device doesn't want to support tethering over Wifi this
should be empty. An example would be "softap.*" -->
<string-array translatable="false" name="config_tether_wifi_regexs">
+ <item>"rmnet\\d"</item>
<item>"wl0.1"</item>
</string-array>
+ <string-array translatable="false" name="config_tether_usb_regexs">
+ <item>"usb0"</item>
+ </string-array>
+
+ <!-- Vibrator pattern for a very short but reliable vibration for soft keyboard tap -->
+ <integer-array name="config_keyboardTapVibePattern">
+ <item>30</item>
+ </integer-array>
<!-- Boolean indicating if we require the use of DUN on mobile for tethering -->
@@ -151,4 +182,8 @@
<item>30</item>
</integer-array>
+ <!-- Enable use of power animations -->
+ <bool name="config_animateScreenLights">false</bool>
+
+
</resources>
View
5 overlay/packages/apps/CMParts/res/values/config.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <!-- Whether or not to display the trackball settings -->
+ <bool name="has_trackball">false</bool>
+</resources>
View
6 overlay/packages/apps/Phone/res/values/config.xml
@@ -19,7 +19,7 @@
<!-- Enable the onscreen touch UI for all states of the in-call UI. -->
<bool name="allow_incoming_call_touch_ui">true</bool>
- <bool name="allow_in_call_touch_ui">true</bool>
+ <bool name="allow_in_call_touch_ui">false</bool>
<!-- This is a device with capacitive buttons, so disable the feature
where BACK rejects the current incoming call. (Since it's so
@@ -34,8 +34,4 @@
AudioHardware::setMicMute(bool state) and AudioHardware::getMicMute(bool* state)
so microphone muting calls should be routed through the AudioManager API. -->
<bool name="send_mic_mute_to_AudioManager">true</bool>
-
- <!-- This device implements a noise suppression device for in call audio-->
- <bool name="has_in_call_noise_suppression">true</bool>
-
</resources>
View
42 tools/Android.mk
@@ -0,0 +1,42 @@
+# Copyright (C) 2009 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.
+
+ifeq ($(TARGET_DEVICE),bravo)
+ifneq ($(BUILD_TINY_ANDROID),true)
+
+LOCAL_PATH:= $(call my-dir)
+
+#
+# btconfig
+#
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES:= btconfig.c
+
+LOCAL_C_INCLUDES := \
+ system/bluetooth/bluedroid/include \
+ system/bluetooth/bluez-clean-headers
+
+LOCAL_SHARED_LIBRARIES := \
+ libbluedroid
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
+LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE:= btconfig
+
+include $(BUILD_EXECUTABLE)
+
+endif # not BUILD_TINY_ANDROID
+endif # TARGET_DEVICE
View
0 tools/MODULE_LICENSE_APACHE2
No changes.
View
190 tools/NOTICE
@@ -0,0 +1,190 @@
+
+ Copyright (c) 2009, 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.
+
+ 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.
+
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
View
246 tools/btconfig.c
@@ -0,0 +1,246 @@
+/*
+ * Copyright (C) 2009 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.
+ */
+
+/** Bluetooth configuration for Bravo (debug only) */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <sys/uio.h>
+#include <unistd.h>
+
+#include <bluetooth/bluetooth.h>
+#include <bluetooth/hci.h>
+#include <bluetooth/hci_lib.h>
+#include <bluetooth/sco.h>
+
+#include <bluedroid/bluetooth.h>
+
+static void usage(void);
+
+int vendor_sleep(int fd) {
+ unsigned char hci_sleep_cmd[] = {
+ 0x01, // HCI command packet
+ 0x27, 0xfc, // HCI_Set_Sleep_Mode_Param
+ 0x0c, // 12 arguments
+ 0x01, // ??
+ 0x01, // idle threshold Host (x300ms)
+ 0x01, // idle threadhold HC (x300ms)
+ 0x01, // WAKE active high
+ 0x01, // HOST_WAKE active high
+ 0x01, // Allow host sleep during SCO
+ 0x01, // Combine sleep mode and LPM
+ 0x00, // Enable tristate control of uart TX
+ 0x00, 0x00, 0x00, 0x00,
+ };
+
+ int ret = write(fd, hci_sleep_cmd, sizeof(hci_sleep_cmd));
+ if (ret < 0) {
+ printf("write(): %s (%d)]\n", strerror(errno), errno);
+ return -1;
+ } else if (ret != sizeof(hci_sleep_cmd)) {
+ printf("write(): unexpected length %d\n", ret);
+ return -1;
+ }
+ return 0;
+}
+
+int vendor_high_priority(int fd, unsigned char acl) {
+ unsigned char hci_sleep_cmd[] = {
+ 0x01, // HCI command packet
+ 0x57, 0xfc, // HCI_Write_High_Priority_Connection
+ 0x02, // Length
+ 0x00, 0x00 // Handle
+ };
+
+ hci_sleep_cmd[4] = acl;
+
+ int ret = write(fd, hci_sleep_cmd, sizeof(hci_sleep_cmd));
+ if (ret < 0) {
+ printf("write(): %s (%d)]\n", strerror(errno), errno);
+ return -1;
+ } else if (ret != sizeof(hci_sleep_cmd)) {
+ printf("write(): unexpected length %d\n", ret);
+ return -1;
+ }
+ return 0;
+}
+
+int get_hci_sock() {
+ int sock = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);
+ struct sockaddr_hci addr;
+ int opt;
+
+ if(sock < 0) {
+ printf("Can't create raw socket!\n");
+ return -1;
+ }
+
+ opt = 1;
+ printf("Setting data direction.\n");
+ if (setsockopt(sock, SOL_HCI, HCI_DATA_DIR, &opt, sizeof(opt)) < 0) {
+ printf("Error setting data direction\n");
+ return -1;
+ }
+
+ /* Bind socket to the HCI device */
+ addr.hci_family = AF_BLUETOOTH;
+ addr.hci_dev = 0; // hci0
+ printf("Binding to HCI device.\n");
+ if(bind(sock, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
+ printf("Can't attach to device hci0. %s(%d)\n",
+ strerror(errno),
+ errno);
+ return -1;
+ }
+ return sock;
+}
+
+static int get_acl_handle(int fd, bdaddr_t bdaddr) {
+ int i;
+ int ret = -1;
+ struct hci_conn_list_req *conn_list;
+ struct hci_conn_info *conn_info;
+ int max_conn = 10;
+
+ conn_list = malloc(max_conn * (
+ sizeof(struct hci_conn_list_req) + sizeof(struct hci_conn_info)));
+ if (!conn_list) {
+ printf("Out of memory in %s\n", __FUNCTION__);
+ return -1;
+ }
+
+ conn_list->dev_id = 0; /* hardcoded to HCI device 0 */
+ conn_list->conn_num = max_conn;
+
+ if (ioctl(fd, HCIGETCONNLIST, (void *)conn_list)) {
+ printf("Failed to get connection list\n");
+ goto out;
+ }
+
+ for (i=0; i < conn_list->conn_num; i++) {
+ conn_info = &conn_list->conn_info[i];
+ if (conn_info->type == ACL_LINK &&
+ !memcmp((void *)&conn_info->bdaddr, (void *)&bdaddr,
+ sizeof(bdaddr_t))) {
+ ret = conn_info->handle;
+ goto out;
+ }
+ }
+ ret = 0;
+
+out:
+ free(conn_list);
+ return ret;
+}
+
+static int do_sleep(int argc, char **argv) {
+ int ret;
+ int sock = get_hci_sock();
+
+ if (sock < 0)
+ return sock;
+
+ ret = vendor_sleep(sock);
+ close(sock);
+
+ return ret;
+}
+
+static int do_high_priority(int argc, char **argv) {
+ int ret;
+ int sock = get_hci_sock();
+ unsigned char acl;
+
+ if (sock < 0)
+ return sock;
+
+ if (argc != 1) {
+ usage();
+ return -1;
+ }
+
+ acl = (unsigned char)atoi(argv[0]);
+
+ ret = vendor_high_priority(sock, acl);
+ close(sock);
+
+ return ret;
+}
+
+static int do_high_priority_address(int argc, char **argv) {
+ int ret;
+ int sock = get_hci_sock();
+ unsigned char acl;
+ bdaddr_t bdaddr;
+
+ if (sock < 0)
+ return sock;
+
+ if (argc != 1) {
+ usage();
+ return -1;
+ }
+
+ str2ba(argv[0], &bdaddr);
+
+ ret = get_acl_handle(sock, bdaddr);
+ if (ret < 0) goto out;
+
+ ret = vendor_high_priority(sock, ret);
+
+out:
+ close(sock);
+
+ return ret;
+}
+
+struct {
+ char *name;
+ int (*ptr)(int argc, char **argv);
+} function_table[] = {
+ {"sleep", do_sleep},
+ {"pri", do_high_priority},
+ {"pri_addr", do_high_priority_address},
+ {"", do_sleep},
+ {NULL, NULL},
+};
+
+static void usage() {
+ int i;
+
+ printf("Usage:\n");
+ for (i = 0; function_table[i].name; i++) {
+ printf("\tbtconfig %s\n", function_table[i].name);
+ }
+}
+
+int main(int argc, char **argv) {
+ int i;
+
+ if (argc < 2) {
+ usage();
+ return -1;
+ }
+ for (i = 0; function_table[i].name; i++) {
+ if (!strcmp(argv[1], function_table[i].name)) {
+ printf("%s\n", function_table[i].name);
+ return (*function_table[i].ptr)(argc - 2, &argv[2]);
+ }
+ }
+ usage();
+ return -1;
+}
View
0 zImage 100755 → 100644
File mode changed.

0 comments on commit ab98a80

Please sign in to comment.