.envrc

@@ -1 +0,0 @@
-use flake .

.github/workflows/build.yml

@@ -2,29 +2,13 @@ name: Build
 on: [push, pull_request]
 
 jobs:
-  check-nix-flake:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v30
-      - name: Check Nix Flake
-        run: nix flake check --print-build-logs
-
-  check-nix-build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v30
-      - name: Build package
-        run: nix build --print-build-logs
-
   build-windows:
     runs-on: windows-2022
     defaults:
       run:
         shell: cmd
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           submodules: 'recursive'
       - uses: lukka/get-cmake@latest
@@ -35,9 +19,9 @@ jobs:
           cmake .. -DBLISP_BUILD_CLI=ON -DCMAKE_BUILD_TYPE=Release
           cmake --build . --config Release
       - name: Upload results
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: blips-windows-x86_64
+          name: blips-windows-x86_64.zip
           path: |
             build/tools/blisp/Release/blisp.exe
           if-no-files-found: error
@@ -45,7 +29,7 @@ jobs:
   build-macos:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           submodules: 'recursive'
       - uses: lukka/get-cmake@latest
@@ -56,9 +40,9 @@ jobs:
           cmake .. -DBLISP_BUILD_CLI=ON -DCMAKE_BUILD_TYPE=Release
           cmake --build .
       - name: Upload results
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: blips-apple-universal
+          name: blips-apple-x86_64.zip
           path: |
             build/tools/blisp/blisp
           if-no-files-found: error
@@ -66,7 +50,7 @@ jobs:
   build-linux:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           submodules: 'recursive'
       - uses: lukka/get-cmake@latest
@@ -77,9 +61,9 @@ jobs:
           cmake .. -DBLISP_BUILD_CLI=ON -DCMAKE_BUILD_TYPE=Release
           cmake --build .
       - name: Upload results
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: blips-linux-x86_64
+          name: blips-linux-x86_64.zip
           path: |
             build/tools/blisp/blisp
           if-no-files-found: error 
@@ -99,7 +83,7 @@ jobs:
           - arch: riscv64
             distro: ubuntu_latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           submodules: 'recursive'
       - uses: uraimo/run-on-arch-action@v2
@@ -149,9 +133,9 @@ jobs:
             echo "Produced artifact at /artifacts/${artifact_name}"
 
       - name: Upload results
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: blisp-linux-${{ matrix.arch }}
+          name: blisp-linux-${{ matrix.arch }}.zip
           path: |
             artifacts/blisp-*
           if-no-files-found: error 

CMakeLists.txt

@@ -1,6 +1,4 @@
 cmake_minimum_required(VERSION 3.16)
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-# set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
 project(blisp C)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_C_STANDARD 11)
@@ -43,10 +41,11 @@ set_target_properties(libblisp_static PROPERTIES
         OUTPUT_NAME "blisp")
 
 if(BLISP_USE_SYSTEM_LIBRARIES)
