From 4c66fc22911ab3255a54e567e96c6b41e7ea87d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= Date: Sun, 19 May 2024 10:08:12 +0800 Subject: [PATCH 1/2] Fixed syntax error (extra closing bracket) in sdcard_spi decoder. This error prevents the module from loading. Fixes issue #768. --- libsigrokdecode4DSL/decoders/sdcard_spi/pd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libsigrokdecode4DSL/decoders/sdcard_spi/pd.py b/libsigrokdecode4DSL/decoders/sdcard_spi/pd.py index 72702677..1a363812 100644 --- a/libsigrokdecode4DSL/decoders/sdcard_spi/pd.py +++ b/libsigrokdecode4DSL/decoders/sdcard_spi/pd.py @@ -231,7 +231,7 @@ class Decoder(srd.Decoder): def handle_cmd24(self): # CMD24: WRITE_BLOCK - self.putc(Ann.CMD24, 'Write a block to address {$}', self.arg)) + self.putc(Ann.CMD24, 'Write a block to address {$}', self.arg) self.is_cmd24 = True self.state = 'GET RESPONSE R1' From 2018baf0e1add4f9971dd02271ee8e6773cebfac Mon Sep 17 00:00:00 2001 From: Lutz Freitag Date: Wed, 22 May 2024 21:29:54 +0200 Subject: [PATCH 2/2] added missing includes and a define to compile it for recent machines I use arch btw --- CMakeLists.txt | 2 ++ libsigrok4DSL/input/in_wav.c | 1 + libsigrok4DSL/strutil.c | 1 + 3 files changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index d12bd0db..7b8cf57d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -668,6 +668,8 @@ install(FILES DSView/icons/logo.svg DESTINATION share/pixmaps RENAME dsview.svg) if(CMAKE_SYSTEM_NAME MATCHES "Linux") install(FILES DSView/DSView.desktop DESTINATION /usr/share/applications RENAME dsview.desktop) + add_compile_definitions(_DEFAULT_SOURCE) + if(IS_DIRECTORY /usr/lib/udev/rules.d) install(FILES DSView/DreamSourceLab.rules DESTINATION /usr/lib/udev/rules.d RENAME 60-dreamsourcelab.rules) elseif(IS_DIRECTORY /lib/udev/rules.d) diff --git a/libsigrok4DSL/input/in_wav.c b/libsigrok4DSL/input/in_wav.c index de16e513..7a130496 100644 --- a/libsigrok4DSL/input/in_wav.c +++ b/libsigrok4DSL/input/in_wav.c @@ -24,6 +24,7 @@ #include #include #include +#include #include "../log.h" #include diff --git a/libsigrok4DSL/strutil.c b/libsigrok4DSL/strutil.c index 52cb01d8..6c02c6df 100644 --- a/libsigrok4DSL/strutil.c +++ b/libsigrok4DSL/strutil.c @@ -21,6 +21,7 @@ #include "libsigrok-internal.h" #include #include +#include #include #include "log.h"