diff options
| author | Matthew Xie <mattx@google.com> | 2012-04-07 04:41:39 -0700 |
|---|---|---|
| committer | Matthew Xie <mattx@google.com> | 2012-07-14 11:19:23 -0700 |
| commit | 595bced8e7c280e37a75b9bf9c1f36263434041c (patch) | |
| tree | b5edc7d472aa7ce62cf8204646c9c569da547945 /stack | |
| parent | 2c79674ef766378464559c8645c74db5687280a9 (diff) | |
| download | external_bluetooth_bluedroid-595bced8e7c280e37a75b9bf9c1f36263434041c.zip external_bluetooth_bluedroid-595bced8e7c280e37a75b9bf9c1f36263434041c.tar.gz external_bluetooth_bluedroid-595bced8e7c280e37a75b9bf9c1f36263434041c.tar.bz2 | |
replace logx with alogx
Conflicts:
btif/src/btif_core.c
btif/src/btif_dm.c
btif/src/btif_hh.c
btif/src/btif_sock.c
gki/ulinux/gki_ulinux.c
hci/include/bt_hci_bdroid.h
hci/src/bt_hci_bdroid.c
hci/src/btsnoop.c
hci/src/hci_h4.c
hci/src/userial.c
vendor/libvendor/src/hardware.c
vendor/libvendor/src/upio.c
Diffstat (limited to 'stack')
| -rw-r--r-- | stack/btu/btu_hcif.c | 10 | ||||
| -rw-r--r-- | stack/rfcomm/port_api.c | 8 | ||||
| -rw-r--r-- | stack/rfcomm/port_utils.c | 8 |
3 files changed, 13 insertions, 13 deletions
diff --git a/stack/btu/btu_hcif.c b/stack/btu/btu_hcif.c index a4b1888..ebacf93 100644 --- a/stack/btu/btu_hcif.c +++ b/stack/btu/btu_hcif.c @@ -1515,11 +1515,11 @@ void btu_hcif_cmd_timeout (UINT8 controller_id) // btla-specific ++ #if (defined(ANDROID_APP_INCLUDED) && (ANDROID_APP_INCLUDED == TRUE)) - LOGE("######################################################################"); - LOGE("#"); - LOGE("# WARNING : BTU HCI(id=%d) command timeout. opcode=0x%x", controller_id, opcode); - LOGE("#"); - LOGE("######################################################################"); + ALOGE("######################################################################"); + ALOGE("#"); + ALOGE("# WARNING : BTU HCI(id=%d) command timeout. opcode=0x%x", controller_id, opcode); + ALOGE("#"); + ALOGE("######################################################################"); #else BT_TRACE_2 (TRACE_LAYER_HCI, TRACE_TYPE_WARNING, "BTU HCI(id=%d) command timeout. opcode=0x%x", controller_id, opcode); #endif diff --git a/stack/rfcomm/port_api.c b/stack/rfcomm/port_api.c index 50da558..1290ff9 100644 --- a/stack/rfcomm/port_api.c +++ b/stack/rfcomm/port_api.c @@ -25,10 +25,10 @@ #define PORT_BREAK_DURATION 1 #include <cutils/log.h> -#define info(fmt, ...) LOGI ("%s: " fmt,__FUNCTION__, ## __VA_ARGS__) -#define debug(fmt, ...) LOGD ("%s: " fmt,__FUNCTION__, ## __VA_ARGS__) -#define error(fmt, ...) LOGE ("## ERROR : %s: " fmt "##",__FUNCTION__, ## __VA_ARGS__) -#define asrt(s) if(!(s)) LOGE ("## %s assert %s failed at line:%d ##",__FUNCTION__, #s, __LINE__) +#define info(fmt, ...) ALOGI ("%s: " fmt,__FUNCTION__, ## __VA_ARGS__) +#define debug(fmt, ...) ALOGD ("%s: " fmt,__FUNCTION__, ## __VA_ARGS__) +#define error(fmt, ...) ALOGE ("## ERROR : %s: " fmt "##",__FUNCTION__, ## __VA_ARGS__) +#define asrt(s) if(!(s)) ALOGE ("## %s assert %s failed at line:%d ##",__FUNCTION__, #s, __LINE__) /******************************************************************************* ** diff --git a/stack/rfcomm/port_utils.c b/stack/rfcomm/port_utils.c index 6800b46..3de9ec0 100644 --- a/stack/rfcomm/port_utils.c +++ b/stack/rfcomm/port_utils.c @@ -21,10 +21,10 @@ #include "btu.h" #include <cutils/log.h> -#define info(fmt, ...) LOGI ("%s: " fmt,__FUNCTION__, ## __VA_ARGS__) -#define debug(fmt, ...) LOGD ("%s: " fmt,__FUNCTION__, ## __VA_ARGS__) -#define error(fmt, ...) LOGE ("## ERROR : %s: " fmt "##",__FUNCTION__, ## __VA_ARGS__) -#define asrt(s) if(!(s)) LOGE ("## %s assert %s failed at line:%d ##",__FUNCTION__, #s, __LINE__) +#define info(fmt, ...) ALOGI ("%s: " fmt,__FUNCTION__, ## __VA_ARGS__) +#define debug(fmt, ...) ALOGD ("%s: " fmt,__FUNCTION__, ## __VA_ARGS__) +#define error(fmt, ...) ALOGE ("## ERROR : %s: " fmt "##",__FUNCTION__, ## __VA_ARGS__) +#define asrt(s) if(!(s)) ALOGE ("## %s assert %s failed at line:%d ##",__FUNCTION__, #s, __LINE__) static const tPORT_STATE default_port_pars = |