diff options
| -rw-r--r-- | audio/A2dpAudioInterface.cpp | 6 | ||||
| -rw-r--r-- | audio/AudioHardwareInterface.cpp | 2 | ||||
| -rw-r--r-- | qemu/qemu.c | 2 | ||||
| -rw-r--r-- | wifi/wifi.c | 14 |
4 files changed, 12 insertions, 12 deletions
diff --git a/audio/A2dpAudioInterface.cpp b/audio/A2dpAudioInterface.cpp index 57c23bb..4c7351d 100644 --- a/audio/A2dpAudioInterface.cpp +++ b/audio/A2dpAudioInterface.cpp @@ -38,7 +38,7 @@ static const char *sA2dpWakeLock = "A2dpOutputStream"; // AudioHardwareInterface* hw = 0; // // hw = AudioHardwareInterface::create(); -// LOGD("new A2dpAudioInterface(hw: %p)", hw); +// ALOGD("new A2dpAudioInterface(hw: %p)", hw); // hw = new A2dpAudioInterface(hw); // return hw; //} @@ -239,7 +239,7 @@ status_t A2dpAudioInterface::A2dpAudioStreamOut::set( uint32_t lChannels = pChannels ? *pChannels : 0; uint32_t lRate = pRate ? *pRate : 0; - LOGD("A2dpAudioStreamOut::set %x, %d, %d, %d\n", device, lFormat, lChannels, lRate); + ALOGD("A2dpAudioStreamOut::set %x, %d, %d, %d\n", device, lFormat, lChannels, lRate); // fix up defaults if (lFormat == 0) lFormat = format(); @@ -448,7 +448,7 @@ status_t A2dpAudioInterface::A2dpAudioStreamOut::setAddress(const char* address) status_t A2dpAudioInterface::A2dpAudioStreamOut::setBluetoothEnabled(bool enabled) { - LOGD("setBluetoothEnabled %d", enabled); + ALOGD("setBluetoothEnabled %d", enabled); Mutex::Autolock lock(mLock); diff --git a/audio/AudioHardwareInterface.cpp b/audio/AudioHardwareInterface.cpp index 9cec267..0137435 100644 --- a/audio/AudioHardwareInterface.cpp +++ b/audio/AudioHardwareInterface.cpp @@ -83,7 +83,7 @@ AudioHardwareBase::AudioHardwareBase() status_t AudioHardwareBase::setMode(int mode) { #if LOG_ROUTING_CALLS - LOGD("setMode(%s)", displayMode(mode)); + ALOGD("setMode(%s)", displayMode(mode)); #endif if ((mode < 0) || (mode >= AudioSystem::NUM_MODES)) return BAD_VALUE; diff --git a/qemu/qemu.c b/qemu/qemu.c index 731df78..739976f 100644 --- a/qemu/qemu.c +++ b/qemu/qemu.c @@ -31,7 +31,7 @@ #define QEMU_DEBUG 0 #if QEMU_DEBUG -# define D(...) LOGD(__VA_ARGS__) +# define D(...) ALOGD(__VA_ARGS__) #else # define D(...) ((void)0) #endif diff --git a/wifi/wifi.c b/wifi/wifi.c index dd216f1..1c469bc 100644 --- a/wifi/wifi.c +++ b/wifi/wifi.c @@ -152,7 +152,7 @@ static int rmmod(const char *modname) } if (ret != 0) - LOGD("Unable to unload driver module \"%s\": %s\n", + ALOGD("Unable to unload driver module \"%s\": %s\n", modname, strerror(errno)); return ret; } @@ -673,7 +673,7 @@ int wifi_send_command(int index, const char *cmd, char *reply, size_t *reply_len } ret = wpa_ctrl_request(ctrl_conn[index], cmd, strlen(cmd), reply, reply_len, NULL); if (ret == -2) { - LOGD("'%s' command timed out.\n", cmd); + ALOGD("'%s' command timed out.\n", cmd); /* unblocks the monitor receive socket for termination */ write(exit_sockets[index][0], "T", 1); return -2; @@ -705,7 +705,7 @@ int wifi_ctrl_recv(int index, char *reply, size_t *reply_len) if (rfds[0].revents & POLLIN) { return wpa_ctrl_recv(monitor_conn[index], reply, reply_len); } else { - LOGD("Received on exit socket, terminate"); + ALOGD("Received on exit socket, terminate"); return -1; } return 0; @@ -721,7 +721,7 @@ int wifi_wait_on_socket(int index, char *buf, size_t buflen) struct timeval *tptr; if (monitor_conn[index] == NULL) { - LOGD("Connection closed\n"); + ALOGD("Connection closed\n"); strncpy(buf, WPA_EVENT_TERMINATING " - connection closed", buflen-1); buf[buflen-1] = '\0'; return strlen(buf); @@ -729,17 +729,17 @@ int wifi_wait_on_socket(int index, char *buf, size_t buflen) result = wifi_ctrl_recv(index, buf, &nread); if (result < 0) { - LOGD("wifi_ctrl_recv failed: %s\n", strerror(errno)); + ALOGD("wifi_ctrl_recv failed: %s\n", strerror(errno)); strncpy(buf, WPA_EVENT_TERMINATING " - recv error", buflen-1); buf[buflen-1] = '\0'; return strlen(buf); } buf[nread] = '\0'; - /* LOGD("wait_for_event: result=%d nread=%d string=\"%s\"\n", result, nread, buf); */ + /* ALOGD("wait_for_event: result=%d nread=%d string=\"%s\"\n", result, nread, buf); */ /* Check for EOF on the socket */ if (result == 0 && nread == 0) { /* Fabricate an event to pass up */ - LOGD("Received EOF on supplicant socket\n"); + ALOGD("Received EOF on supplicant socket\n"); strncpy(buf, WPA_EVENT_TERMINATING " - signal 0 received", buflen-1); buf[buflen-1] = '\0'; return strlen(buf); |