-    find_package(Libserialport REQUIRED)
-    target_link_libraries(libblisp PUBLIC Libserialport::Libserialport)
-    target_link_libraries(libblisp_static PUBLIC Libserialport::Libserialport)
-    target_include_directories(libblisp_obj PUBLIC ${Libserialport_INCLUDE_DIRS})
+    find_package(PkgConfig)
+    pkg_search_module(LIBSERIALPORT REQUIRED libserialport)
+    target_link_libraries(libblisp PUBLIC ${LIBSERIALPORT_LIBRARIES})
+    target_link_libraries(libblisp_static PUBLIC ${LIBSERIALPORT_LIBRARIES})
+    target_include_directories(libblisp_obj PUBLIC ${LIBSERIALPORT_INCLUDE_DIRS})
 else()
 	if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
 	target_sources(libblisp_obj PRIVATE
@@ -91,13 +90,7 @@ else()
     endif()
 endif()
 
-include(GNUInstallDirs)
-install(TARGETS libblisp libblisp_static 
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-)
+install(TARGETS libblisp libblisp_static DESTINATION lib)
 
 if(BLISP_BUILD_CLI)
     add_subdirectory(tools/blisp)

Makefile

@@ -1,35 +0,0 @@
-#!/usr/bin/env make -f
-
-### global variables section
-
-# static vars
-BUILD_DIR:="build"
-BUILD_BIN:="$(BUILD_DIR)/tools/blisp/blisp"
-
-# dynamic vars
-FILES_CMAKE:=$(shell find  .  -path ./$(BUILD_DIR) -prune -false  -o  -type f  -name '*.cmake'  -o  -type f  -name 'CMakeLists.txt')
-FILES_SRC:=$(shell   find  .  -path ./$(BUILD_DIR) -prune -false  -o  -type f  -name '*.c'      -o  -type f  -name '*.h')
-
-### main targets section
-
-# simplify build
-build:  $(FILES_CMAKE)  $(FILES_SRC)  Makefile
-	@echo "\n>>>> Generating build files in: $(BUILD_DIR) ...\n"
-	@cmake  -S .  -B $(BUILD_DIR)  -DBLISP_BUILD_CLI=ON
-	@echo "\n>>>> Building...\n"
-	@cmake  --build  $(BUILD_DIR)
-	@echo "\n>>>> DONE: $(BUILD_BIN)\n"
-
-# deleting output build directory with its content
-clean:
-	-@rm -rf $(BUILD_DIR)/
-
-# printf-like debug target
-vars:
-	@echo "\n>>>> FILES_CMAKE:"
-	@echo "$(FILES_CMAKE)" | sed 's, ,\n,g'
-	@echo "\n>>>> FILES_SRC:"
-	@echo "$(FILES_SRC)" | sed 's, ,\n,g'
-
-.PHONY: clean  vars
-

README.md

@@ -17,7 +17,7 @@ Bouffalo Labs ISP (in-system-programming) tool & library: an open source tool to
 <br>
 
 ## Supported Devices 
- | System  | <img width="15" src="img/win32.png" /> Windows | <img width="15" src="https://cdn.simpleicons.org/Apple/5791ac" /> MacOS| <img width="17" src="https://cdn.simpleicons.org/Linux/5791ac" /> Linux| <img width="15" src="https://cdn.simpleicons.org/Freebsd/5791ac" /> FreeBSD |
+ | System  | <img width="15" src="https://cdn.simpleicons.org/Windows11/5791ac" /> Windows | <img width="15" src="https://cdn.simpleicons.org/Apple/5791ac" /> MacOS| <img width="17" src="https://cdn.simpleicons.org/Linux/5791ac" /> Linux| <img width="15" src="https://cdn.simpleicons.org/Freebsd/5791ac" /> FreeBSD |
  | :-----: | :------: | :------: | :------: | :------: |
  | Pinecil V2  |<img width="22" src="https://cdn.simpleicons.org/cachet/5791ac" />|<img width="22" src="https://cdn.simpleicons.org/cachet/5791ac" />| <img width="22" src="https://cdn.simpleicons.org/cachet/5791ac" />| <img width="22" src="https://cdn.simpleicons.org/cachet/5791ac" /> |
  | Pinecone  |<img width="22" src="https://cdn.simpleicons.org/cachet/5791ac" />|<img width="22" src="https://cdn.simpleicons.org/cachet/5791ac" />|<img width="22" src="https://cdn.simpleicons.org/cachet/5791ac" />| <img width="22" src="https://cdn.simpleicons.org/cachet/5791ac" /> |
@@ -94,20 +94,3 @@ Because this is done at the lowest level of serial communication, the
 displays aren't packet-aware or know about the chip's command set or such.
 This is really only useful for debugging systems-level issues withing
 the device or blisp itself.
-
-## Troubleshooting
-
-### macOS
-
-Depending on your current system security settings, modern versions of macOS requires all software to be notarised before you are able to execute it. This is specially true for software that is downloaded directly from the internet.
-
-If that is the case, you will get an error that looks like the following:
-> **“blisp” cannot be opened because the developer cannot be verified.**
->
-> macOS cannot verify that this app is free from malware.
-
-In that case, you will need to remove the *quarantine* flag that macOS adds to the executable. After that you should be able to run **blisp** as normal.
-
-```bash
-xattr -d com.apple.quarantine blisp
-```

blisp.nix

@@ -1,49 +0,0 @@
-{
-  lib,
-  self,
-  stdenv,
-  fetchFromGitHub,
-  argtable,
-  cmake,
-  libserialport,
-  pkg-config,
-  testers,
-  IOKit ? null,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "blisp";
-  version = "0.0.4-unstable";
-  src = self;
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-
-  buildInputs = [
-    argtable
-    libserialport
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin IOKit;
-
-  cmakeFlags = [
-    "-DBLISP_BUILD_CLI=ON"
-    "-DBLISP_USE_SYSTEM_LIBRARIES=ON"
-  ];
-
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-error=implicit-function-declaration";
-
-  passthru.tests.version = testers.testVersion {
-    package = finalAttrs.finalPackage;
-    version = "v${finalAttrs.version}";
-  };
-
-  meta = with lib; {
-    description = "In-System-Programming (ISP) tool & library for Bouffalo Labs RISC-V Microcontrollers and SoCs";
-    license = licenses.mit;
-    mainProgram = "blisp";
-    homepage = "https://github.com/pine64/blisp";
-    platforms = platforms.unix;
-    maintainers = [ maintainers.bdd ];
-  };
-})

cmake/FindLibserialport.cmake

@@ -1,79 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-#[=======================================================================[.rst:
-FindLibserialport
--------
-
-Finds the sigrok serial port library (``libserialport``)
-
-Imported Targets
-^^^^^^^^^^^^^^^^
-
-This module defines the following imported targets, if found:
-
-``Libserialport::Libserialport``
-  The serialport library
-
-Result Variables
-^^^^^^^^^^^^^^^^
-
-This module will define the following variables:
-
-``Libserialport_FOUND``
-  True if the system has the serialport library.
-``Libserialport_VERSION``
-  The version of the serialport library which was found.
-``Libserialport_INCLUDE_DIRS``
-  Include directories needed to use ``libserialport``.
-``Libserialport_LIBRARIES``
-  Libraries needed to link to ``libserialport``.
-
-Cache Variables
-^^^^^^^^^^^^^^^
-
-The following cache variables may also be set:
-
-``Libserialport_INCLUDE_DIR``
-  The directory containing ``libserialport.h``.
-``Libserialport_LIBRARY``
-  The path to the ``libserialport`` library.
-
-#]=======================================================================]
-
-find_package(PkgConfig)
-pkg_check_modules(PC_Libserialport QUIET libserialport)
-
-find_path(Libserialport_INCLUDE_DIR
-    NAMES libserialport.h
-    PATHS "${PC_Libserialport_INCLUDE_DIRS}"
-)
-find_library(Libserialport_LIBRARY
-    NAMES serialport
-    HINTS "${PC_Libserialport_LIBRARY_DIRS}"
-)
-
-set(Foo_VERSION ${PC_Foo_VERSION})
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Libserialport
-    FOUND_VAR Libserialport_FOUND
-    REQUIRED_VARS
-        Libserialport_LIBRARY
-        Libserialport_INCLUDE_DIR
-    VERSION_VAR Libserialport_VERSION
-)
-
-if(Libserialport_FOUND)
-    set(Libserialport_LIBRARIES ${Libserialport_LIBRARY})
-    set(Libserialport_INCLUDE_DIRS ${Libserialport_INCLUDE_DIR})
-    set(Libserialport_DEFINITIONS ${PC_Liberialport_CFLAGS_OTHER})
-endif()
-
-if(Libserialport_FOUND AND NOT TARGET Libserialport::Libserialport)
-    add_library(Libserialport::Libserialport UNKNOWN IMPORTED)
-    set_target_properties(Libserialport::Libserialport PROPERTIES
-        IMPORTED_LOCATION "${Libserialport_LIBRARY}"
-        INTERFACE_COMPILE_OPTIONS "${PC_Libserialport_CFLAGS_OTHER}"
-        INTERFACE_INCLUDE_DIRECTORIES "${Libserialport_INCLUDE_DIR}"
-    )
-endif()

