diff options
Diffstat (limited to 'modules/gralloc')
| -rw-r--r-- | modules/gralloc/framebuffer.cpp | 12 | ||||
| -rw-r--r-- | modules/gralloc/gralloc.cpp | 4 | ||||
| -rw-r--r-- | modules/gralloc/gralloc_priv.h | 2 | ||||
| -rw-r--r-- | modules/gralloc/mapper.cpp | 8 |
4 files changed, 13 insertions, 13 deletions
diff --git a/modules/gralloc/framebuffer.cpp b/modules/gralloc/framebuffer.cpp index 52c838b..326f2ae 100644 --- a/modules/gralloc/framebuffer.cpp +++ b/modules/gralloc/framebuffer.cpp @@ -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; } @@ -181,14 +181,14 @@ int mapFrameBufferLocked(struct private_module_t* module) if (ioctl(fd, FBIOPUT_VSCREENINFO, &info) == -1) { info.yres_virtual = info.yres; flags &= ~PAGE_FLIP; - LOGW("FBIOPUT_VSCREENINFO failed, page flipping not supported"); + ALOGW("FBIOPUT_VSCREENINFO failed, page flipping not supported"); } if (info.yres_virtual < info.yres * 2) { // we need at least 2 for page-flipping info.yres_virtual = info.yres; flags &= ~PAGE_FLIP; - LOGW("page flipping not supported (yres_virtual=%d, requested=%d)", + ALOGW("page flipping not supported (yres_virtual=%d, requested=%d)", info.yres_virtual, info.yres*2); } @@ -222,7 +222,7 @@ int mapFrameBufferLocked(struct private_module_t* module) float ydpi = (info.yres * 25.4f) / info.height; float fps = refreshRate / 1000.0f; - LOGI( "using (fd=%d)\n" + ALOGI( "using (fd=%d)\n" "id = %s\n" "xres = %d px\n" "yres = %d px\n" @@ -244,7 +244,7 @@ int mapFrameBufferLocked(struct private_module_t* module) info.blue.offset, info.blue.length ); - LOGI( "width = %d mm (%f dpi)\n" + ALOGI( "width = %d mm (%f dpi)\n" "height = %d mm (%f dpi)\n" "refresh rate = %.2f Hz\n", info.width, xdpi, @@ -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); diff --git a/modules/gralloc/gralloc.cpp b/modules/gralloc/gralloc.cpp index dcd2e2b..a6b4edd 100644 --- a/modules/gralloc/gralloc.cpp +++ b/modules/gralloc/gralloc.cpp @@ -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; } diff --git a/modules/gralloc/gralloc_priv.h b/modules/gralloc/gralloc_priv.h index 75bcd1d..e1c502a 100644 --- a/modules/gralloc/gralloc_priv.h +++ b/modules/gralloc/gralloc_priv.h @@ -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; diff --git a/modules/gralloc/mapper.cpp b/modules/gralloc/mapper.cpp index 33d0958..c4096ae 100644 --- a/modules/gralloc/mapper.cpp +++ b/modules/gralloc/mapper.cpp @@ -53,11 +53,11 @@ 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; - //LOGD("gralloc_map() succeeded fd=%d, off=%d, size=%d, vaddr=%p", + //ALOGD("gralloc_map() succeeded fd=%d, off=%d, size=%d, vaddr=%p", // hnd->fd, hnd->offset, hnd->size, mappedAddress); } *vaddr = (void*)hnd->base; @@ -71,9 +71,9 @@ static int gralloc_unmap(gralloc_module_t const* module, if (!(hnd->flags & private_handle_t::PRIV_FLAGS_FRAMEBUFFER)) { void* base = (void*)hnd->base; size_t size = hnd->size; - //LOGD("unmapping from %p, size=%d", base, 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; |