Patch Detail
Show a patch.
GET /api/1.1/patches/162/?format=api
{ "id": 162, "url": "https://patchwork.libcamera.org/api/1.1/patches/162/?format=api", "web_url": "https://patchwork.libcamera.org/patch/162/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20190107170902.13618-1-kieran.bingham@ideasonboard.com>", "date": "2019-01-07T17:09:02", "name": "[libcamera-devel] libcamera: media_object: Rename major/minor functions", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "b26b5f91d46f8d7966ffafae9f0ec968af68a62d", "submitter": { "id": 4, "url": "https://patchwork.libcamera.org/api/1.1/people/4/?format=api", "name": "Kieran Bingham", "email": "kieran.bingham@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/162/mbox/", "series": [ { "id": 55, "url": "https://patchwork.libcamera.org/api/1.1/series/55/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=55", "date": "2019-01-07T17:09:02", "name": "[libcamera-devel] libcamera: media_object: Rename major/minor functions", "version": 1, "mbox": "https://patchwork.libcamera.org/series/55/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/162/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/162/checks/", "tags": {}, "headers": { "Return-Path": "<kieran.bingham@ideasonboard.com>", "Received": [ "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D7F73600CC\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 7 Jan 2019 18:09:06 +0100 (CET)", "from localhost.localdomain\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 093F9E22;\n\tMon, 7 Jan 2019 18:09:05 +0100 (CET)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1546880946;\n\tbh=fOksaluZ3xZDaQQ4g7dDh6NqzuXPTr+Pz+2S/A+zEpQ=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=rZOKTGlQC4WT0h85YTQCZomIjCIWh0UKFqldwEC/+mzVW4fs4WU0RvjqTvLJk/b+a\n\tbC8Ef8qn+mm0l5NXmITYeNR/7OKBWSsFdDOeFcm8kwWKc81+ubxXfLeWBVvTqoPFuU\n\tCuJZWjXXJB4LHcuATlDM0pZ0bVTiO8xpwRCM0phQ=", "From": "Kieran Bingham <kieran.bingham@ideasonboard.com>", "To": "LibCamera Devel <libcamera-devel@lists.libcamera.org>", "Date": "Mon, 7 Jan 2019 17:09:02 +0000", "Message-Id": "<20190107170902.13618-1-kieran.bingham@ideasonboard.com>", "X-Mailer": "git-send-email 2.17.1", "Subject": "[libcamera-devel] [PATCH] libcamera: media_object: Rename\n\tmajor/minor functions", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.23", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "X-List-Received-Date": "Mon, 07 Jan 2019 17:09:07 -0000" }, "content": "The system libraries define macro's for major/minor through\n<sys/types.h> on some versions of GCC/GLibc.\n\nTo prevent namespace collisions with these macros, rename our major and\nminor device node accessors.\n\nSigned-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n---\n src/libcamera/device_enumerator.cpp | 4 ++--\n src/libcamera/include/media_object.h | 4 ++--\n 2 files changed, 4 insertions(+), 4 deletions(-)", "diff": "diff --git a/src/libcamera/device_enumerator.cpp b/src/libcamera/device_enumerator.cpp\nindex 7ad1c501ff3d..c088f3e5d243 100644\n--- a/src/libcamera/device_enumerator.cpp\n+++ b/src/libcamera/device_enumerator.cpp\n@@ -208,10 +208,10 @@ int DeviceEnumerator::addDevice(const std::string &devnode)\n \n \t/* Associate entities to device node paths. */\n \tfor (MediaEntity *entity : media->entities()) {\n-\t\tif (entity->major() == 0 && entity->minor() == 0)\n+\t\tif (entity->deviceMajor() == 0 && entity->deviceMinor() == 0)\n \t\t\tcontinue;\n \n-\t\tstd::string devnode = lookupDevnode(entity->major(), entity->minor());\n+\t\tstd::string devnode = lookupDevnode(entity->deviceMajor(), entity->deviceMinor());\n \t\tif (devnode.empty())\n \t\t\treturn -EINVAL;\n \ndiff --git a/src/libcamera/include/media_object.h b/src/libcamera/include/media_object.h\nindex 950a33286690..04b9a8909465 100644\n--- a/src/libcamera/include/media_object.h\n+++ b/src/libcamera/include/media_object.h\n@@ -80,8 +80,8 @@ class MediaEntity : public MediaObject\n {\n public:\n \tconst std::string &name() const { return name_; }\n-\tunsigned int major() const { return major_; }\n-\tunsigned int minor() const { return minor_; }\n+\tunsigned int deviceMajor() const { return major_; }\n+\tunsigned int deviceMinor() const { return minor_; }\n \n \tconst std::vector<MediaPad *> &pads() const { return pads_; }\n \n", "prefixes": [ "libcamera-devel" ] }