From 4c591100bec6c622b54ceebe2641978513588ed8 Mon Sep 17 00:00:00 2001 From: Uwe Seimet Date: Sun, 12 Nov 2023 09:26:06 +0100 Subject: [PATCH 1/5] Add cast --- cpp/piscsi/piscsi_service.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cpp/piscsi/piscsi_service.cpp b/cpp/piscsi/piscsi_service.cpp index 4f842defa8..af3dc915c5 100644 --- a/cpp/piscsi/piscsi_service.cpp +++ b/cpp/piscsi/piscsi_service.cpp @@ -42,7 +42,8 @@ string PiscsiService::Init(const callback& cb, int port) server.sin_family = PF_INET; server.sin_port = htons((uint16_t)port); server.sin_addr.s_addr = INADDR_ANY; - if (bind(service_socket, reinterpret_cast(&server), sizeof(sockaddr_in)) < 0) { //NOSONAR bit_cast is not supported by the bullseye compiler + if (bind(service_socket, reinterpret_cast(&server), + static_cast(sizeof(sockaddr_in))) < 0) { //NOSONAR bit_cast is not supported by the bullseye compiler Stop(); return "Port " + to_string(port) + " is in use, is piscsi already running?"; } From 31156d1a23967369d547b8026555e5a3c5cd855d Mon Sep 17 00:00:00 2001 From: Uwe Seimet Date: Sun, 12 Nov 2023 11:32:06 +0100 Subject: [PATCH 2/5] Improve BSD compatiblity --- cpp/hal/sbc_version.cpp | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/cpp/hal/sbc_version.cpp b/cpp/hal/sbc_version.cpp index caebbedf2f..67c40eaac3 100644 --- a/cpp/hal/sbc_version.cpp +++ b/cpp/hal/sbc_version.cpp @@ -144,23 +144,6 @@ uint32_t SBC_Version::GetPeripheralAddress(void) return address; } -#elif defined __NetBSD__ -uint32_t SBC_Version::GetPeripheralAddress(void) -{ - char buf[1024]; - size_t len = sizeof(buf); - uint32_t address; - - if (sysctlbyname("hw.model", buf, &len, NULL, 0) || strstr(buf, "ARM1176JZ-S") != buf) { - // Failed to get CPU model || Not BCM2835 - // use the address of BCM283[67] - address = 0x3f000000; - } else { - // Use BCM2835 address - address = 0x20000000; - } - return address; -} #else uint32_t SBC_Version::GetPeripheralAddress(void) { From c342c01da901f3b60a586c7e9b939194ed1b6131 Mon Sep 17 00:00:00 2001 From: Uwe Seimet Date: Sun, 12 Nov 2023 11:44:55 +0100 Subject: [PATCH 3/5] Revert "Improve BSD compatiblity" This reverts commit 31156d1a23967369d547b8026555e5a3c5cd855d. --- cpp/hal/sbc_version.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/cpp/hal/sbc_version.cpp b/cpp/hal/sbc_version.cpp index 67c40eaac3..caebbedf2f 100644 --- a/cpp/hal/sbc_version.cpp +++ b/cpp/hal/sbc_version.cpp @@ -144,6 +144,23 @@ uint32_t SBC_Version::GetPeripheralAddress(void) return address; } +#elif defined __NetBSD__ +uint32_t SBC_Version::GetPeripheralAddress(void) +{ + char buf[1024]; + size_t len = sizeof(buf); + uint32_t address; + + if (sysctlbyname("hw.model", buf, &len, NULL, 0) || strstr(buf, "ARM1176JZ-S") != buf) { + // Failed to get CPU model || Not BCM2835 + // use the address of BCM283[67] + address = 0x3f000000; + } else { + // Use BCM2835 address + address = 0x20000000; + } + return address; +} #else uint32_t SBC_Version::GetPeripheralAddress(void) { From 1d29ec7f42cba8b67d0d5e71307ba0166d1ac545 Mon Sep 17 00:00:00 2001 From: Uwe Seimet Date: Sun, 12 Nov 2023 11:47:35 +0100 Subject: [PATCH 4/5] Update compatibility handling --- cpp/hal/sbc_version.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/hal/sbc_version.cpp b/cpp/hal/sbc_version.cpp index caebbedf2f..cd334ad336 100644 --- a/cpp/hal/sbc_version.cpp +++ b/cpp/hal/sbc_version.cpp @@ -144,7 +144,7 @@ uint32_t SBC_Version::GetPeripheralAddress(void) return address; } -#elif defined __NetBSD__ +#elif defined __NetBSD__ && (!defined(__x86_64__) || defined(__X86__)) uint32_t SBC_Version::GetPeripheralAddress(void) { char buf[1024]; From a27323c4c6561a3feca2aad5a1ae4c0dd5910678 Mon Sep 17 00:00:00 2001 From: Uwe Seimet Date: Sun, 12 Nov 2023 11:57:52 +0100 Subject: [PATCH 5/5] Fix SonarQube issue --- cpp/piscsi/piscsi_service.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/piscsi/piscsi_service.cpp b/cpp/piscsi/piscsi_service.cpp index af3dc915c5..90f60774cc 100644 --- a/cpp/piscsi/piscsi_service.cpp +++ b/cpp/piscsi/piscsi_service.cpp @@ -42,8 +42,8 @@ string PiscsiService::Init(const callback& cb, int port) server.sin_family = PF_INET; server.sin_port = htons((uint16_t)port); server.sin_addr.s_addr = INADDR_ANY; - if (bind(service_socket, reinterpret_cast(&server), - static_cast(sizeof(sockaddr_in))) < 0) { //NOSONAR bit_cast is not supported by the bullseye compiler + if (bind(service_socket, reinterpret_cast(&server), //NOSONAR bit_cast is not supported by the bullseye compiler + static_cast(sizeof(sockaddr_in))) < 0) { Stop(); return "Port " + to_string(port) + " is in use, is piscsi already running?"; }