Merge upstream

.github/workflows/abi-checker.yml

@@ -22,7 +22,7 @@ jobs:
           sudo apt-get install abi-compliance-checker abi-dumper
 
       - name: Checkout merged-base
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           ref: ${{ github.event.pull_request.base.ref }}
 
@@ -32,7 +32,7 @@ jobs:
           abi-dumper build/libcsp.so -lver "merged-base" -o ../tmp/libcsp-merged-base.dump
 
       - name: Checkout Current PR
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           fetch-depth: 0
           ref: ${{github.event.pull_request.head.ref}}

.github/workflows/build-test-freertos.yml

@@ -1,5 +1,10 @@
 name: FreeRTOS Build and Test
-on: [push, pull_request]
+on:
+  pull_request:
+  push:
+    branches:
+      - develop
+      - 'libcsp-*'
 permissions:
   contents: read
 concurrency:
@@ -17,18 +22,18 @@ jobs:
           sudo apt-get install ninja-build meson tree
 
       - name: Checkout Test App
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           repository: libcsp/libcsp-freertos
 
       - name: Checkout FreeRTOS Kernel
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           repository: FreeRTOS/FreeRTOS-Kernel
           path: freertos
 
       - name: Checkout libcsp under subprojects
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           path: subprojects/libcsp
 

.github/workflows/build-test-python.yml

@@ -1,5 +1,10 @@
 name: Python Bindings
-on: [push, pull_request]
+on:
+  pull_request:
+  push:
+    branches:
+      - develop
+      - 'libcsp-*'
 permissions:
   contents: read
 concurrency:
@@ -25,7 +30,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Setup Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -39,7 +44,7 @@ jobs:
           sudo apt-get install ninja-build ${{ matrix.buildsystem }}
 
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Build libcsp examples
         run: python3 examples/buildall.py --build-system=${{ matrix.buildsystem }}

.github/workflows/build-test-zephyr.yml

@@ -1,7 +1,10 @@
 name: Zephyr Build and Test
 on:
-  push:
   pull_request:
+  push:
+    branches:
+      - develop
+      - 'libcsp-*'
   schedule:
     - cron: '0 10 * * 0' # Run it every Sunday 10am UTC
 
@@ -26,7 +29,7 @@ jobs:
 
     steps:
       - name: Setup Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -35,7 +38,7 @@ jobs:
           python3 --version
 
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           path: libcsp-zephyr
           repository: yashi/libcsp-zephyr

.github/workflows/build-test.yml

@@ -1,5 +1,10 @@
 name: Build and Test
-on: [push, pull_request]
+on:
+  pull_request:
+  push:
+    branches:
+      - develop
+      - 'libcsp-*'
 permissions:
   contents: read
 concurrency:
@@ -10,66 +15,85 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os:
-          - ubuntu-24.04
-          - ubuntu-22.04
-        buildsystem:
-          - meson
-          - cmake
-          - waf
-        compiler:
-          - CC: gcc-10
+        target:
+          # Ubuntu 22.04 only has GCC 10, 11, 12
+          - os: ubuntu-22.04
+            CC: gcc-10
             CXX: g++-10
-          - CC: gcc-11
+          - os: ubuntu-22.04
+            CC: gcc-11
             CXX: g++-11
-          - CC: gcc-12
+          - os: ubuntu-22.04
+            CC: gcc-12
             CXX: g++-12
-          - CC: gcc-13
+          - os: ubuntu-22.04
+            CC: clang
+            CXX: clang++
+          # Ubuntu 24.04 only has GCC 12, 13, 14
+          - os: ubuntu-24.04
+            CC: gcc-12
+            CXX: g++-12
+          - os: ubuntu-24.04
+            CC: gcc-13
             CXX: g++-13
-          - CC: gcc-14
+          - os: ubuntu-24.04
+            CC: gcc-14
             CXX: g++-14
-          - CC: clang
+          - os: ubuntu-24.04
+            CC: clang
             CXX: clang++
+          # Ubuntu 26.04 only has GCC 13, 14, 15
+          - os: ubuntu-26.04
+            CC: gcc-13
+            CXX: g++-13
+          - os: ubuntu-26.04
+            CC: gcc-14
+            CXX: g++-14
+          - os: ubuntu-26.04
+            CC: gcc-15
+            CXX: g++-15
+          - os: ubuntu-26.04
+            CC: clang
+            CXX: clang++
+        buildsystem:
+          - meson
+          - cmake
+          - waf
         csp_version:
           - 1
           - 2
-        exclude:
-          # Ubuntu 22.04 only has GCC 10, 11, 12
-          - os: ubuntu-22.04
-            compiler:
-              CC: gcc-13
-          - os: ubuntu-22.04
-            compiler:
-              CC: gcc-14
-          # Ubuntu 24.04 only has GCC 12, 13, 14
-          - os: ubuntu-24.04
-            compiler:
-              CC: gcc-10
-          - os: ubuntu-24.04
-            compiler:
-              CC: gcc-11
 
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.target.os }}
     steps:
       - name: Setup packages on Linux
         if: ${{ runner.os == 'Linux' }}
         run: |
           sudo apt-get update
           sudo apt-get install libzmq3-dev libsocketcan-dev socat iproute2
+          sudo apt-cache search linux-modules
+
+      - name: Setup packages on Ubuntu 22.04/24.04
+        if: ${{ runner.os == 'Linux' && (matrix.target.os == 'ubuntu-22.04' || matrix.target.os == 'ubuntu-24.04') }}
+        run: |
           sudo apt-get install linux-modules-extra-$(uname -r)
 
