PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: Global s/devnode/deviceNode rename

Browse Source 
Do not use the abreviated version for members, variables and getter
methods.

Library-wise rename, no intended functional changes.

Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Jacopo Mondi
2019-01-21 17:53:28 +01:00
parent d18d25bde3
commit 1af83ca6df
11 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/media_device/media_device_link_test.cpp
View File

@@ -55,7 +55,7 @@ class MediaDeviceLinkTest : public Test
if (dev_->open()) {
cerr << "Failed to open media device at "
<< dev_->devnode() << endl;
<< dev_->deviceNode() << endl;
return TestFail;
}

12
test/media_device/media_device_print_test.cpp
View File

@@ -35,7 +35,7 @@ protected:
void cleanup() { }
private:
int testMediaDevice(string devnode);
int testMediaDevice(string deviceNode);
void printMediaGraph(const MediaDevice &media, ostream &os);
void printLinkFlags(const MediaLink *link, ostream &os);
@@ -68,7 +68,7 @@ void MediaDevicePrintTest::printLinkFlags(const MediaLink *link, ostream &os)
*/
void MediaDevicePrintTest::printMediaGraph(const MediaDevice &media, ostream &os)
{
os << "\n" << media.driver() << " - " << media.devnode() << "\n\n";
os << "\n" << media.driver() << " - " << media.deviceNode() << "\n\n";
for (auto const &entity : media.entities()) {
os << "\"" << entity->name() << "\"\n";
@@ -108,9 +108,9 @@ void MediaDevicePrintTest::printMediaGraph(const MediaDevice &media, ostream &os
}
/* Test a single media device. */
int MediaDevicePrintTest::testMediaDevice(const string devnode)
int MediaDevicePrintTest::testMediaDevice(const string deviceNode)
{
MediaDevice dev(devnode);
MediaDevice dev(deviceNode);
int ret;
/* Fuzzy open/close sequence. */
@@ -144,7 +144,7 @@ int MediaDevicePrintTest::testMediaDevice(const string devnode)
#define MAX_MEDIA_DEV 256
int MediaDevicePrintTest::run()
{
const string devnode("/dev/media");
const string deviceNode("/dev/media");
unsigned int i;
int ret = 77; /* skip test exit code */
@@ -153,7 +153,7 @@ int MediaDevicePrintTest::run()
* system, if any.
*/
for (i = 0; i < MAX_MEDIA_DEV; i++) {
string mediadev = devnode + to_string(i);
string mediadev = deviceNode + to_string(i);
struct stat pstat = { };
if (stat(mediadev.c_str(), &pstat))

4
test/pipeline/ipu3/ipu3_pipeline_test.cpp
View File

@@ -72,7 +72,7 @@ int IPU3PipelineTest::init()
}
if (cio2->open()) {
cerr << "Failed to open media device " << cio2->devnode() << endl;
cerr << "Failed to open media device " << cio2->deviceNode() << endl;
return TestFail;
}
@@ -84,7 +84,7 @@ int IPU3PipelineTest::init()
*/
int ret = cio2->populate();
if (ret) {
cerr << "Failed to populate media device " << cio2->devnode() << endl;
cerr << "Failed to populate media device " << cio2->deviceNode() << endl;
return TestFail;
}