default.nix

@@ -1,9 +0,0 @@
-(import (
-  let
-    lock = builtins.fromJSON (builtins.readFile ./flake.lock);
-  in
-  fetchTarball {
-    url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
-    sha256 = lock.nodes.flake-compat.locked.narHash;
-  }
-) { src = ./.; }).defaultNix

flake.lock

@@ -1,27 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1731319897,
-        "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "dc460ec76cbff0e66e269457d7b728432263166c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

flake.nix

@@ -1,44 +0,0 @@
-{
-  description = "A very basic flake";
-
-  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
-  };
-
-  outputs =
-    { self, nixpkgs, ... }@inputs:
-    let
-      systems = [
-        "x86_64-linux"
-        "aarch64-linux"
-      ];
-      forEachSystem = nixpkgs.lib.genAttrs systems;
-    in
-    {
-      packages = forEachSystem (
-        system:
-        let
-          pkgs = nixpkgs.legacyPackages.${system};
-        in
-        with pkgs;
-        {
-          blisp = callPackage ./blisp.nix { inherit self; };
-          default = self.packages.${system}.blisp;
-        }
-      );
-
-      devShells = forEachSystem (
-        system:
-        let
-          pkgs = nixpkgs.legacyPackages.${system};
-        in
-        with pkgs;
-        {
-          default = mkShell {
-            name = "blisp-dev";
-            nativeBuildInputs = [ self.packages.${system}.default ];
-          };
-        }
-      );
-    };
-}

include/blisp_struct.h

@@ -9,12 +9,6 @@
 #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 {

shell.nix

@@ -1,9 +0,0 @@
-(import (
-  let
-    lock = builtins.fromJSON (builtins.readFile ./flake.lock);
-  in
-  fetchTarball {
-    url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
-    sha256 = lock.nodes.flake-compat.locked.narHash;
-  }
-) { src = ./.; }).shellNix