+      - name: Setup packages on Linux 26.04
+        if: ${{ runner.os == 'Linux' && (matrix.target.os == 'ubuntu-26.04') }}
+        run: |
+          sudo apt-get install linux-modules-$(uname -r)
+
       - name: Setup build system packages on Linux
         if: ${{ runner.os == 'Linux' && matrix.buildsystem != 'waf' }}
         run: |
           sudo apt-get install ninja-build ${{ matrix.buildsystem }}
 
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Build
         env:
-          CC: ${{ matrix.compiler.CC }}
-          CXX: ${{ matrix.compiler.CXX }}
+          CC: ${{ matrix.target.CC }}
+          CXX: ${{ matrix.target.CXX }}
         run: python3 ./examples/buildall.py --build-system=${{ matrix.buildsystem }}
 
       - name: Run Loopback Test

.github/workflows/check-compile-options.yml

@@ -0,0 +1,39 @@
+name: Check Compile Options
+on:
+  pull_request:
+  push:
+    branches:
+      - develop
+      - 'libcsp-*'
+permissions:
+  contents: read
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+jobs:
+  check-compile-options:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-22.04
+          - ubuntu-24.04
+        options:
+          - "-D enable_csp_print=false -D print_stdio=false"
+          - "-D enable_csp_print=false -D print_stdio=true"
+          - "-D enable_csp_print=true  -D print_stdio=false"
+          - "-D enable_csp_print=true  -D print_stdio=true"
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Setup packages on Linux
+        run: |
+          sudo apt-get update
+          sudo apt-get install libzmq3-dev libsocketcan-dev ninja-build meson
+
+      - name: Checkout
+        uses: actions/checkout@v7
+
+      - name: Build with compile time options
+        run: |
+          meson setup ${{ matrix.options }} builddir
+          meson compile -C builddir/

.github/workflows/check-merge-commits.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
 
       - name: Checkout PR head
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0

.github/workflows/codespell.yml

@@ -1,8 +1,11 @@
 name: Codespell Check
 
-on:  
+on:
   pull_request:
   push:
+    branches:
+      - develop
+      - 'libcsp-*'
 permissions:
   contents: read
 
@@ -12,7 +15,7 @@ jobs:
 
     steps:  
       - name: Checkout repository  
-        uses: actions/checkout@v6  
+        uses: actions/checkout@v7  
 
       - name: Install codespell  
         run: pip install codespell  

.github/workflows/develop-build-sphinx-docs.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Setup packages on Linux
         if: ${{ runner.os == 'Linux' }}

.github/workflows/gitlint.yml

@@ -16,7 +16,7 @@ jobs:
           pip3 install gitlint
 
       - name: Checkout the code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0

.github/workflows/linelint.yaml

@@ -11,7 +11,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Linelint
         uses: fernandrone/linelint@master

.gitlint

@@ -3,3 +3,7 @@ regex-style-search=true
 
 [ignore-body-lines]
 regex=^(?:(?:Signed-off|Acked|Co-Authored|Reported|Tested)-by: |\[\d+\]: https:\/\/)
+
+[ignore-by-author-name]
+regex=^dependabot\[bot\]$
+ignore=B1

CMakeLists.txt

@@ -10,6 +10,11 @@ add_library(csp)
 set_target_properties(csp PROPERTIES C_STANDARD 11)
 set_target_properties(csp PROPERTIES C_EXTENSIONS ON)
 
+set_target_properties(csp PROPERTIES
+    VERSION ${CSP_VERSION}
+    SOVERSION ${CSP_VERSION_MAJOR}
+)
+
 set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS Debug Release MinSizeRel)
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
   message(STATUS "No build type selected, default to MinSizeRel")

include/csp/csp.h

@@ -510,7 +510,12 @@ void csp_hex_dump(const char *desc, const void *addr, int len);
 #else
 
 inline void csp_conn_print_table(void) {}
-inline void csp_hex_dump(const char *desc, void *addr, int len) {}
+inline void csp_hex_dump(const char *desc, const void *addr, int len) {
+   /* Avoid compiler warnings about unused parameters when CSP_ENABLE_CSP_PRINT=0 */
+   (void)desc;
+   (void)addr;
+   (void)len;
+}
 
 #endif
 

include/csp/csp_debug.h

@@ -73,7 +73,7 @@ void csp_print_func(const char * fmt, ...);
 #if (CSP_ENABLE_CSP_PRINT)
 #define csp_print(...) csp_print_func(__VA_ARGS__);
 #else
-#define csp_print(...) do {} while(0)
+#define csp_print(...) do { if(0) csp_print_func(__VA_ARGS__); /* avoids unused-parameter compiler errors */ } while(0)
 #endif
 
 #define csp_rdp_error(format, ...) { if (csp_dbg_rdp_print >= 1) { csp_print("\033[31m" format "\033[0m", ##__VA_ARGS__); }}

meson.build

@@ -1,4 +1,4 @@
-project('csp', 'c', version: '2.2', license: 'LGPL', meson_version : '>=0.61.2', default_options : [
+project('csp', 'c', version: '2.2', license: 'MIT', meson_version : '>=0.61.2', default_options : [
 	'c_std=gnu11',
 	'optimization=s',
 	'warning_level=3',
@@ -101,6 +101,7 @@ csp_lib = library('csp',
 	c_args : csp_c_args,
 	install : true,
 	pic:true,
+	version : meson.project_version(),
 )
 
 # The following dependency variable is for parent projects to link