From 3c3920c465730dbcdaca0926fc3e030d41fd0ae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Sat, 1 Feb 2025 18:35:08 +0100 Subject: [PATCH 01/21] fix: imports --- usr/src/sh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/src/sh.c b/usr/src/sh.c index 9be1243f7..d0620fd60 100644 --- a/usr/src/sh.c +++ b/usr/src/sh.c @@ -19,9 +19,9 @@ */ #include +#include #include -#include #include #include #include From 9e674b00197cbcd38898bf6f308a96317463d8a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Sat, 1 Feb 2025 18:35:20 +0100 Subject: [PATCH 02/21] fix: main's return type --- usr/src/sh.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/usr/src/sh.c b/usr/src/sh.c index d0620fd60..6932ab17b 100644 --- a/usr/src/sh.c +++ b/usr/src/sh.c @@ -333,8 +333,7 @@ void sigint_sh_handler(int sig) { /* * Main entry point of the shell application. */ -void main(int argc, char *argv[]) -{ +int main(int argc, char *argv[]) { char user_input[80]; int i; struct sigaction sa; From 94de40fc83d1b31a179c3b03e42bbfaa8afa43f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Sat, 1 Feb 2025 18:36:25 +0100 Subject: [PATCH 03/21] fix: void function shouldn't return anything --- usr/src/sh.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/usr/src/sh.c b/usr/src/sh.c index 6932ab17b..810ad04ce 100644 --- a/usr/src/sh.c +++ b/usr/src/sh.c @@ -97,24 +97,20 @@ void escape_arrow_key(char *buffer, int size) { * More secure way and escaped way to get user input */ void get_user_input(char *buffer, int buf_size) { - if (buffer == NULL || buf_size <= 0) { - return NULL; - } - - memset(buffer,0,buf_size); - - if (fgets(buffer, buf_size, stdin) != NULL) { - escape_arrow_key(buffer,buf_size); + if (buffer == NULL || buf_size <= 0) { + return; + } + + memset(buffer, 0, buf_size); + + if (fgets(buffer, buf_size, stdin) != NULL) { + escape_arrow_key(buffer, buf_size); trim(buffer, buf_size); - size_t len = strlen(buffer); - if (len > 0 && buffer[len - 1] == '\n') { - buffer[len - 1] = '\0'; - } - - return buffer; - } - - return NULL; + size_t len = strlen(buffer); + if (len > 0 && buffer[len - 1] == '\n') { + buffer[len - 1] = '\0'; + } + } } /* From aaa792a9d0f5d39bfc84d4e9d1af9aa177363d4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Sat, 1 Feb 2025 18:49:26 +0100 Subject: [PATCH 04/21] ci: build usr space with -Werror and both toolchain files --- .github/workflows/build.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a42d60b7c..60f17f729 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,10 +31,18 @@ jobs: build-usr: runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + CMAKE_TOOLCHAIN_FILE: ['../aarch64_toolchain.cmake', + '../arm_toolchain.cmake'] + BUILD_TYPE: ["Debug", "Release"] steps: - name: Checkout repository uses: actions/checkout@v3 - name: Build run: | - docker run --rm -t -v "${PWD}:/so3" ghcr.io/smartobjectoriented/so3-env:main bash -c "cd usr && ./build.sh" + docker run --rm -t -v "${PWD}:/so3" ghcr.io/smartobjectoriented/so3-env:main bash -c " + mkdir usr/build && cd usr/build && cmake -Wall -Werror -Wno-dev --no-warn-unused-cli -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} -DCMAKE_TOOLCHAIN_FILE= ${{matrix.CMAKE_TOOLCHAIN_FILE } .. && + make -j{nproc}" From 4d9157f987f880367de6ca3733d11446b50d0475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Sat, 1 Feb 2025 18:51:01 +0100 Subject: [PATCH 05/21] ci: add missing } --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 60f17f729..eaed90a3c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,5 +44,5 @@ jobs: - name: Build run: | docker run --rm -t -v "${PWD}:/so3" ghcr.io/smartobjectoriented/so3-env:main bash -c " - mkdir usr/build && cd usr/build && cmake -Wall -Werror -Wno-dev --no-warn-unused-cli -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} -DCMAKE_TOOLCHAIN_FILE= ${{matrix.CMAKE_TOOLCHAIN_FILE } .. && + mkdir usr/build && cd usr/build && cmake -Wall -Werror -Wno-dev --no-warn-unused-cli -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} -DCMAKE_TOOLCHAIN_FILE= ${{matrix.CMAKE_TOOLCHAIN_FILE }} .. && make -j{nproc}" From 29586a44b5064e36bcec0d5d57acc59226d87df1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Sat, 1 Feb 2025 18:59:11 +0100 Subject: [PATCH 06/21] ci: replace {} with `` --- .github/workflows/build.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eaed90a3c..c539eaed7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,6 +43,4 @@ jobs: - name: Build run: | - docker run --rm -t -v "${PWD}:/so3" ghcr.io/smartobjectoriented/so3-env:main bash -c " - mkdir usr/build && cd usr/build && cmake -Wall -Werror -Wno-dev --no-warn-unused-cli -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} -DCMAKE_TOOLCHAIN_FILE= ${{matrix.CMAKE_TOOLCHAIN_FILE }} .. && - make -j{nproc}" + docker run --rm -t -v "${PWD}:/so3" ghcr.io/smartobjectoriented/so3-env:main bash -c "mkdir usr/build && cd usr/build && cmake -Wall -Werror -Wno-dev --no-warn-unused-cli -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} -DCMAKE_TOOLCHAIN_FILE= ${{matrix.CMAKE_TOOLCHAIN_FILE }} .. && make -j`nproc`" From babeb3075bcfd4c501545252cf89bfb38371a926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Sat, 1 Feb 2025 19:00:26 +0100 Subject: [PATCH 07/21] ci: add nproc to make -j --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c539eaed7..c9a6a9f97 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: - name: Build run: | - docker run --rm -v "${PWD}:/so3" ghcr.io/smartobjectoriented/so3-env:main bash -c "cd so3 && make virt32_defconfig && make -j" + docker run --rm -v "${PWD}:/so3" ghcr.io/smartobjectoriented/so3-env:main bash -c "cd so3 && make virt32_defconfig && make -j`nproc`" build-virt64: runs-on: ubuntu-latest @@ -27,7 +27,7 @@ jobs: - name: Build run: | - docker run --rm -v "${PWD}:/so3" ghcr.io/smartobjectoriented/so3-env:main bash -c "cd so3 && make virt64_defconfig && make -j" + docker run --rm -v "${PWD}:/so3" ghcr.io/smartobjectoriented/so3-env:main bash -c "cd so3 && make virt64_defconfig && make -j`nproc`" build-usr: runs-on: ubuntu-latest From 6381cad4bb9caa7c0bf92faebbf67c99b0f299b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Sat, 1 Feb 2025 19:07:31 +0100 Subject: [PATCH 08/21] ci: use full path for toolchain file --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c9a6a9f97..0f729ff91 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,8 +34,8 @@ jobs: strategy: fail-fast: false matrix: - CMAKE_TOOLCHAIN_FILE: ['../aarch64_toolchain.cmake', - '../arm_toolchain.cmake'] + CMAKE_TOOLCHAIN_FILE: ['/so3/usr/aarch64_toolchain.cmake', + '/so3/usr/arm_toolchain.cmake'] BUILD_TYPE: ["Debug", "Release"] steps: - name: Checkout repository @@ -43,4 +43,4 @@ jobs: - name: Build run: | - docker run --rm -t -v "${PWD}:/so3" ghcr.io/smartobjectoriented/so3-env:main bash -c "mkdir usr/build && cd usr/build && cmake -Wall -Werror -Wno-dev --no-warn-unused-cli -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} -DCMAKE_TOOLCHAIN_FILE= ${{matrix.CMAKE_TOOLCHAIN_FILE }} .. && make -j`nproc`" + docker run --rm -t -v "${PWD}:/so3" ghcr.io/smartobjectoriented/so3-env:main bash -c "mkdir usr/build && cd usr/build && cmake -Wall -Werror -Wno-dev --no-warn-unused-cli -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} -DCMAKE_TOOLCHAIN_FILE=${{matrix.CMAKE_TOOLCHAIN_FILE }} .. && make -j`nproc`" From db21f67194391486bf46f7319e04d098cc8277e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Sat, 1 Feb 2025 19:22:01 +0100 Subject: [PATCH 09/21] fix: import --- usr/src/sh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/src/sh.c b/usr/src/sh.c index 810ad04ce..d1f4190a7 100644 --- a/usr/src/sh.c +++ b/usr/src/sh.c @@ -19,8 +19,8 @@ */ #include -#include #include +#include #include #include From 24a82f33ce391bc1db6a0aee2f73b9fbd047a250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Sat, 1 Feb 2025 19:23:29 +0100 Subject: [PATCH 10/21] style: add empty line between fn signature and code --- usr/src/sh.c | 1 + 1 file changed, 1 insertion(+) diff --git a/usr/src/sh.c b/usr/src/sh.c index d1f4190a7..71ae7ca89 100644 --- a/usr/src/sh.c +++ b/usr/src/sh.c @@ -330,6 +330,7 @@ void sigint_sh_handler(int sig) { * Main entry point of the shell application. */ int main(int argc, char *argv[]) { + char user_input[80]; int i; struct sigaction sa; From 82f4aa22b319cc0efdc80fa2800edd4a3b8bdc7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Sat, 1 Feb 2025 19:30:08 +0100 Subject: [PATCH 11/21] ci: correctly set Wall and Werror as cflags --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0f729ff91..cf515dc11 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,4 +43,4 @@ jobs: - name: Build run: | - docker run --rm -t -v "${PWD}:/so3" ghcr.io/smartobjectoriented/so3-env:main bash -c "mkdir usr/build && cd usr/build && cmake -Wall -Werror -Wno-dev --no-warn-unused-cli -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} -DCMAKE_TOOLCHAIN_FILE=${{matrix.CMAKE_TOOLCHAIN_FILE }} .. && make -j`nproc`" + docker run --rm -t -v "${PWD}:/so3" ghcr.io/smartobjectoriented/so3-env:main bash -c "mkdir usr/build && cd usr/build && cmake -DCMAKE_C_FLAGS="-Wall -Werror -Wno-dev" -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} -DCMAKE_TOOLCHAIN_FILE=${{matrix.CMAKE_TOOLCHAIN_FILE }} .. && make -j`nproc`" From 90c7f616408c3079f27649e7aad4f30bd0aced32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Sat, 1 Feb 2025 19:34:06 +0100 Subject: [PATCH 12/21] ci: add --no-warn-unused-cli flag to cmake --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cf515dc11..25412ab8b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,4 +43,4 @@ jobs: - name: Build run: | - docker run --rm -t -v "${PWD}:/so3" ghcr.io/smartobjectoriented/so3-env:main bash -c "mkdir usr/build && cd usr/build && cmake -DCMAKE_C_FLAGS="-Wall -Werror -Wno-dev" -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} -DCMAKE_TOOLCHAIN_FILE=${{matrix.CMAKE_TOOLCHAIN_FILE }} .. && make -j`nproc`" + docker run --rm -t -v "${PWD}:/so3" ghcr.io/smartobjectoriented/so3-env:main bash -c "mkdir usr/build && cd usr/build && cmake --no-warn-unused-cli -DCMAKE_C_FLAGS="-Wall -Werror -Wno-dev" -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} -DCMAKE_TOOLCHAIN_FILE=${{matrix.CMAKE_TOOLCHAIN_FILE }} .. && make -j`nproc`" From 125355d7c93bd97e3185451d4fece878cadb4f47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Sat, 1 Feb 2025 19:34:31 +0100 Subject: [PATCH 13/21] ci: refactor so3 build with matrix for different configs --- .github/workflows/build.yml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 25412ab8b..7e8f8cbe7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,25 +9,20 @@ on: - main jobs: - build-virt32: + build-so3: runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + CONFIG: ['virt32_defconfig', + 'virt64_defconfig'] steps: - name: Checkout repository uses: actions/checkout@v3 - name: Build run: | - docker run --rm -v "${PWD}:/so3" ghcr.io/smartobjectoriented/so3-env:main bash -c "cd so3 && make virt32_defconfig && make -j`nproc`" - - build-virt64: - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Build - run: | - docker run --rm -v "${PWD}:/so3" ghcr.io/smartobjectoriented/so3-env:main bash -c "cd so3 && make virt64_defconfig && make -j`nproc`" + docker run --rm -v "${PWD}:/so3" ghcr.io/smartobjectoriented/so3-env:main bash -c "cd so3 && make ${{ matrix.CONFIG }} virt32_defconfig && make -j`nproc`" build-usr: runs-on: ubuntu-latest From 002f9fc1f41ca780040486844033fd41e2d1e313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Sat, 1 Feb 2025 19:39:07 +0100 Subject: [PATCH 14/21] ci: replace " with ' --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7e8f8cbe7..443a94397 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,4 +38,4 @@ jobs: - name: Build run: | - docker run --rm -t -v "${PWD}:/so3" ghcr.io/smartobjectoriented/so3-env:main bash -c "mkdir usr/build && cd usr/build && cmake --no-warn-unused-cli -DCMAKE_C_FLAGS="-Wall -Werror -Wno-dev" -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} -DCMAKE_TOOLCHAIN_FILE=${{matrix.CMAKE_TOOLCHAIN_FILE }} .. && make -j`nproc`" + docker run --rm -t -v "${PWD}:/so3" ghcr.io/smartobjectoriented/so3-env:main bash -c "mkdir usr/build && cd usr/build && cmake --no-warn-unused-cli -DCMAKE_C_FLAGS='-Wall -Werror -Wno-dev' -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} -DCMAKE_TOOLCHAIN_FILE=${{matrix.CMAKE_TOOLCHAIN_FILE }} .. && make -j`nproc`" From 031e90512e7fa5fefaa4b843cb35c4559ee2d064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Sat, 1 Feb 2025 19:58:10 +0100 Subject: [PATCH 15/21] ci: remove path from toolchain and -Wall --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 443a94397..9bf37fef0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,8 +29,8 @@ jobs: strategy: fail-fast: false matrix: - CMAKE_TOOLCHAIN_FILE: ['/so3/usr/aarch64_toolchain.cmake', - '/so3/usr/arm_toolchain.cmake'] + CMAKE_TOOLCHAIN_FILE: ['aarch64_toolchain.cmake', + 'arm_toolchain.cmake'] BUILD_TYPE: ["Debug", "Release"] steps: - name: Checkout repository @@ -38,4 +38,4 @@ jobs: - name: Build run: | - docker run --rm -t -v "${PWD}:/so3" ghcr.io/smartobjectoriented/so3-env:main bash -c "mkdir usr/build && cd usr/build && cmake --no-warn-unused-cli -DCMAKE_C_FLAGS='-Wall -Werror -Wno-dev' -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} -DCMAKE_TOOLCHAIN_FILE=${{matrix.CMAKE_TOOLCHAIN_FILE }} .. && make -j`nproc`" + docker run --rm -t -v "${PWD}:/so3" ghcr.io/smartobjectoriented/so3-env:main bash -c "mkdir usr/build && cd usr/build && cmake --no-warn-unused-cli -DCMAKE_C_FLAGS='-Werror' -Wno-dev -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} -DCMAKE_TOOLCHAIN_FILE=../${{matrix.CMAKE_TOOLCHAIN_FILE }} .. && make -j`nproc`" From c04c53549a1165deba896ef3e710944d62f75e61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Sat, 1 Feb 2025 19:58:42 +0100 Subject: [PATCH 16/21] build: expand CFLAGS passed on cmake command --- usr/aarch64_toolchain.cmake | 4 ++-- usr/arm_toolchain.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/usr/aarch64_toolchain.cmake b/usr/aarch64_toolchain.cmake index f379f2d8a..72a2dcc22 100644 --- a/usr/aarch64_toolchain.cmake +++ b/usr/aarch64_toolchain.cmake @@ -21,8 +21,8 @@ set(CMAKE_C_COMPILER "aarch64-none-linux-gnu-gcc") set(CMAKE_C_LINK_EXECUTABLE "aarch64-none-linux-gnu-ld -o ") set(CMAKE_ASM_COMPILER "aarch64-none-linux-gnu-gcc") -set(CMAKE_C_FLAGS "-Wall -O0 -std=c99 -D_GNU_SOURCE -nostdlib -O0 -pipe -Wall -D__ARM64__ \ - -g -ffreestanding -fno-common") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O0 -std=c99 -D_GNU_SOURCE -nostdlib -pipe \ + -D__ARM64__ -g -ffreestanding -fno-common") set(CMAKE_ASM_FLAGS_DEBUG "-D__ASSEMBLY__") diff --git a/usr/arm_toolchain.cmake b/usr/arm_toolchain.cmake index aa9a92b8e..44bc37b8a 100644 --- a/usr/arm_toolchain.cmake +++ b/usr/arm_toolchain.cmake @@ -21,8 +21,8 @@ set(CMAKE_C_COMPILER "arm-none-eabi-gcc") set(CMAKE_C_LINK_EXECUTABLE "arm-none-eabi-ld -o ") set(CMAKE_ASM_COMPILER "arm-none-eabi-gcc") -set(CMAKE_C_FLAGS "-Wall -O0 -std=c99 -D_GNU_SOURCE -nostdlib -O0 -pipe -Wall -D__ARM__ -marm \ - -mno-thumb-interwork -g -ffreestanding -fno-common") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O0 -std=c99 -D_GNU_SOURCE -nostdlib \ + -pipe -Wall -D__ARM__ -marm -mno-thumb-interwork -g -ffreestanding -fno-common") set(CMAKE_ASM_FLAGS_DEBUG "-D__ARM__ -D__ASSEMBLY__") From 94dba2f5d62e1254ae861cd652c44f8bc2430af9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Sat, 1 Feb 2025 20:01:37 +0100 Subject: [PATCH 17/21] fix: return value on non-void function --- usr/src/mydev_test.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/usr/src/mydev_test.c b/usr/src/mydev_test.c index 2a4f868c6..edd150852 100644 --- a/usr/src/mydev_test.c +++ b/usr/src/mydev_test.c @@ -4,8 +4,8 @@ #include #include -int main(void) -{ +int main(void) { + char write_buffer[20]; char read_buffer[20]; @@ -18,4 +18,5 @@ int main(void) printf("Wrote: %s - Read %s\n", write_buffer, read_buffer); assert(!strcmp(write_buffer, read_buffer)); + return 0; } From 8ebc9cd0793df9aa1078732d67a34ae90f5177b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Sat, 1 Feb 2025 20:03:57 +0100 Subject: [PATCH 18/21] fix: return value on non-void function --- usr/src/stress/lvgl_perf.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/usr/src/stress/lvgl_perf.c b/usr/src/stress/lvgl_perf.c index 0f807a1ed..373edb221 100644 --- a/usr/src/stress/lvgl_perf.c +++ b/usr/src/stress/lvgl_perf.c @@ -45,13 +45,6 @@ /* Screen resolution. */ static uint32_t scr_hres, scr_vres, *fbp; -/* File descriptor of the mouse and keyboard input device. */ -static int mfd; -static int kfd; - -/* lvgl group for the keyboard. */ -static lv_group_t *keyboard_group; - /* Used to measure the duration of execution */ struct timeval tv_start, tv_end; static uint64_t delta; @@ -216,8 +209,6 @@ int fb_init(void) int main(int argc, char **argv) { - pthread_t tick_thread; - printf("LVGL Performance test\n"); /* Initialization of lvgl. */ From f6be78f06749849fbd40c2193c1f0944ee7e5c38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Sat, 1 Feb 2025 20:07:40 +0100 Subject: [PATCH 19/21] fix: replace printf with LV_LOG_INFO --- usr/src/stress/lv_demo_stress.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/src/stress/lv_demo_stress.c b/usr/src/stress/lv_demo_stress.c index cd8b8e590..489111b46 100644 --- a/usr/src/stress/lv_demo_stress.c +++ b/usr/src/stress/lv_demo_stress.c @@ -430,7 +430,7 @@ static int count = 0; count++; if (count == 5) for (i = 0; i < 5; i++) - printf("## Elapsed time: %lld microseconds.\n", tv_end[i].tv_usec - tv_start[i].tv_usec); + LV_LOG_INFO("## Elapsed time: %lld microseconds.\n", tv_end[i].tv_usec - tv_start[i].tv_usec); state = -2; From e32340ed36fbd6035f83ec21cba6f620aafcea6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Sat, 1 Feb 2025 20:10:52 +0100 Subject: [PATCH 20/21] ci: don't build usr with release mode --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9bf37fef0..94056c991 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,11 +31,10 @@ jobs: matrix: CMAKE_TOOLCHAIN_FILE: ['aarch64_toolchain.cmake', 'arm_toolchain.cmake'] - BUILD_TYPE: ["Debug", "Release"] steps: - name: Checkout repository uses: actions/checkout@v3 - name: Build run: | - docker run --rm -t -v "${PWD}:/so3" ghcr.io/smartobjectoriented/so3-env:main bash -c "mkdir usr/build && cd usr/build && cmake --no-warn-unused-cli -DCMAKE_C_FLAGS='-Werror' -Wno-dev -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} -DCMAKE_TOOLCHAIN_FILE=../${{matrix.CMAKE_TOOLCHAIN_FILE }} .. && make -j`nproc`" + docker run --rm -t -v "${PWD}:/so3" ghcr.io/smartobjectoriented/so3-env:main bash -c "mkdir usr/build && cd usr/build && cmake --no-warn-unused-cli -DCMAKE_C_FLAGS='-Werror' -Wno-dev -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../${{matrix.CMAKE_TOOLCHAIN_FILE }} .. && make -j`nproc`" From d7a90fec544c6b05e0987f232657702c07fe6392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Mon, 3 Feb 2025 20:39:17 +0100 Subject: [PATCH 21/21] style: add empty line between includes from different folders --- usr/src/sh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/src/sh.c b/usr/src/sh.c index 71ae7ca89..24fef8181 100644 --- a/usr/src/sh.c +++ b/usr/src/sh.c @@ -20,8 +20,8 @@ #include #include -#include +#include #include #include #include