tools/blisp/CMakeLists.txt

@@ -20,7 +20,7 @@ target_include_directories(blisp PRIVATE
         "${CMAKE_SOURCE_DIR}/include")
 
 target_link_libraries(blisp PRIVATE
-        argtable3::argtable3
+        argtable3
         libblisp_static file_parsers)
 
 if (WIN32)

tools/blisp/src/cmd.h

@@ -2,14 +2,6 @@
 #ifndef BLISP_CMD_H
 #define BLISP_CMD_H
 
-#if defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
-#include <unistd.h>
-#elif defined(_WIN32) || defined(WIN32) 
-#include <io.h>
-#define R_OK 4
-#define access _access
-#endif
-
 #include <stdint.h>
 #include "error_codes.h"
 struct cmd {

tools/blisp/src/cmd/iot.c

@@ -13,20 +13,11 @@ static struct arg_str *port_name, *chip_type;  // TODO: Make this common
 static struct arg_lit* reset;
 static struct arg_end* end;
 static void* cmd_iot_argtable[7];
-static void cmd_iot_args_print_glossary();
 
 blisp_return_t blisp_single_download() {
   struct blisp_device device;
   blisp_return_t ret;
 
-  if (access(single_download->filename[0], R_OK) != 0) {
-    // File not accessible, error out.
-    fprintf(stderr, "Input firmware not found: %s\n", single_download->filename[0]);
-    cmd_iot_args_print_glossary(); /* Print help to assist user */
-    /* No need to free memory, will now exit with ret code 1 */
-    return 1;
-  }
-
   ret = blisp_common_init_device(&device, port_name, chip_type);
   if (ret != BLISP_OK) {
     return ret;

tools/blisp/src/cmd/write.c

@@ -20,7 +20,6 @@ static struct arg_str *port_name, *chip_type;
 static struct arg_lit* reset;
 static struct arg_end* end;
 static void* cmd_write_argtable[6];
-static void cmd_write_args_print_glossary();
 
 void fill_up_boot_header(struct bfl_boot_header* boot_header) {
   memcpy(boot_header->magiccode, "BFNP", 4);
@@ -169,15 +168,6 @@ void fill_up_boot_header(struct bfl_boot_header* boot_header) {
 blisp_return_t blisp_flash_firmware() {
   struct blisp_device device;
   blisp_return_t ret;
-
-  if (access(binary_to_write->filename[0], R_OK) != 0) {
-    // File not accessible, error out.
-    fprintf(stderr, "Input firmware not found: %s\n", binary_to_write->filename[0]);
-    cmd_write_args_print_glossary(); /* Print help to assist user */
-    /* No need to free memory, will now exit with ret code 1 */
-    return 1;
-  }
-
   ret = blisp_common_init_device(&device, port_name, chip_type);
 
   if (ret != 0) {
@@ -188,7 +178,6 @@ blisp_return_t blisp_flash_firmware() {
     // TODO: Error handling
     goto exit1;
   }
-
   parsed_firmware_file_t parsed_file;
   memset(&parsed_file, 0, sizeof(parsed_file));
   int parsed_result =
@@ -233,13 +222,13 @@ blisp_return_t blisp_flash_firmware() {
 
   if (ret != BLISP_OK) {
     fprintf(stderr,
-            "Failed to erase flash. Tried to erase from 0x%08lu to 0x%08lu\n",
+            "Failed to erase flash. Tried to erase from 0x%08X to 0x%08X\n",
             parsed_file.payload_address,
             parsed_file.payload_address + parsed_file.payload_length + 1);
     goto exit2;
   }
 
-  printf("Flashing the firmware %lu bytes @ 0x%08lu...\n",
+  printf("Flashing the firmware %d bytes @ 0x%08X...\n",
          parsed_file.payload_length, parsed_file.payload_address);
   struct blisp_easy_transport data_transport =
       blisp_easy_transport_new_from_memory(parsed_file.payload,

tools/blisp/src/file_parsers/CMakeLists.txt

@@ -8,7 +8,7 @@ file(GLOB_RECURSE sources
 )
 list(APPEND ADD_SRCS  ${sources})
 
-add_library(file_parsers STATIC
+add_library(file_parsers 
 "${CMAKE_CURRENT_SOURCE_DIR}/bin/bin_file.c"
 "${CMAKE_CURRENT_SOURCE_DIR}/dfu/dfu_file.c"
 "${CMAKE_CURRENT_SOURCE_DIR}/dfu/dfu_crc.c"

tools/blisp/src/file_parsers/parse_file.h

@@ -2,7 +2,6 @@
 #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;