From 87efd3f274564ba53f4956f99766262acd04db30 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Sun, 8 Jan 2012 10:19:03 +0000 Subject: Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: I2e1c43800c19b718cc7ee94ec299c62bc14873b4 --- audio/audio_hw.c | 22 +++++++++++----------- audio/ril_interface.c | 10 +++++----- liblight/lights.c | 8 ++++---- libsensors/SamsungSensorBase.cpp | 4 ++-- libsensors/sensors.cpp | 10 +++++----- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/audio/audio_hw.c b/audio/audio_hw.c index 4ac2e60..ba5280d 100755 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -607,7 +607,7 @@ static int set_route_by_array(struct mixer *mixer, struct route_setting *route, static int start_call(struct tuna_audio_device *adev) { - LOGE("Opening modem PCMs"); + ALOGE("Opening modem PCMs"); pcm_config_vx.rate = adev->wb_amr ? VX_WB_SAMPLING_RATE : VX_NB_SAMPLING_RATE; @@ -615,7 +615,7 @@ static int start_call(struct tuna_audio_device *adev) if (adev->pcm_modem_dl == NULL) { adev->pcm_modem_dl = pcm_open(0, PORT_MODEM, PCM_OUT, &pcm_config_vx); if (!pcm_is_ready(adev->pcm_modem_dl)) { - LOGE("cannot open PCM modem DL stream: %s", pcm_get_error(adev->pcm_modem_dl)); + ALOGE("cannot open PCM modem DL stream: %s", pcm_get_error(adev->pcm_modem_dl)); goto err_open_dl; } } @@ -623,7 +623,7 @@ static int start_call(struct tuna_audio_device *adev) if (adev->pcm_modem_ul == NULL) { adev->pcm_modem_ul = pcm_open(0, PORT_MODEM, PCM_IN, &pcm_config_vx); if (!pcm_is_ready(adev->pcm_modem_ul)) { - LOGE("cannot open PCM modem UL stream: %s", pcm_get_error(adev->pcm_modem_ul)); + ALOGE("cannot open PCM modem UL stream: %s", pcm_get_error(adev->pcm_modem_ul)); goto err_open_ul; } } @@ -645,7 +645,7 @@ err_open_dl: static void end_call(struct tuna_audio_device *adev) { - LOGE("Closing modem PCMs"); + ALOGE("Closing modem PCMs"); pcm_stop(adev->pcm_modem_dl); pcm_stop(adev->pcm_modem_ul); @@ -867,7 +867,7 @@ static void force_all_standby(struct tuna_audio_device *adev) static void select_mode(struct tuna_audio_device *adev) { if (adev->mode == AUDIO_MODE_IN_CALL) { - LOGE("Entering IN_CALL state, in_call=%d", adev->in_call); + ALOGE("Entering IN_CALL state, in_call=%d", adev->in_call); if (!adev->in_call) { force_all_standby(adev); /* force earpiece route for in call state if speaker is the @@ -891,7 +891,7 @@ static void select_mode(struct tuna_audio_device *adev) adev->in_call = 1; } } else { - LOGE("Leaving IN_CALL state, in_call=%d, mode=%d", + ALOGE("Leaving IN_CALL state, in_call=%d, mode=%d", adev->in_call, adev->mode); if (adev->in_call) { adev->in_call = 0; @@ -1125,7 +1125,7 @@ static int start_output_stream(struct tuna_stream_out *out) out->pcm = pcm_open(card, port, PCM_OUT | PCM_MMAP | PCM_NOIRQ, &out->config); if (!pcm_is_ready(out->pcm)) { - LOGE("cannot open pcm_out driver: %s", pcm_get_error(out->pcm)); + ALOGE("cannot open pcm_out driver: %s", pcm_get_error(out->pcm)); pcm_close(out->pcm); adev->active_output = NULL; return -ENOMEM; @@ -1570,7 +1570,7 @@ static int start_input_stream(struct tuna_stream_in *in) /* this assumes routing is done previously */ in->pcm = pcm_open(0, PORT_MM2_UL, PCM_IN, &in->config); if (!pcm_is_ready(in->pcm)) { - LOGE("cannot open pcm_in driver: %s", pcm_get_error(in->pcm)); + ALOGE("cannot open pcm_in driver: %s", pcm_get_error(in->pcm)); pcm_close(in->pcm); adev->active_input = NULL; return -ENOMEM; @@ -1894,7 +1894,7 @@ static int get_next_buffer(struct resampler_buffer_provider *buffer_provider, in->config.period_size * audio_stream_frame_size(&in->stream.common)); if (in->read_status != 0) { - LOGE("get_next_buffer() pcm_read error %d", in->read_status); + ALOGE("get_next_buffer() pcm_read error %d", in->read_status); buffer->raw = NULL; buffer->frame_count = 0; return in->read_status; @@ -2542,7 +2542,7 @@ static int adev_open(const hw_module_t* module, const char* name, adev->mixer = mixer_open(0); if (!adev->mixer) { free(adev); - LOGE("Unable to open the mixer, aborting."); + ALOGE("Unable to open the mixer, aborting."); return -EINVAL; } @@ -2597,7 +2597,7 @@ static int adev_open(const hw_module_t* module, const char* name, !adev->mixer_ctls.earpiece_volume) { mixer_close(adev->mixer); free(adev); - LOGE("Unable to locate all mixer controls, aborting."); + ALOGE("Unable to locate all mixer controls, aborting."); return -EINVAL; } diff --git a/audio/ril_interface.c b/audio/ril_interface.c index cee6452..3d7ce06 100755 --- a/audio/ril_interface.c +++ b/audio/ril_interface.c @@ -71,7 +71,7 @@ static int ril_connect_if_required(struct ril_handle *ril) return 0; if (_ril_connect(ril->client) != RIL_CLIENT_ERR_SUCCESS) { - LOGE("ril_connect() failed"); + ALOGE("ril_connect() failed"); return -1; } @@ -93,7 +93,7 @@ int ril_open(struct ril_handle *ril) ril->handle = dlopen(RIL_CLIENT_LIBPATH, RTLD_NOW); if (!ril->handle) { - LOGE("Cannot open '%s'", RIL_CLIENT_LIBPATH); + ALOGE("Cannot open '%s'", RIL_CLIENT_LIBPATH); return -1; } @@ -112,14 +112,14 @@ int ril_open(struct ril_handle *ril) if (!_ril_open_client || !_ril_close_client || !_ril_connect || !_ril_is_connected || !_ril_disconnect || !_ril_set_call_volume || !_ril_set_call_audio_path || !_ril_register_unsolicited_handler) { - LOGE("Cannot get symbols from '%s'", RIL_CLIENT_LIBPATH); + ALOGE("Cannot get symbols from '%s'", RIL_CLIENT_LIBPATH); dlclose(ril->handle); return -1; } ril->client = _ril_open_client(); if (!ril->client) { - LOGE("ril_open_client() failed"); + ALOGE("ril_open_client() failed"); dlclose(ril->handle); return -1; } @@ -145,7 +145,7 @@ int ril_close(struct ril_handle *ril) if ((_ril_disconnect(ril->client) != RIL_CLIENT_ERR_SUCCESS) || (_ril_close_client(ril->client) != RIL_CLIENT_ERR_SUCCESS)) { - LOGE("ril_disconnect() or ril_close_client() failed"); + ALOGE("ril_disconnect() or ril_close_client() failed"); return -1; } diff --git a/liblight/lights.c b/liblight/lights.c index 52bce3f..ff8b28e 100644 --- a/liblight/lights.c +++ b/liblight/lights.c @@ -65,7 +65,7 @@ static int write_int(char const *path, int value) return amt == -1 ? -errno : 0; } else { if (already_warned == 0) { - LOGE("write_int failed to open %s\n", path); + ALOGE("write_int failed to open %s\n", path); already_warned = 1; } return -errno; @@ -115,15 +115,15 @@ static int write_leds(struct an30259a_pr_control *led) if (fd >= 0) { err = ioctl(fd, AN30259A_PR_SET_IMAX, &imax); if (err) - LOGE("failed to set imax"); + ALOGE("failed to set imax"); err = ioctl(fd, AN30259A_PR_SET_LED, led); if (err < 0) - LOGE("failed to set leds!"); + ALOGE("failed to set leds!"); close(fd); } else { - LOGE("failed to open %s!", LED_FILE); + ALOGE("failed to open %s!", LED_FILE); err = -errno; } diff --git a/libsensors/SamsungSensorBase.cpp b/libsensors/SamsungSensorBase.cpp index 0ec4915..fe3f14e 100644 --- a/libsensors/SamsungSensorBase.cpp +++ b/libsensors/SamsungSensorBase.cpp @@ -70,13 +70,13 @@ SamsungSensorBase::SamsungSensorBase(const char *dev_name, return; mInputSysfsEnable = makeSysfsName(input_name, "enable"); if (!mInputSysfsEnable) { - LOGE("%s: unable to allocate mem for %s:enable", __func__, + ALOGE("%s: unable to allocate mem for %s:enable", __func__, data_name); return; } mInputSysfsPollDelay = makeSysfsName(input_name, "poll_delay"); if (!mInputSysfsPollDelay) { - LOGE("%s: unable to allocate mem for %s:poll_delay", __func__, + ALOGE("%s: unable to allocate mem for %s:poll_delay", __func__, data_name); return; } diff --git a/libsensors/sensors.cpp b/libsensors/sensors.cpp index 85e3bc1..2a33731 100644 --- a/libsensors/sensors.cpp +++ b/libsensors/sensors.cpp @@ -215,7 +215,7 @@ sensors_poll_context_t::sensors_poll_context_t() int wakeFds[2]; int result = pipe(wakeFds); - LOGE_IF(result<0, "error creating wake pipe (%s)", strerror(errno)); + ALOGE_IF(result<0, "error creating wake pipe (%s)", strerror(errno)); fcntl(wakeFds[0], F_SETFL, O_NONBLOCK); fcntl(wakeFds[1], F_SETFL, O_NONBLOCK); mWritePipeFd = wakeFds[1]; @@ -249,7 +249,7 @@ int sensors_poll_context_t::activate(int handle, int enabled) if (!err) { const char wakeMessage(WAKE_MESSAGE); int result = write(mWritePipeFd, &wakeMessage, 1); - LOGE_IF(result<0, "error sending wake message (%s)", strerror(errno)); + ALOGE_IF(result<0, "error sending wake message (%s)", strerror(errno)); } return err; } @@ -306,14 +306,14 @@ int sensors_poll_context_t::pollEvents(sensors_event_t* data, int count) n = poll(mPollFds, numFds, nbEvents ? 0 : polltime); } while (n < 0 && errno == EINTR); if (n<0) { - LOGE("poll() failed (%s)", strerror(errno)); + ALOGE("poll() failed (%s)", strerror(errno)); return -errno; } if (mPollFds[wake].revents & POLLIN) { char msg; int result = read(mPollFds[wake].fd, &msg, 1); - LOGE_IF(result<0, "error reading from wake pipe (%s)", strerror(errno)); - LOGE_IF(msg != WAKE_MESSAGE, "unknown message on wake queue (0x%02x)", int(msg)); + ALOGE_IF(result<0, "error reading from wake pipe (%s)", strerror(errno)); + ALOGE_IF(msg != WAKE_MESSAGE, "unknown message on wake queue (0x%02x)", int(msg)); mPollFds[wake].revents = 0; } if(mPollFds[mpl_power].revents & POLLIN) { -- cgit v1.1