diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/camera/Stream.cpp | 10 | ||||
| -rw-r--r-- | modules/gralloc/mapper.cpp | 8 | ||||
| -rw-r--r-- | modules/sensors/Android.mk | 6 | ||||
| -rw-r--r-- | modules/usbaudio/alsa_device_proxy.c | 2 | ||||
| -rw-r--r-- | modules/usbaudio/audio_hw.c | 6 |
5 files changed, 11 insertions, 21 deletions
diff --git a/modules/camera/Stream.cpp b/modules/camera/Stream.cpp index 2db3ed2..90ad30b 100644 --- a/modules/camera/Stream.cpp +++ b/modules/camera/Stream.cpp @@ -227,15 +227,15 @@ void Stream::dump(int fd) dprintf(fd, "Stream ID: %d (%p)\n", mId, mStream); dprintf(fd, "Stream Type: %s (%d)\n", typeToString(mType), mType); - dprintf(fd, "Width: %"PRIu32" Height: %"PRIu32"\n", mWidth, mHeight); + dprintf(fd, "Width: %" PRIu32 " Height: %" PRIu32 "\n", mWidth, mHeight); dprintf(fd, "Stream Format: %s (%d)", formatToString(mFormat), mFormat); // ToDo: prettyprint usage mask flags - dprintf(fd, "Gralloc Usage Mask: %#"PRIx32"\n", mUsage); - dprintf(fd, "Max Buffer Count: %"PRIu32"\n", mMaxBuffers); + dprintf(fd, "Gralloc Usage Mask: %#" PRIx32 "\n", mUsage); + dprintf(fd, "Max Buffer Count: %" PRIu32 "\n", mMaxBuffers); dprintf(fd, "Buffers Registered: %s\n", mRegistered ? "true" : "false"); - dprintf(fd, "Number of Buffers: %"PRIu32"\n", mNumBuffers); + dprintf(fd, "Number of Buffers: %" PRIu32 "\n", mNumBuffers); for (uint32_t i = 0; i < mNumBuffers; i++) { - dprintf(fd, "Buffer %"PRIu32"/%"PRIu32": %p\n", i, mNumBuffers, + dprintf(fd, "Buffer %" PRIu32 "/%" PRIu32 ": %p\n", i, mNumBuffers, mBuffers[i]); } } diff --git a/modules/gralloc/mapper.cpp b/modules/gralloc/mapper.cpp index 5a882e2..20d9841 100644 --- a/modules/gralloc/mapper.cpp +++ b/modules/gralloc/mapper.cpp @@ -33,14 +33,6 @@ #include "gralloc_priv.h" -/* desktop Linux needs a little help with gettid() */ -#if defined(ARCH_X86) && !defined(HAVE_ANDROID_OS) -#define __KERNEL__ -# include <linux/unistd.h> -pid_t gettid() { return syscall(__NR_gettid);} -#undef __KERNEL__ -#endif - /*****************************************************************************/ static int gralloc_map(gralloc_module_t const* /*module*/, diff --git a/modules/sensors/Android.mk b/modules/sensors/Android.mk index 65f699b..445f69e 100644 --- a/modules/sensors/Android.mk +++ b/modules/sensors/Android.mk @@ -35,16 +35,10 @@ LOCAL_SHARED_LIBRARIES := \ libcutils \ libdl \ liblog \ - libstlport \ libutils \ -LOCAL_PRELINK_MODULE := false LOCAL_STRIP_MODULE := false -LOCAL_C_INCLUDES := \ - external/stlport/stlport \ - bionic \ - include $(BUILD_SHARED_LIBRARY) endif # USE_SENSOR_MULTI_HAL diff --git a/modules/usbaudio/alsa_device_proxy.c b/modules/usbaudio/alsa_device_proxy.c index 081c05b..676f288 100644 --- a/modules/usbaudio/alsa_device_proxy.c +++ b/modules/usbaudio/alsa_device_proxy.c @@ -20,6 +20,8 @@ #include <log/log.h> +#include <errno.h> + #include "alsa_device_proxy.h" #include "logging.h" diff --git a/modules/usbaudio/audio_hw.c b/modules/usbaudio/audio_hw.c index 49c99af..ad01833 100644 --- a/modules/usbaudio/audio_hw.c +++ b/modules/usbaudio/audio_hw.c @@ -844,6 +844,8 @@ static ssize_t in_read(struct audio_stream_in *stream, void* buffer, size_t byte num_read_buff_bytes = convert_32_to_16(read_buff, num_read_buff_bytes / 4, out_buff); } else { + LOG_ALWAYS_FATAL("Unsupported format"); + num_read_buff_bytes = 0; goto err; } } @@ -867,8 +869,8 @@ static ssize_t in_read(struct audio_stream_in *stream, void* buffer, size_t byte /* no need to acquire in->dev->lock to read mic_muted here as we don't change its state */ if (num_read_buff_bytes > 0 && in->dev->mic_muted) memset(buffer, 0, num_read_buff_bytes); - } else if (ret == -ENODEV) { - num_read_buff_bytes = 0; //reset the value after USB headset is unplugged + } else { + num_read_buff_bytes = 0; // reset the value after USB headset is unplugged } err: |