From 279a468703961a7c2655da40a3c80c1a57dcafec Mon Sep 17 00:00:00 2001 From: Uwe Seimet Date: Tue, 5 Sep 2023 21:22:47 +0200 Subject: [PATCH] Rix minor compile-time issues on the Pi --- cpp/hal/gpiobus_raspberry.cpp | 4 ++-- cpp/test/device_test.cpp | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cpp/hal/gpiobus_raspberry.cpp b/cpp/hal/gpiobus_raspberry.cpp index 4df1fdae58..7eb3cfdfdc 100644 --- a/cpp/hal/gpiobus_raspberry.cpp +++ b/cpp/hal/gpiobus_raspberry.cpp @@ -87,7 +87,7 @@ bool GPIOBUS_Raspberry::Init(mode_e mode) // Map peripheral region memory void *map = mmap(NULL, 0x1000100, PROT_READ | PROT_WRITE, MAP_SHARED, fd, baseaddr); if (map == MAP_FAILED) { - strerrno("Error: Unable to map memory"); + spdlog::error("Error: Unable to map memory: "+ string(strerror(errno))); close(fd); return false; } @@ -183,7 +183,7 @@ bool GPIOBUS_Raspberry::Init(mode_e mode) // GPIO chip open fd = open("/dev/gpiochip0", 0); if (fd == -1) { - spdlog::error("Unable to open /dev/gpiochip0. Is PiSCSI or RaSCSI already running?") + spdlog::error("Unable to open /dev/gpiochip0. Is PiSCSI or RaSCSI already running?"); return false; } diff --git a/cpp/test/device_test.cpp b/cpp/test/device_test.cpp index 04be393ce9..3dbd5b3c5c 100644 --- a/cpp/test/device_test.cpp +++ b/cpp/test/device_test.cpp @@ -133,28 +133,28 @@ TEST(DeviceTest, ParseDeviceType) TEST(DeviceTest, GetTypeString) { MockDevice schd(SCHD); - EXPECT_STREQ("SCHD", schd.GetTypeString()); + EXPECT_EQ("SCHD", schd.GetTypeString()); MockDevice scrm(SCRM); - EXPECT_STREQ("SCRM", scrm.GetTypeString()); + EXPECT_EQ("SCRM", scrm.GetTypeString()); MockDevice scmo(SCMO); - EXPECT_STREQ("SCMO", scmo.GetTypeString()); + EXPECT_EQ("SCMO", scmo.GetTypeString()); MockDevice sccd(SCCD); - EXPECT_STREQ("SCCD", sccd.GetTypeString()); + EXPECT_EQ("SCCD", sccd.GetTypeString()); MockDevice schs(SCHS); - EXPECT_STREQ("SCHS", schs.GetTypeString()); + EXPECT_EQ("SCHS", schs.GetTypeString()); MockDevice scbr(SCBR); - EXPECT_STREQ("SCBR", scbr.GetTypeString()); + EXPECT_EQ("SCBR", scbr.GetTypeString()); MockDevice scdp(SCDP); - EXPECT_STREQ("SCDP", scdp.GetTypeString()); + EXPECT_EQ("SCDP", scdp.GetTypeString()); MockDevice sclp(SCLP); - EXPECT_STREQ("SCLP", sclp.GetTypeString()); + EXPECT_EQ("SCLP", sclp.GetTypeString()); } TEST(DeviceTest, Vendor)