From patchwork Wed Feb 13 12:20:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 565 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id DF5816101F for ; Wed, 13 Feb 2019 13:20:39 +0100 (CET) Received: from localhost.localdomain (cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 51A71304; Wed, 13 Feb 2019 13:20:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1550060439; bh=pL3qFJPckIIefvvoNklKfXVSsOSfhOJZpk3CRwOqITw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tZRud8MMrM4DpneY/yFNPaB4lK4RSX1NXe9hXYAjkAfS7elZJ5XJNytrTIFzentYF P3o4fKU09ELrOwHRS8GbNeHjwro4zswrDATqgGAcxUdGgCdZRJMY+zozBR/C7B4YEf outPM/gk5GUFNDHbuJZejQhyy3jU8yDaBqHtDWUY= From: Kieran Bingham To: LibCamera Devel Date: Wed, 13 Feb 2019 12:20:33 +0000 Message-Id: <20190213122035.25309-2-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190213122035.25309-1-kieran.bingham@ideasonboard.com> References: <20190213122035.25309-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/3] libcamera: v4l2_device: Fix LOG usage X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Feb 2019 12:20:40 -0000 Add the V4L2 category to the LOG() statements. Signed-off-by: Kieran Bingham --- src/libcamera/v4l2_device.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp index 683090abc8e5..d92e20b97d50 100644 --- a/src/libcamera/v4l2_device.cpp +++ b/src/libcamera/v4l2_device.cpp @@ -390,7 +390,7 @@ int V4L2Device::getFormatSingleplane(V4L2DeviceFormat *format) ret = ioctl(fd_, VIDIOC_G_FMT, &v4l2Format); if (ret) { ret = -errno; - LOG(Error) << "Unable to get format: " << strerror(-ret); + LOG(V4L2, Error) << "Unable to get format: " << strerror(-ret); return ret; } @@ -419,7 +419,7 @@ int V4L2Device::setFormatSingleplane(V4L2DeviceFormat *format) ret = ioctl(fd_, VIDIOC_S_FMT, &v4l2Format); if (ret) { ret = -errno; - LOG(Error) << "Unable to set format: " << strerror(-ret); + LOG(V4L2, Error) << "Unable to set format: " << strerror(-ret); return ret; } @@ -447,7 +447,7 @@ int V4L2Device::getFormatMultiplane(V4L2DeviceFormat *format) ret = ioctl(fd_, VIDIOC_G_FMT, &v4l2Format); if (ret) { ret = -errno; - LOG(Error) << "Unable to get format: " << strerror(-ret); + LOG(V4L2, Error) << "Unable to get format: " << strerror(-ret); return ret; } @@ -484,7 +484,7 @@ int V4L2Device::setFormatMultiplane(V4L2DeviceFormat *format) ret = ioctl(fd_, VIDIOC_S_FMT, &v4l2Format); if (ret) { ret = -errno; - LOG(Error) << "Unable to set format: " << strerror(-ret); + LOG(V4L2, Error) << "Unable to set format: " << strerror(-ret); return ret; } From patchwork Wed Feb 13 12:20:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 566 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 0E320610B6 for ; Wed, 13 Feb 2019 13:20:40 +0100 (CET) Received: from localhost.localdomain (cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 9988C5B6; Wed, 13 Feb 2019 13:20:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1550060439; bh=IITo5ms7VHJenP7+p0UxkkCCMeF+oydJnjSvvdFm3I0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nsoc5doZNai14j/6s9rGnq5hhKMeomjnNY6uME+azRWEnKwfu8yFWJeAcag2BIMqg sL7vggG0kA/zf5rmotM+NJH+0CQyDXvM604lbZXam3Fc461o58V5vXAGYboI6woaP0 WXjW0d3PjeO3DGpLI/jEhyKLseYEaOYFzoFEFzFc= From: Kieran Bingham To: LibCamera Devel Date: Wed, 13 Feb 2019 12:20:34 +0000 Message-Id: <20190213122035.25309-3-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190213122035.25309-1-kieran.bingham@ideasonboard.com> References: <20190213122035.25309-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/3] libcamera: v4l2_subdevice: Fix LOG usage X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Feb 2019 12:20:40 -0000 Add the V4L2Subdev category to the last LOG() call requiring it. Signed-off-by: Kieran Bingham --- src/libcamera/v4l2_subdevice.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp index 1d5b11115dbb..17f715fe707a 100644 --- a/src/libcamera/v4l2_subdevice.cpp +++ b/src/libcamera/v4l2_subdevice.cpp @@ -223,7 +223,8 @@ int V4L2Subdevice::setFormat(unsigned int pad, V4L2SubdeviceFormat *format) int ret = ioctl(fd_, VIDIOC_SUBDEV_S_FMT, &subdevFmt); if (ret) { ret = -errno; - LOG(Error) << "Unable to set format: " << strerror(-ret); + LOG(V4L2Subdev, Error) + << "Unable to set format: " << strerror(-ret); return ret; } From patchwork Wed Feb 13 12:20:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 567 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 50871610B6 for ; Wed, 13 Feb 2019 13:20:40 +0100 (CET) Received: from localhost.localdomain (cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id E421C85; Wed, 13 Feb 2019 13:20:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1550060440; bh=sP/zv+8pL+F/Jf63LE2fIW+ZfWK6zytDX2mpESGJOTM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n+FkPc+djDIKux5DH6OVtZXZx+hEMmdYI4iWmhotmdkv3Y4ONXfqEtTiqKSzXBUA6 Hm9X8TaCKJAVjaYaTauVTeNMp3i6BnVI6s+xLSyPAsmwlQfjKGKr/SuCuIrGElhbP+ rQdcaevywV2AFDtUJQKDjEzaluIKhEfu1HgBEvGI= From: Kieran Bingham To: LibCamera Devel Date: Wed, 13 Feb 2019 12:20:35 +0000 Message-Id: <20190213122035.25309-4-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190213122035.25309-1-kieran.bingham@ideasonboard.com> References: <20190213122035.25309-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 3/3] libcamera: device_enumerator: Fix LOG usage X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Feb 2019 12:20:40 -0000 Add the DeviceEnumerator category to the last LOG() call requiring it. Signed-off-by: Kieran Bingham --- src/libcamera/device_enumerator.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libcamera/device_enumerator.cpp b/src/libcamera/device_enumerator.cpp index 703b03dd418a..5a9d33534e56 100644 --- a/src/libcamera/device_enumerator.cpp +++ b/src/libcamera/device_enumerator.cpp @@ -459,7 +459,8 @@ void DeviceEnumeratorUdev::udevNotify(EventNotifier *notifier) std::string action(udev_device_get_action(dev)); std::string deviceNode(udev_device_get_devnode(dev)); - LOG(Debug) << action << " device " << udev_device_get_devnode(dev); + LOG(DeviceEnumerator, Debug) + << action << " device " << udev_device_get_devnode(dev); if (action == "add") { addDevice(deviceNode);