Merge 67bd1bd468 into 1fb33da291

Merge pull request #60 from barracuda156/darwin
parse_file.h: include sys/types.h
2024-12-21 22:10:12 +00:00 · 2024-12-11 14:33:20 +11:00 · 2024-12-11 14:33:11 +11:00 · 2024-12-11 14:32:28 +11:00 · 2024-12-11 14:25:01 +11:00 · 2024-12-03 02:32:38 +03:00
4 changed files with 20 additions and 13 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -24,7 +24,7 @@ jobs:
      run:
        shell: cmd
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        with:
          submodules: 'recursive'
      - uses: lukka/get-cmake@latest
@ -35,7 +35,7 @@ jobs:
          cmake .. -DBLISP_BUILD_CLI=ON -DCMAKE_BUILD_TYPE=Release
          cmake --build . --config Release
      - name: Upload results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: blips-windows-x86_64.zip
          path: |
@ -45,7 +45,7 @@ jobs:
  build-macos:
    runs-on: macos-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        with:
          submodules: 'recursive'
      - uses: lukka/get-cmake@latest
@ -56,7 +56,7 @@ jobs:
          cmake .. -DBLISP_BUILD_CLI=ON -DCMAKE_BUILD_TYPE=Release
          cmake --build .
      - name: Upload results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: blips-apple-universal.zip
          path: |
@ -66,7 +66,7 @@ jobs:
  build-linux:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        with:
          submodules: 'recursive'
      - uses: lukka/get-cmake@latest
@ -77,12 +77,12 @@ jobs:
          cmake .. -DBLISP_BUILD_CLI=ON -DCMAKE_BUILD_TYPE=Release
          cmake --build .
      - name: Upload results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: blips-linux-x86_64.zip
          path: |
            build/tools/blisp/blisp
-          if-no-files-found: error 
+          if-no-files-found: error

  build-linux-alternative-arch:
    runs-on: ubuntu-latest
@ -99,7 +99,7 @@ jobs:
          - arch: riscv64
            distro: ubuntu_latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        with:
          submodules: 'recursive'
      - uses: uraimo/run-on-arch-action@v2
@ -149,9 +149,9 @@ jobs:
            echo "Produced artifact at /artifacts/${artifact_name}"

      - name: Upload results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: blisp-linux-${{ matrix.arch }}.zip
          path: |
            artifacts/blisp-*
-          if-no-files-found: error 
+          if-no-files-found: error
--- a/include/blisp_struct.h
+++ b/include/blisp_struct.h
@ -9,6 +9,12 @@
 #include <assert.h>
 #include <stdint.h>

+#if !defined(static_assert) && (defined(__GNUC__) || defined(__clang__)) \
+    && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L \
+    && __STDC_VERSION__ <= 201710L
+#define static_assert _Static_assert
+#endif
+
 #pragma pack(push, 1)

 typedef struct {
--- a/lib/blisp.c
+++ b/lib/blisp.c
@ -360,13 +360,13 @@ blisp_return_t blisp_device_flash_erase(struct blisp_device* device,
  *(uint32_t*)(payload + 4) = end_address;

  blisp_return_t ret = blisp_send_command(device, 0x30, payload, 8, true);
-  if (ret < 0)
+  if (ret != BLISP_OK)
    return ret;
  do {
    ret = blisp_receive_response(device, false);
  } while (ret == BLISP_ERR_PENDING);

-  return 0;
+  return ret;
 }

 blisp_return_t blisp_device_flash_write(struct blisp_device* device,
@ -414,4 +414,4 @@ blisp_return_t blisp_device_reset(struct blisp_device* device) {
 void blisp_device_close(struct blisp_device* device) {
  struct sp_port* serial_port = device->serial_port;
  sp_close(serial_port);
-}
+}
--- a/tools/blisp/src/file_parsers/parse_file.h
+++ b/tools/blisp/src/file_parsers/parse_file.h
@ -2,6 +2,7 @@
 #define PARSE_FILE_H_
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/types.h> /* ssize_t */
 #if defined(_MSC_VER)
 #include <BaseTsd.h>
 typedef SSIZE_T ssize_t;
Author	SHA1	Message	Date
Pavel Zakopaylo	92572c9811	Merge `67bd1bd468` into `1fb33da291`	2024-12-11 14:33:20 +11:00
Ben V. Brown	1fb33da291	Merge pull request #60 from barracuda156/darwin parse_file.h: include sys/types.h	2024-12-11 14:33:11 +11:00
Ben V. Brown	17f6234a4a	Merge pull request #62 from barracuda156/static_assert blisp_struct.h: use _Static_assert for pre-C23 compatibility	2024-12-11 14:32:28 +11:00
Ben V. Brown	108c387d31	Merge pull request #71 from ia/checkout-v4 * workflows/build.yml: update checkout to v4 since v3 is deprecated * workflows/build.yml: update upload-artifact to v4 since v3 is deprecated * workflows/build.yml: remove extra space in the end of the lines	2024-12-11 14:25:01 +11:00
Ivan Zorin	ebae66c392	workflows/build.yml: remove extra space in the end of the lines	2024-12-03 02:32:38 +03:00
Ivan Zorin	c2fc20452c	workflows/build.yml: update upload-artifact to v4 since v3 is deprecated	2024-12-03 02:31:26 +03:00
Ivan Zorin	39388c6b2c	workflows/build.yml: update checkout to v4 since v3 is deprecated	2024-12-03 02:10:27 +03:00
Sergey Fedorov	be86373d37	blisp_struct.h: define static_assert when undefined to _Static_assert	2024-01-06 16:03:05 +08:00
Sergey Fedorov	81faf3f213	parse_file.h: include sys/types.h Fixes: https://github.com/pine64/blisp/issues/59	2024-01-05 22:23:53 +08:00
Pavel Zakopaylo	67bd1bd468	Minor fix: blisp_device_flash_erase errors were ignored	2023-11-30 19:57:47 +11:00