[{"id":465,"web_url":"https://patchwork.libcamera.org/comment/465/","msgid":"<20190121205729.GI4439@pendragon.ideasonboard.com>","date":"2019-01-21T20:57:29","subject":"Re: [libcamera-devel] [PATCH 6/6] libcamera: Global\n\ts/devnode/deviceNode rename","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jacopo,\n\nThank you for the patch.\n\nOn Mon, Jan 21, 2019 at 06:27:05PM +0100, Jacopo Mondi wrote:\n> Do not use the abreviated version for members, variables and getter\n> methods.\n> \n> Library-wise rename, no intended functional changes.\n> \n> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n\nWe're finally consistent through the code base :-) Thank you.\n\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\n> ---\n>  src/libcamera/include/media_device.h          |  6 +++---\n>  src/libcamera/include/media_object.h          |  6 +++---\n>  src/libcamera/include/v4l2_device.h           |  4 ++--\n>  src/libcamera/media_device.cpp                | 14 +++++++-------\n>  src/libcamera/media_object.cpp                | 14 +++++++-------\n>  src/libcamera/v4l2_device.cpp                 | 14 +++++++-------\n>  test/media_device/media_device_link_test.cpp  |  2 +-\n>  test/media_device/media_device_print_test.cpp | 12 ++++++------\n>  test/pipeline/ipu3/ipu3_pipeline_test.cpp     |  6 +++---\n>  9 files changed, 39 insertions(+), 39 deletions(-)\n> \n> diff --git a/src/libcamera/include/media_device.h b/src/libcamera/include/media_device.h\n> index a8dec0d..ba3046d 100644\n> --- a/src/libcamera/include/media_device.h\n> +++ b/src/libcamera/include/media_device.h\n> @@ -21,7 +21,7 @@ namespace libcamera {\n>  class MediaDevice\n>  {\n>  public:\n> -\tMediaDevice(const std::string &devnode);\n> +\tMediaDevice(const std::string &deviceNode);\n>  \t~MediaDevice();\n>  \n>  \tbool acquire();\n> @@ -35,7 +35,7 @@ public:\n>  \tbool valid() const { return valid_; }\n>  \n>  \tconst std::string driver() const { return driver_; }\n> -\tconst std::string devnode() const { return devnode_; }\n> +\tconst std::string deviceNode() const { return deviceNode_; }\n>  \n>  \tconst std::vector<MediaEntity *> &entities() const { return entities_; }\n>  \tMediaEntity *getEntityByName(const std::string &name) const;\n> @@ -49,7 +49,7 @@ public:\n>  \n>  private:\n>  \tstd::string driver_;\n> -\tstd::string devnode_;\n> +\tstd::string deviceNode_;\n>  \tint fd_;\n>  \tbool valid_;\n>  \tbool acquired_;\n> diff --git a/src/libcamera/include/media_object.h b/src/libcamera/include/media_object.h\n> index fad55a0..64095be 100644\n> --- a/src/libcamera/include/media_object.h\n> +++ b/src/libcamera/include/media_object.h\n> @@ -85,7 +85,7 @@ class MediaEntity : public MediaObject\n>  public:\n>  \tconst std::string &name() const { return name_; }\n>  \tunsigned int function() const { return function_; }\n> -\tconst std::string &devnode() const { return devnode_; }\n> +\tconst std::string &deviceNode() const { return deviceNode_; }\n>  \tunsigned int deviceMajor() const { return major_; }\n>  \tunsigned int deviceMinor() const { return minor_; }\n>  \n> @@ -94,7 +94,7 @@ public:\n>  \tconst MediaPad *getPadByIndex(unsigned int index) const;\n>  \tconst MediaPad *getPadById(unsigned int id) const;\n>  \n> -\tint setDeviceNode(const std::string &devnode);\n> +\tint setDeviceNode(const std::string &deviceNode);\n>  \n>  private:\n>  \tfriend class MediaDevice;\n> @@ -106,7 +106,7 @@ private:\n>  \n>  \tstd::string name_;\n>  \tunsigned int function_;\n> -\tstd::string devnode_;\n> +\tstd::string deviceNode_;\n>  \tunsigned int major_;\n>  \tunsigned int minor_;\n>  \n> diff --git a/src/libcamera/include/v4l2_device.h b/src/libcamera/include/v4l2_device.h\n> index 81992dc..ca4583c 100644\n> --- a/src/libcamera/include/v4l2_device.h\n> +++ b/src/libcamera/include/v4l2_device.h\n> @@ -39,7 +39,7 @@ class MediaEntity;\n>  class V4L2Device\n>  {\n>  public:\n> -\texplicit V4L2Device(const std::string &devnode);\n> +\texplicit V4L2Device(const std::string &deviceNode);\n>  \texplicit V4L2Device(const MediaEntity &entity);\n>  \tV4L2Device(const V4L2Device &) = delete;\n>  \t~V4L2Device();\n> @@ -89,7 +89,7 @@ private:\n>  \t\tint getFormat();\n>  \t};\n>  \n> -\tstd::string devnode_;\n> +\tstd::string deviceNode_;\n>  \tint fd_;\n>  \tV4L2Capability caps_;\n>  \tstd::unique_ptr<V4L2Format> format_;\n> diff --git a/src/libcamera/media_device.cpp b/src/libcamera/media_device.cpp\n> index 0ee5506..7cf4ce6 100644\n> --- a/src/libcamera/media_device.cpp\n> +++ b/src/libcamera/media_device.cpp\n> @@ -61,13 +61,13 @@ namespace libcamera {\n>  \n>  /**\n>   * \\brief Construct a MediaDevice\n> - * \\param devnode The media device node path\n> + * \\param deviceNode The media device node path\n>   *\n>   * Once constructed the media device is invalid, and must be opened and\n>   * populated with open() and populate() before the media graph can be queried.\n>   */\n> -MediaDevice::MediaDevice(const std::string &devnode)\n> -\t: devnode_(devnode), fd_(-1), valid_(false), acquired_(false)\n> +MediaDevice::MediaDevice(const std::string &deviceNode)\n> +\t: deviceNode_(deviceNode), fd_(-1), valid_(false), acquired_(false)\n>  {\n>  }\n>  \n> @@ -143,10 +143,10 @@ int MediaDevice::open()\n>  \t\treturn -EBUSY;\n>  \t}\n>  \n> -\tint ret = ::open(devnode_.c_str(), O_RDWR);\n> +\tint ret = ::open(deviceNode_.c_str(), O_RDWR);\n>  \tif (ret < 0) {\n>  \t\tret = -errno;\n> -\t\tLOG(Error) << \"Failed to open media device at \" << devnode_\n> +\t\tLOG(Error) << \"Failed to open media device at \" << deviceNode_\n>  \t\t\t   << \": \" << strerror(-ret);\n>  \t\treturn ret;\n>  \t}\n> @@ -280,9 +280,9 @@ int MediaDevice::populate()\n>   */\n>  \n>  /**\n> - * \\fn MediaDevice::devnode()\n> + * \\fn MediaDevice::deviceNode()\n>   * \\brief Retrieve the media device device node path\n> - * \\return The MediaDevice devnode path\n> + * \\return The MediaDevice deviceNode path\n>   */\n>  \n>  /**\n> diff --git a/src/libcamera/media_object.cpp b/src/libcamera/media_object.cpp\n> index 7d07538..bda1e6c 100644\n> --- a/src/libcamera/media_object.cpp\n> +++ b/src/libcamera/media_object.cpp\n> @@ -244,7 +244,7 @@ void MediaPad::addLink(MediaLink *link)\n>   *\n>   * In addition to their graph id, media graph entities are identified by a\n>   * name() unique in the media device context. They implement a function() and\n> - * may expose a devnode().\n> + * may expose a deviceNode().\n>   */\n>  \n>  /**\n> @@ -264,7 +264,7 @@ void MediaPad::addLink(MediaLink *link)\n>   */\n>  \n>  /**\n> - * \\fn MediaEntity::devnode()\n> + * \\fn MediaEntity::deviceNode()\n>   * \\brief Retrieve the entity's device node path, if any\n>   *\n>   * \\sa int setDeviceNode()\n> @@ -324,22 +324,22 @@ const MediaPad *MediaEntity::getPadById(unsigned int id) const\n>  \n>  /**\n>   * \\brief Set the path to the device node for the associated interface\n> - * \\param devnode The interface device node path associated with this entity\n> + * \\param deviceNode The interface device node path associated with this entity\n>   * \\return 0 on success, or a negative error code if the device node can't be\n>   * accessed\n>   */\n> -int MediaEntity::setDeviceNode(const std::string &devnode)\n> +int MediaEntity::setDeviceNode(const std::string &deviceNode)\n>  {\n>  \t/* Make sure the device node can be accessed. */\n> -\tint ret = ::access(devnode.c_str(), R_OK | W_OK);\n> +\tint ret = ::access(deviceNode.c_str(), R_OK | W_OK);\n>  \tif (ret < 0) {\n>  \t\tret = -errno;\n> -\t\tLOG(Error) << \"Device node \" << devnode << \" can't be accessed: \"\n> +\t\tLOG(Error) << \"Device node \" << deviceNode << \" can't be accessed: \"\n>  \t\t\t   << strerror(-ret);\n>  \t\treturn ret;\n>  \t}\n>  \n> -\tdevnode_ = devnode;\n> +\tdeviceNode_ = deviceNode;\n>  \n>  \treturn 0;\n>  }\n> diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp\n> index 126f6f2..0e15f86 100644\n> --- a/src/libcamera/v4l2_device.cpp\n> +++ b/src/libcamera/v4l2_device.cpp\n> @@ -118,10 +118,10 @@ bool V4L2Capability::isOutput() const\n>  \n>  /**\n>   * \\brief Construct a V4L2Device\n> - * \\param devnode The file-system path to the video device node\n> + * \\param deviceNode The file-system path to the video device node\n>   */\n> -V4L2Device::V4L2Device(const std::string &devnode)\n> -\t: devnode_(devnode), fd_(-1)\n> +V4L2Device::V4L2Device(const std::string &deviceNode)\n> +\t: deviceNode_(deviceNode), fd_(-1)\n>  {\n>  }\n>  \n> @@ -132,7 +132,7 @@ V4L2Device::V4L2Device(const std::string &devnode)\n>   * Construct a V4L2Device from a MediaEntity's device node path.\n>   */\n>  V4L2Device::V4L2Device(const MediaEntity &entity)\n> -\t: V4L2Device(entity.devnode())\n> +\t: V4L2Device(entity.deviceNode())\n>  {\n>  }\n>  \n> @@ -154,10 +154,10 @@ int V4L2Device::open()\n>  \t\treturn -EBUSY;\n>  \t}\n>  \n> -\tret = ::open(devnode_.c_str(), O_RDWR);\n> +\tret = ::open(deviceNode_.c_str(), O_RDWR);\n>  \tif (ret < 0) {\n>  \t\tret = -errno;\n> -\t\tLOG(Error) << \"Failed to open V4L2 device '\" << devnode_\n> +\t\tLOG(Error) << \"Failed to open V4L2 device '\" << deviceNode_\n>  \t\t\t   << \"': \" << strerror(-ret);\n>  \t\treturn ret;\n>  \t}\n> @@ -171,7 +171,7 @@ int V4L2Device::open()\n>  \t\treturn ret;\n>  \t}\n>  \n> -\tLOG(Debug) << \"Opened '\" << devnode_ << \"' \"\n> +\tLOG(Debug) << \"Opened '\" << deviceNode_ << \"' \"\n>  \t\t   << caps_.bus_info() << \": \" << caps_.driver()\n>  \t\t   << \": \" << caps_.card();\n>  \n> diff --git a/test/media_device/media_device_link_test.cpp b/test/media_device/media_device_link_test.cpp\n> index 2297e33..ac5b632 100644\n> --- a/test/media_device/media_device_link_test.cpp\n> +++ b/test/media_device/media_device_link_test.cpp\n> @@ -55,7 +55,7 @@ class MediaDeviceLinkTest : public Test\n>  \n>  \t\tif (dev_->open()) {\n>  \t\t\tcerr << \"Failed to open media device at \"\n> -\t\t\t     << dev_->devnode() << endl;\n> +\t\t\t     << dev_->deviceNode() << endl;\n>  \t\t\treturn TestFail;\n>  \t\t}\n>  \n> diff --git a/test/media_device/media_device_print_test.cpp b/test/media_device/media_device_print_test.cpp\n> index 13af722..3eef973 100644\n> --- a/test/media_device/media_device_print_test.cpp\n> +++ b/test/media_device/media_device_print_test.cpp\n> @@ -35,7 +35,7 @@ protected:\n>  \tvoid cleanup() { }\n>  \n>  private:\n> -\tint testMediaDevice(string devnode);\n> +\tint testMediaDevice(string deviceNode);\n>  \n>  \tvoid printMediaGraph(const MediaDevice &media, ostream &os);\n>  \tvoid printLinkFlags(const MediaLink *link, ostream &os);\n> @@ -68,7 +68,7 @@ void MediaDevicePrintTest::printLinkFlags(const MediaLink *link, ostream &os)\n>   */\n>  void MediaDevicePrintTest::printMediaGraph(const MediaDevice &media, ostream &os)\n>  {\n> -\tos << \"\\n\" << media.driver() << \" - \" << media.devnode() << \"\\n\\n\";\n> +\tos << \"\\n\" << media.driver() << \" - \" << media.deviceNode() << \"\\n\\n\";\n>  \n>  \tfor (auto const &entity : media.entities()) {\n>  \t\tos << \"\\\"\" << entity->name() << \"\\\"\\n\";\n> @@ -108,9 +108,9 @@ void MediaDevicePrintTest::printMediaGraph(const MediaDevice &media, ostream &os\n>  }\n>  \n>  /* Test a single media device. */\n> -int MediaDevicePrintTest::testMediaDevice(const string devnode)\n> +int MediaDevicePrintTest::testMediaDevice(const string deviceNode)\n>  {\n> -\tMediaDevice dev(devnode);\n> +\tMediaDevice dev(deviceNode);\n>  \tint ret;\n>  \n>  \t/* Fuzzy open/close sequence. */\n> @@ -144,7 +144,7 @@ int MediaDevicePrintTest::testMediaDevice(const string devnode)\n>  #define MAX_MEDIA_DEV 256\n>  int MediaDevicePrintTest::run()\n>  {\n> -\tconst string devnode(\"/dev/media\");\n> +\tconst string deviceNode(\"/dev/media\");\n>  \tunsigned int i;\n>  \tint ret = 77; /* skip test exit code */\n>  \n> @@ -153,7 +153,7 @@ int MediaDevicePrintTest::run()\n>  \t * system, if any.\n>  \t */\n>  \tfor (i = 0; i < MAX_MEDIA_DEV; i++) {\n> -\t\tstring mediadev = devnode + to_string(i);\n> +\t\tstring mediadev = deviceNode + to_string(i);\n>  \t\tstruct stat pstat = { };\n>  \n>  \t\tif (stat(mediadev.c_str(), &pstat))\n> diff --git a/test/pipeline/ipu3/ipu3_pipeline_test.cpp b/test/pipeline/ipu3/ipu3_pipeline_test.cpp\n> index deaee40..efe9eaf 100644\n> --- a/test/pipeline/ipu3/ipu3_pipeline_test.cpp\n> +++ b/test/pipeline/ipu3/ipu3_pipeline_test.cpp\n> @@ -45,7 +45,7 @@ private:\n>  \n>  int IPU3PipelineTest::init()\n>  {\n> -\tconst string devnode(\"/dev/media\");\n> +\tconst string deviceNode(\"/dev/media\");\n>  \tbool cio2 = false;\n>  \tbool imgu = false;\n>  \tunsigned int i;\n> @@ -59,7 +59,7 @@ int IPU3PipelineTest::init()\n>  \t * as soon as we hit a non accessible media device.\n>  \t */\n>  \tfor (i = 0; i < 256; i++) {\n> -\t\tstring mediadev = devnode + to_string(i);\n> +\t\tstring mediadev = deviceNode + to_string(i);\n>  \t\tstruct stat pstat = { };\n>  \n>  \t\tif (stat(mediadev.c_str(), &pstat))\n> @@ -82,7 +82,7 @@ int IPU3PipelineTest::init()\n>  \t\t\t */\n>  \t\t\tret = dev.populate();\n>  \t\t\tif (ret) {\n> -\t\t\t\tcerr << \"Failed to populate media device \" << dev.devnode() << endl;\n> +\t\t\t\tcerr << \"Failed to populate media device \" << dev.deviceNode() << endl;\n>  \t\t\t\treturn TestFail;\n>  \t\t\t}\n>","headers":{"Return-Path":"<laurent.pinchart@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 93E6160B1D\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 21 Jan 2019 21:57:30 +0100 (CET)","from pendragon.ideasonboard.com\n\t(dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id F246F53E;\n\tMon, 21 Jan 2019 21:57:29 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1548104250;\n\tbh=TL6rznY8EMME+HQLcN9xGWnHFaYFoXmAgsECRw5XERA=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=dpxrpjX45DvBaDPbn2to5hCuRMCWQi9pLi1fskerFQAiblPimcxdp0Nc/ZX4yxNhA\n\tEQED2kNoHNnlM7skFce8+nKWgyf+a9ZfXTxhzNxs+DFga6ZqbgRdqrN9GOq1/G3hJg\n\tiEHZGFh4D+hrjQ9urvdaYWvkSGn44rTojSjS3FQM=","Date":"Mon, 21 Jan 2019 22:57:29 +0200","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Jacopo Mondi <jacopo@jmondi.org>","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190121205729.GI4439@pendragon.ideasonboard.com>","References":"<20190121172705.19985-1-jacopo@jmondi.org>\n\t<20190121172705.19985-7-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20190121172705.19985-7-jacopo@jmondi.org>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH 6/6] libcamera: Global\n\ts/devnode/deviceNode rename","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, 21 Jan 2019 20:57:30 -0000"}},{"id":481,"web_url":"https://patchwork.libcamera.org/comment/481/","msgid":"<20190122114309.GM6484@bigcity.dyn.berto.se>","date":"2019-01-22T11:43:09","subject":"Re: [libcamera-devel] [PATCH 6/6] libcamera: Global\n\ts/devnode/deviceNode rename","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Jacopo,\n\nThanks for your work.\n\nOn 2019-01-21 18:27:05 +0100, Jacopo Mondi wrote:\n> Do not use the abreviated version for members, variables and getter\n> methods.\n> \n> Library-wise rename, no intended functional changes.\n> \n> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n\nReviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n\nI think this patch should be merged soon as to not create new \ninconsistencies :-)\n\n> ---\n>  src/libcamera/include/media_device.h          |  6 +++---\n>  src/libcamera/include/media_object.h          |  6 +++---\n>  src/libcamera/include/v4l2_device.h           |  4 ++--\n>  src/libcamera/media_device.cpp                | 14 +++++++-------\n>  src/libcamera/media_object.cpp                | 14 +++++++-------\n>  src/libcamera/v4l2_device.cpp                 | 14 +++++++-------\n>  test/media_device/media_device_link_test.cpp  |  2 +-\n>  test/media_device/media_device_print_test.cpp | 12 ++++++------\n>  test/pipeline/ipu3/ipu3_pipeline_test.cpp     |  6 +++---\n>  9 files changed, 39 insertions(+), 39 deletions(-)\n> \n> diff --git a/src/libcamera/include/media_device.h b/src/libcamera/include/media_device.h\n> index a8dec0d..ba3046d 100644\n> --- a/src/libcamera/include/media_device.h\n> +++ b/src/libcamera/include/media_device.h\n> @@ -21,7 +21,7 @@ namespace libcamera {\n>  class MediaDevice\n>  {\n>  public:\n> -\tMediaDevice(const std::string &devnode);\n> +\tMediaDevice(const std::string &deviceNode);\n>  \t~MediaDevice();\n>  \n>  \tbool acquire();\n> @@ -35,7 +35,7 @@ public:\n>  \tbool valid() const { return valid_; }\n>  \n>  \tconst std::string driver() const { return driver_; }\n> -\tconst std::string devnode() const { return devnode_; }\n> +\tconst std::string deviceNode() const { return deviceNode_; }\n>  \n>  \tconst std::vector<MediaEntity *> &entities() const { return entities_; }\n>  \tMediaEntity *getEntityByName(const std::string &name) const;\n> @@ -49,7 +49,7 @@ public:\n>  \n>  private:\n>  \tstd::string driver_;\n> -\tstd::string devnode_;\n> +\tstd::string deviceNode_;\n>  \tint fd_;\n>  \tbool valid_;\n>  \tbool acquired_;\n> diff --git a/src/libcamera/include/media_object.h b/src/libcamera/include/media_object.h\n> index fad55a0..64095be 100644\n> --- a/src/libcamera/include/media_object.h\n> +++ b/src/libcamera/include/media_object.h\n> @@ -85,7 +85,7 @@ class MediaEntity : public MediaObject\n>  public:\n>  \tconst std::string &name() const { return name_; }\n>  \tunsigned int function() const { return function_; }\n> -\tconst std::string &devnode() const { return devnode_; }\n> +\tconst std::string &deviceNode() const { return deviceNode_; }\n>  \tunsigned int deviceMajor() const { return major_; }\n>  \tunsigned int deviceMinor() const { return minor_; }\n>  \n> @@ -94,7 +94,7 @@ public:\n>  \tconst MediaPad *getPadByIndex(unsigned int index) const;\n>  \tconst MediaPad *getPadById(unsigned int id) const;\n>  \n> -\tint setDeviceNode(const std::string &devnode);\n> +\tint setDeviceNode(const std::string &deviceNode);\n>  \n>  private:\n>  \tfriend class MediaDevice;\n> @@ -106,7 +106,7 @@ private:\n>  \n>  \tstd::string name_;\n>  \tunsigned int function_;\n> -\tstd::string devnode_;\n> +\tstd::string deviceNode_;\n>  \tunsigned int major_;\n>  \tunsigned int minor_;\n>  \n> diff --git a/src/libcamera/include/v4l2_device.h b/src/libcamera/include/v4l2_device.h\n> index 81992dc..ca4583c 100644\n> --- a/src/libcamera/include/v4l2_device.h\n> +++ b/src/libcamera/include/v4l2_device.h\n> @@ -39,7 +39,7 @@ class MediaEntity;\n>  class V4L2Device\n>  {\n>  public:\n> -\texplicit V4L2Device(const std::string &devnode);\n> +\texplicit V4L2Device(const std::string &deviceNode);\n>  \texplicit V4L2Device(const MediaEntity &entity);\n>  \tV4L2Device(const V4L2Device &) = delete;\n>  \t~V4L2Device();\n> @@ -89,7 +89,7 @@ private:\n>  \t\tint getFormat();\n>  \t};\n>  \n> -\tstd::string devnode_;\n> +\tstd::string deviceNode_;\n>  \tint fd_;\n>  \tV4L2Capability caps_;\n>  \tstd::unique_ptr<V4L2Format> format_;\n> diff --git a/src/libcamera/media_device.cpp b/src/libcamera/media_device.cpp\n> index 0ee5506..7cf4ce6 100644\n> --- a/src/libcamera/media_device.cpp\n> +++ b/src/libcamera/media_device.cpp\n> @@ -61,13 +61,13 @@ namespace libcamera {\n>  \n>  /**\n>   * \\brief Construct a MediaDevice\n> - * \\param devnode The media device node path\n> + * \\param deviceNode The media device node path\n>   *\n>   * Once constructed the media device is invalid, and must be opened and\n>   * populated with open() and populate() before the media graph can be queried.\n>   */\n> -MediaDevice::MediaDevice(const std::string &devnode)\n> -\t: devnode_(devnode), fd_(-1), valid_(false), acquired_(false)\n> +MediaDevice::MediaDevice(const std::string &deviceNode)\n> +\t: deviceNode_(deviceNode), fd_(-1), valid_(false), acquired_(false)\n>  {\n>  }\n>  \n> @@ -143,10 +143,10 @@ int MediaDevice::open()\n>  \t\treturn -EBUSY;\n>  \t}\n>  \n> -\tint ret = ::open(devnode_.c_str(), O_RDWR);\n> +\tint ret = ::open(deviceNode_.c_str(), O_RDWR);\n>  \tif (ret < 0) {\n>  \t\tret = -errno;\n> -\t\tLOG(Error) << \"Failed to open media device at \" << devnode_\n> +\t\tLOG(Error) << \"Failed to open media device at \" << deviceNode_\n>  \t\t\t   << \": \" << strerror(-ret);\n>  \t\treturn ret;\n>  \t}\n> @@ -280,9 +280,9 @@ int MediaDevice::populate()\n>   */\n>  \n>  /**\n> - * \\fn MediaDevice::devnode()\n> + * \\fn MediaDevice::deviceNode()\n>   * \\brief Retrieve the media device device node path\n> - * \\return The MediaDevice devnode path\n> + * \\return The MediaDevice deviceNode path\n>   */\n>  \n>  /**\n> diff --git a/src/libcamera/media_object.cpp b/src/libcamera/media_object.cpp\n> index 7d07538..bda1e6c 100644\n> --- a/src/libcamera/media_object.cpp\n> +++ b/src/libcamera/media_object.cpp\n> @@ -244,7 +244,7 @@ void MediaPad::addLink(MediaLink *link)\n>   *\n>   * In addition to their graph id, media graph entities are identified by a\n>   * name() unique in the media device context. They implement a function() and\n> - * may expose a devnode().\n> + * may expose a deviceNode().\n>   */\n>  \n>  /**\n> @@ -264,7 +264,7 @@ void MediaPad::addLink(MediaLink *link)\n>   */\n>  \n>  /**\n> - * \\fn MediaEntity::devnode()\n> + * \\fn MediaEntity::deviceNode()\n>   * \\brief Retrieve the entity's device node path, if any\n>   *\n>   * \\sa int setDeviceNode()\n> @@ -324,22 +324,22 @@ const MediaPad *MediaEntity::getPadById(unsigned int id) const\n>  \n>  /**\n>   * \\brief Set the path to the device node for the associated interface\n> - * \\param devnode The interface device node path associated with this entity\n> + * \\param deviceNode The interface device node path associated with this entity\n>   * \\return 0 on success, or a negative error code if the device node can't be\n>   * accessed\n>   */\n> -int MediaEntity::setDeviceNode(const std::string &devnode)\n> +int MediaEntity::setDeviceNode(const std::string &deviceNode)\n>  {\n>  \t/* Make sure the device node can be accessed. */\n> -\tint ret = ::access(devnode.c_str(), R_OK | W_OK);\n> +\tint ret = ::access(deviceNode.c_str(), R_OK | W_OK);\n>  \tif (ret < 0) {\n>  \t\tret = -errno;\n> -\t\tLOG(Error) << \"Device node \" << devnode << \" can't be accessed: \"\n> +\t\tLOG(Error) << \"Device node \" << deviceNode << \" can't be accessed: \"\n>  \t\t\t   << strerror(-ret);\n>  \t\treturn ret;\n>  \t}\n>  \n> -\tdevnode_ = devnode;\n> +\tdeviceNode_ = deviceNode;\n>  \n>  \treturn 0;\n>  }\n> diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp\n> index 126f6f2..0e15f86 100644\n> --- a/src/libcamera/v4l2_device.cpp\n> +++ b/src/libcamera/v4l2_device.cpp\n> @@ -118,10 +118,10 @@ bool V4L2Capability::isOutput() const\n>  \n>  /**\n>   * \\brief Construct a V4L2Device\n> - * \\param devnode The file-system path to the video device node\n> + * \\param deviceNode The file-system path to the video device node\n>   */\n> -V4L2Device::V4L2Device(const std::string &devnode)\n> -\t: devnode_(devnode), fd_(-1)\n> +V4L2Device::V4L2Device(const std::string &deviceNode)\n> +\t: deviceNode_(deviceNode), fd_(-1)\n>  {\n>  }\n>  \n> @@ -132,7 +132,7 @@ V4L2Device::V4L2Device(const std::string &devnode)\n>   * Construct a V4L2Device from a MediaEntity's device node path.\n>   */\n>  V4L2Device::V4L2Device(const MediaEntity &entity)\n> -\t: V4L2Device(entity.devnode())\n> +\t: V4L2Device(entity.deviceNode())\n>  {\n>  }\n>  \n> @@ -154,10 +154,10 @@ int V4L2Device::open()\n>  \t\treturn -EBUSY;\n>  \t}\n>  \n> -\tret = ::open(devnode_.c_str(), O_RDWR);\n> +\tret = ::open(deviceNode_.c_str(), O_RDWR);\n>  \tif (ret < 0) {\n>  \t\tret = -errno;\n> -\t\tLOG(Error) << \"Failed to open V4L2 device '\" << devnode_\n> +\t\tLOG(Error) << \"Failed to open V4L2 device '\" << deviceNode_\n>  \t\t\t   << \"': \" << strerror(-ret);\n>  \t\treturn ret;\n>  \t}\n> @@ -171,7 +171,7 @@ int V4L2Device::open()\n>  \t\treturn ret;\n>  \t}\n>  \n> -\tLOG(Debug) << \"Opened '\" << devnode_ << \"' \"\n> +\tLOG(Debug) << \"Opened '\" << deviceNode_ << \"' \"\n>  \t\t   << caps_.bus_info() << \": \" << caps_.driver()\n>  \t\t   << \": \" << caps_.card();\n>  \n> diff --git a/test/media_device/media_device_link_test.cpp b/test/media_device/media_device_link_test.cpp\n> index 2297e33..ac5b632 100644\n> --- a/test/media_device/media_device_link_test.cpp\n> +++ b/test/media_device/media_device_link_test.cpp\n> @@ -55,7 +55,7 @@ class MediaDeviceLinkTest : public Test\n>  \n>  \t\tif (dev_->open()) {\n>  \t\t\tcerr << \"Failed to open media device at \"\n> -\t\t\t     << dev_->devnode() << endl;\n> +\t\t\t     << dev_->deviceNode() << endl;\n>  \t\t\treturn TestFail;\n>  \t\t}\n>  \n> diff --git a/test/media_device/media_device_print_test.cpp b/test/media_device/media_device_print_test.cpp\n> index 13af722..3eef973 100644\n> --- a/test/media_device/media_device_print_test.cpp\n> +++ b/test/media_device/media_device_print_test.cpp\n> @@ -35,7 +35,7 @@ protected:\n>  \tvoid cleanup() { }\n>  \n>  private:\n> -\tint testMediaDevice(string devnode);\n> +\tint testMediaDevice(string deviceNode);\n>  \n>  \tvoid printMediaGraph(const MediaDevice &media, ostream &os);\n>  \tvoid printLinkFlags(const MediaLink *link, ostream &os);\n> @@ -68,7 +68,7 @@ void MediaDevicePrintTest::printLinkFlags(const MediaLink *link, ostream &os)\n>   */\n>  void MediaDevicePrintTest::printMediaGraph(const MediaDevice &media, ostream &os)\n>  {\n> -\tos << \"\\n\" << media.driver() << \" - \" << media.devnode() << \"\\n\\n\";\n> +\tos << \"\\n\" << media.driver() << \" - \" << media.deviceNode() << \"\\n\\n\";\n>  \n>  \tfor (auto const &entity : media.entities()) {\n>  \t\tos << \"\\\"\" << entity->name() << \"\\\"\\n\";\n> @@ -108,9 +108,9 @@ void MediaDevicePrintTest::printMediaGraph(const MediaDevice &media, ostream &os\n>  }\n>  \n>  /* Test a single media device. */\n> -int MediaDevicePrintTest::testMediaDevice(const string devnode)\n> +int MediaDevicePrintTest::testMediaDevice(const string deviceNode)\n>  {\n> -\tMediaDevice dev(devnode);\n> +\tMediaDevice dev(deviceNode);\n>  \tint ret;\n>  \n>  \t/* Fuzzy open/close sequence. */\n> @@ -144,7 +144,7 @@ int MediaDevicePrintTest::testMediaDevice(const string devnode)\n>  #define MAX_MEDIA_DEV 256\n>  int MediaDevicePrintTest::run()\n>  {\n> -\tconst string devnode(\"/dev/media\");\n> +\tconst string deviceNode(\"/dev/media\");\n>  \tunsigned int i;\n>  \tint ret = 77; /* skip test exit code */\n>  \n> @@ -153,7 +153,7 @@ int MediaDevicePrintTest::run()\n>  \t * system, if any.\n>  \t */\n>  \tfor (i = 0; i < MAX_MEDIA_DEV; i++) {\n> -\t\tstring mediadev = devnode + to_string(i);\n> +\t\tstring mediadev = deviceNode + to_string(i);\n>  \t\tstruct stat pstat = { };\n>  \n>  \t\tif (stat(mediadev.c_str(), &pstat))\n> diff --git a/test/pipeline/ipu3/ipu3_pipeline_test.cpp b/test/pipeline/ipu3/ipu3_pipeline_test.cpp\n> index deaee40..efe9eaf 100644\n> --- a/test/pipeline/ipu3/ipu3_pipeline_test.cpp\n> +++ b/test/pipeline/ipu3/ipu3_pipeline_test.cpp\n> @@ -45,7 +45,7 @@ private:\n>  \n>  int IPU3PipelineTest::init()\n>  {\n> -\tconst string devnode(\"/dev/media\");\n> +\tconst string deviceNode(\"/dev/media\");\n>  \tbool cio2 = false;\n>  \tbool imgu = false;\n>  \tunsigned int i;\n> @@ -59,7 +59,7 @@ int IPU3PipelineTest::init()\n>  \t * as soon as we hit a non accessible media device.\n>  \t */\n>  \tfor (i = 0; i < 256; i++) {\n> -\t\tstring mediadev = devnode + to_string(i);\n> +\t\tstring mediadev = deviceNode + to_string(i);\n>  \t\tstruct stat pstat = { };\n>  \n>  \t\tif (stat(mediadev.c_str(), &pstat))\n> @@ -82,7 +82,7 @@ int IPU3PipelineTest::init()\n>  \t\t\t */\n>  \t\t\tret = dev.populate();\n>  \t\t\tif (ret) {\n> -\t\t\t\tcerr << \"Failed to populate media device \" << dev.devnode() << endl;\n> +\t\t\t\tcerr << \"Failed to populate media device \" << dev.deviceNode() << endl;\n>  \t\t\t\treturn TestFail;\n>  \t\t\t}\n>  \n> -- \n> 2.20.1\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"<niklas.soderlund@ragnatech.se>","Received":["from mail-lf1-x143.google.com (mail-lf1-x143.google.com\n\t[IPv6:2a00:1450:4864:20::143])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6698D60B21\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 22 Jan 2019 12:43:11 +0100 (CET)","by mail-lf1-x143.google.com with SMTP id u18so17807597lff.10\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 22 Jan 2019 03:43:11 -0800 (PST)","from localhost (89-233-230-99.cust.bredband2.com. [89.233.230.99])\n\tby smtp.gmail.com with ESMTPSA id\n\tm13-v6sm2800733ljg.56.2019.01.22.03.43.09\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tTue, 22 Jan 2019 03:43:09 -0800 (PST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to\n\t:user-agent; bh=FVEFgy7FmqCzdTMcBhIIEPNIlEFbzzWZg6cRyfx3Exc=;\n\tb=HizAWf3OgXgBqIojC/NCBkQSfL5DF93XdPVSLG0SPyFY7xqzK5kw2LSyeaIE4mBvpG\n\tKoPjkPLZjIkl3XcosE0CIIuleLgSyLC2zReIlVqqA8soxFUmkwfzRonwl+KjdERIa7PD\n\tf9EfZPmkGpKOUWjBuDsK7NUGEdQrm2woW1Q4U3W0US56SqIFDCtMq6rVQDcQhNTlKI1O\n\t/rbsWT7JkapYiAbIrctjvRZJmi3s0uTavOgxzcuRH+i92T52GgdNZ3TJjWbfh7F+br/r\n\tY9eYUOFxai+OALf408I/7dAPWFwClm0IMOUaF+0QJq60rwWIc1yv5mIqabPTqk/FpBuW\n\tLMXg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to:user-agent;\n\tbh=FVEFgy7FmqCzdTMcBhIIEPNIlEFbzzWZg6cRyfx3Exc=;\n\tb=Nd1MeK+IUsSg4g15yzLJag+Je0RsNuTwywaQmSze0vfIAeFS7d9H5mtWC6chSFX1DP\n\twbfmoXER9PhJS8txpiBiBUYQewUmA6vEvxL2EQMr2o8B65cHHnGwIT4oDKNYn4Atel6Q\n\tP6vWFqPu/nswowj18LdmTLcRY4nQ4v4b1Ul7F3PjUIVsyiyQ6Juo3d36A2ozXRHmppy+\n\tRN6Cc48Ti1eys/0c9E5NhTfHa84/KSbvfnHAVEI6tcsIzNDQyNuLbyB0YqvvKD6uKlra\n\tqJitY7zT/FAQ6xfWDYhH58KLIU0vfPXw9RaNrsKJ/6BQ4oGcDTDt4z7i2+lUdx1ylLdN\n\t74NA==","X-Gm-Message-State":"AJcUukcfCLdSNKuQC07t/YoKLIQ9R5To4zDVgvy1MVszT5gN4jtO2IxO\n\tTUb0KOQrdDWDnSWQ6mBbyYFKe/yRe2c=","X-Google-Smtp-Source":"ALg8bN5aU61AI6+ray2SLgf35WtpJaoWJw5ni/Upotm6CDZIixx2F92yg0ur2LIELY80v3rgRP7L0w==","X-Received":"by 2002:a19:22c2:: with SMTP id\n\ti185mr21868504lfi.2.1548157390484; \n\tTue, 22 Jan 2019 03:43:10 -0800 (PST)","Date":"Tue, 22 Jan 2019 12:43:09 +0100","From":"Niklas =?iso-8859-1?q?S=F6derlund?= <niklas.soderlund@ragnatech.se>","To":"Jacopo Mondi <jacopo@jmondi.org>","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190122114309.GM6484@bigcity.dyn.berto.se>","References":"<20190121172705.19985-1-jacopo@jmondi.org>\n\t<20190121172705.19985-7-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20190121172705.19985-7-jacopo@jmondi.org>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH 6/6] libcamera: Global\n\ts/devnode/deviceNode rename","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":"Tue, 22 Jan 2019 11:43:11 -0000"}}]