tequilaOS/platform_hardware_libhardware
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

Browse source 
See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: I0cbe865d464a37365fa3be84948b07e5a0d181d0
This commit is contained in:
Steve Block 2012-01-08 10:17:53 +00:00
parent f678d47450
commit 60d056bf29
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hardware.c
View file

@ -74,7 +74,7 @@ static int load(const char *id,
handle = dlopen(path, RTLD_NOW);
if (handle == NULL) {
char const *err_str = dlerror();
LOGE("load: module=%s\n%s", path, err_str?err_str:"unknown");
ALOGE("load: module=%s\n%s", path, err_str?err_str:"unknown");
status = -EINVAL;
goto done;
}
@ -83,14 +83,14 @@ static int load(const char *id,
const char *sym = HAL_MODULE_INFO_SYM_AS_STR;
hmi = (struct hw_module_t *)dlsym(handle, sym);
if (hmi == NULL) {
LOGE("load: couldn't find symbol %s", sym);
ALOGE("load: couldn't find symbol %s", sym);
status = -EINVAL;
goto done;
}
/* Check that the id matches */
if (strcmp(id, hmi->id) != 0) {
LOGE("load: id=%s != hmi->id=%s", id, hmi->id);
ALOGE("load: id=%s != hmi->id=%s", id, hmi->id);
status = -EINVAL;
goto done;
}

4
modules/gralloc/framebuffer.cpp
View file

@ -98,7 +98,7 @@ static int fb_post(struct framebuffer_device_t* dev, buffer_handle_t buffer)
m->info.activate = FB_ACTIVATE_VBL;
m->info.yoffset = offset / m->finfo.line_length;
if (ioctl(m->framebuffer->fd, FBIOPUT_VSCREENINFO, &m->info) == -1) {
LOGE("FBIOPUT_VSCREENINFO failed");
ALOGE("FBIOPUT_VSCREENINFO failed");
m->base.unlock(&m->base, buffer);
return -errno;
}
@ -280,7 +280,7 @@ int mapFrameBufferLocked(struct private_module_t* module)
void* vaddr = mmap(0, fbSize, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
if (vaddr == MAP_FAILED) {
LOGE("Error mapping the framebuffer (%s)", strerror(errno));
ALOGE("Error mapping the framebuffer (%s)", strerror(errno));
return -errno;
}
module->framebuffer->base = intptr_t(vaddr);

4
modules/gralloc/gralloc.cpp
View file

@ -175,7 +175,7 @@ static int gralloc_alloc_buffer(alloc_device_t* dev,
fd = ashmem_create_region("gralloc-buffer", size);
if (fd < 0) {
LOGE("couldn't create ashmem (%s)", strerror(-errno));
ALOGE("couldn't create ashmem (%s)", strerror(-errno));
err = -errno;
}
@ -189,7 +189,7 @@ static int gralloc_alloc_buffer(alloc_device_t* dev,
}
}
LOGE_IF(err, "gralloc failed err=%s", strerror(-err));
ALOGE_IF(err, "gralloc failed err=%s", strerror(-err));
return err;
}

2
modules/gralloc/gralloc_priv.h
View file

@ -101,7 +101,7 @@ struct private_handle_t {
h->numInts != sNumInts || h->numFds != sNumFds ||
hnd->magic != sMagic)
{
LOGE("invalid gralloc handle (at %p)", h);
ALOGE("invalid gralloc handle (at %p)", h);
return -EINVAL;
}
return 0;

4
modules/gralloc/mapper.cpp
View file

@ -53,7 +53,7 @@ static int gralloc_map(gralloc_module_t const* module,
void* mappedAddress = mmap(0, size,
PROT_READ|PROT_WRITE, MAP_SHARED, hnd->fd, 0);
if (mappedAddress == MAP_FAILED) {
LOGE("Could not mmap %s", strerror(errno));
ALOGE("Could not mmap %s", strerror(errno));
return -errno;
}
hnd->base = intptr_t(mappedAddress) + hnd->offset;
@ -73,7 +73,7 @@ static int gralloc_unmap(gralloc_module_t const* module,
size_t size = hnd->size;
//ALOGD("unmapping from %p, size=%d", base, size);
if (munmap(base, size) < 0) {
LOGE("Could not unmap %s", strerror(errno));
ALOGE("Could not unmap %s", strerror(errno));
}
}
hnd->base = 0;