From 78266b3169fedd14217fe68ecb5bc6a4513b280c Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Mon, 2 Mar 2009 22:54:47 -0800 Subject: auto import from //depot/cupcake/@137055 --- bluedroid/bluetooth.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/bluedroid/bluetooth.c b/bluedroid/bluetooth.c index b96b8a8..ed6b52e 100644 --- a/bluedroid/bluetooth.c +++ b/bluedroid/bluetooth.c @@ -146,17 +146,6 @@ static inline int create_hci_sock() { return sk; } -/* TODO: Remove this once legacy hciattach is removed */ -static const char * get_hciattach_script() { - if (access("/dev/ttyHS0", F_OK)) { - LOGD("Using legacy uart driver (115200 bps)"); - return "hciattach_legacy"; - } else { - LOGD("Using high speed uart driver (4 Mbps)"); - return "hciattach"; - } -} - int bt_enable() { LOGV(__FUNCTION__); @@ -167,7 +156,7 @@ int bt_enable() { if (set_bluetooth_power(1) < 0) goto out; LOGI("Starting hciattach daemon"); - if (property_set("ctl.start", get_hciattach_script()) < 0) { + if (property_set("ctl.start", "hciattach") < 0) { LOGE("Failed to start hciattach"); goto out; } @@ -221,7 +210,7 @@ int bt_disable() { ioctl(hci_sock, HCIDEVDOWN, HCI_DEV_ID); LOGI("Stopping hciattach deamon"); - if (property_set("ctl.stop", get_hciattach_script()) < 0) { + if (property_set("ctl.stop", "hciattach") < 0) { LOGE("Error stopping hciattach"); goto out; } -- cgit v1.2.3