Handle failure finding current program path

Print error rather than crashing

.gitignore

@@ -74,4 +74,5 @@ fabric.properties
 .idea/httpRequests
 
 # Android studio 3.1+ serialized cache file
-.idea/caches/build_file_checksums.ser
+.idea/caches/build_file_checksums.ser
+build/

CMakeLists.txt

@@ -8,8 +8,7 @@ option(BLISP_BUILD_CLI "Build CLI Tool" OFF)
 add_library(libblisp_obj OBJECT
         lib/blisp.c
         lib/chip/blisp_chip_bl60x.c
-        lib/chip/blisp_chip_bl70x.c
-        lib/chip/blisp_chip_bl808.c)
+        lib/chip/blisp_chip_bl70x.c)
 
 target_include_directories(libblisp_obj PRIVATE ${CMAKE_SOURCE_DIR}/include/)
 

README.md

@@ -6,14 +6,25 @@ Tool and library for flashing their RISC-V MCUs.
 
 # Supported MCUs
 
-- [X] `bl60x` - BL602 / BL604
-- [X] `bl70x` - BL702 / BL704 / BL706 
+- [x] `bl60x` - BL602 / BL604
+- [x] `bl70x` - BL702 / BL704 / BL706
 - [ ] `bl606p` - BL606P
 - [ ] `bl61x` - BL616 / BL618
 - [ ] `bl808` - BL808
 
 # Building
 
+## Clone repository
+
+If you have not cloned this repository locally; check out the git repository locally by running
+
+```bash
+git clone --recursive https://github.com/pine64/blisp.git
+cd blisp
+```
+
+## Build the library and command line utility
+
 For building `blisp` command line tool, use following commands:
 
 ```bash
@@ -40,4 +51,4 @@ blisp --chip bl60x --reset -p /dev/ttyUSB0 name_of_firmware.bin
 
 - [ ] Another code style
 - [ ] Finalize API
-- [ ] SDIO and JTAG support
+- [ ] SDIO and JTAG support

include/blisp_chip.h

@@ -6,8 +6,7 @@
 
 enum blisp_chip_type {
     BLISP_CHIP_BL60X,
-    BLISP_CHIP_BL70X,
-    BLISP_CHIP_BL808
+    BLISP_CHIP_BL70X
 };
 
 struct blisp_chip { // TODO: Move elsewhere?
@@ -20,6 +19,5 @@ struct blisp_chip { // TODO: Move elsewhere?
 
 extern struct blisp_chip blisp_chip_bl60x;
 extern struct blisp_chip blisp_chip_bl70x;
-extern struct blisp_chip blisp_chip_bl808;
 
 #endif

lib/blisp.c

@@ -106,7 +106,7 @@ int32_t blisp_receive_response(struct blisp_device* device, bool expect_payload)
     // TODO: Check checksum
     int ret;
     struct sp_port* serial_port = device->serial_port;
-    ret = sp_blocking_read(serial_port, &device->rx_buffer[0], 2, 500);
+    ret = sp_blocking_read(serial_port, &device->rx_buffer[0], 2, 1000);
     if (ret < 2) {
 #ifdef DEBUG
         fprintf(stderr, "Failed to receive response. (ret = %d)\n", ret);
@@ -158,7 +158,7 @@ blisp_device_handshake(struct blisp_device* device, bool in_ef_loader) {
         if (!in_ef_loader) {
             if (device->is_usb) {
                 sp_blocking_write(serial_port, "BOUFFALOLAB5555RESET\0\0", 22,
-                                  100); // TODO: Error handling
+                                  100);
             }
         }
         ret = sp_blocking_write(serial_port, handshake_buffer, bytes_count,
@@ -166,12 +166,6 @@ blisp_device_handshake(struct blisp_device* device, bool in_ef_loader) {
         if (ret < 0) {
             return -1;
         }
-
-        if (device->chip->type == BLISP_CHIP_BL808) {
-            sleep_ms(300);
-            const uint8_t second_handshake[] = { 0x50, 0x00, 0x08, 0x00, 0x38, 0xF0, 0x00, 0x20, 0x00, 0x00, 0x00, 0x18 };
-            sp_blocking_write(serial_port, second_handshake, sizeof(second_handshake), 300); // TODO: Error handling
-        }
         ret = sp_blocking_read(serial_port, device->rx_buffer, 20, 50);
         if (ret >= 2) {
             for (uint8_t j = 0; j < (ret - 1); j++) {
@@ -195,10 +189,10 @@ int32_t blisp_device_get_boot_info(struct blisp_device* device, struct blisp_boo
     if (ret < 0) return ret;
 
     memcpy(boot_info->boot_rom_version, &device->rx_buffer[0], 4); // TODO: Endianess
-    if (device->chip->type == BLISP_CHIP_BL70X || device->chip->type == BLISP_CHIP_BL808) { // TODO: This is only 70X related
+    if (device->chip->type == BLISP_CHIP_BL70X) {
         memcpy(boot_info->chip_id, &device->rx_buffer[16], 8);
     }
-    // TODO: BL60X, BL808
+    // TODO: BL60X
     return 0;
 }
 

lib/chip/blisp_chip_bl808.c

@@ -1,8 +0,0 @@
-#include "blisp.h"
-
-struct blisp_chip blisp_chip_bl808 = {
-    .type = BLISP_CHIP_BL808,
-    .type_str = "bl808",
-    .usb_isp_available = true,
-    .handshake_byte_multiplier = 0.006f,
-};

tools/blisp/src/cmd/write.c

@@ -28,10 +28,14 @@ static void* cmd_write_argtable[6];
 ssize_t
 get_binary_folder(char* buffer, uint32_t buffer_size) {
 #ifdef __linux__
-    readlink("/proc/self/exe", buffer, buffer_size); // TODO: Error handling
+    if (readlink("/proc/self/exe", buffer, buffer_size) <= 0) {
+        return -1;
+    }
     char* pos = strrchr(buffer, '/');
 #else
-    GetModuleFileName(NULL, buffer, buffer_size);
+    if (GetModuleFileName(NULL, buffer, buffer_size) <= 0) {
+        return -1;
+    }
     char* pos = strrchr(buffer, '\\');
 #endif
     pos[0] = '\0';
@@ -196,8 +200,6 @@ void blisp_flash_firmware() {
         chip = &blisp_chip_bl70x;
     } else if (strcmp(chip_type->sval[0], "bl60x") == 0) {
         chip = &blisp_chip_bl60x;
-    } else if (strcmp(chip_type->sval[0], "bl808") == 0) {
-        chip = &blisp_chip_bl808;
     } else {
         fprintf(stderr, "Chip type is invalid.\n");
         return;
@@ -251,19 +253,30 @@ void blisp_flash_firmware() {
            boot_info.chip_id[6],
            boot_info.chip_id[7]);
 
-    if (device.chip->type == BLISP_CHIP_BL808) {
-        // Since eflash_loader is not needed in BL808, we can jump to flashing.
-        goto eflash_loader; // TODO: Rework
-    }
-
     char exe_path[PATH_MAX];
     char eflash_loader_path[PATH_MAX];
-    get_binary_folder(exe_path, PATH_MAX); // TODO: Error handling
-    snprintf(eflash_loader_path, PATH_MAX, "%s/data/%s/eflash_loader_%s.bin", exe_path, device.chip->type_str, device.chip->default_eflash_loader_xtal);
-
-    eflash_loader_file = fopen(eflash_loader_path, "rb"); // TODO: Error handling
-    uint8_t eflash_loader_header[176]; // TODO: Remap it to the boot header struct
-    fread(eflash_loader_header, 176, 1, eflash_loader_file); // TODO: Error handling
+    if (get_binary_folder(exe_path, PATH_MAX) <= 0) {
+        fprintf(stderr, "Failed to find executable path to search for the "
+                        "eflash loader\n");
+        goto exit1;
+    }
+    snprintf(eflash_loader_path, PATH_MAX, "%s/data/%s/eflash_loader_%s.bin",
+             exe_path, device.chip->type_str,
+             device.chip->default_eflash_loader_xtal);
+    printf("Loading the eflash loader file from disk\n");
+    eflash_loader_file
+        = fopen(eflash_loader_path, "rb"); // TODO: Error handling
+    if (eflash_loader_file == NULL) {
+        fprintf(stderr,
+                "Could not open the eflash loader file from disk.\n"
+                "Does \"%s\" exist?\n",
+                eflash_loader_path);
+        goto exit1;
+    }
+    uint8_t
+        eflash_loader_header[176]; // TODO: Remap it to the boot header struct
+    fread(eflash_loader_header, 176, 1,
+          eflash_loader_file); // TODO: Error handling
 
     printf("Loading eflash_loader...\n");
     ret = blisp_device_load_boot_header(&device, eflash_loader_header);
@@ -332,13 +345,7 @@ void blisp_flash_firmware() {
     }
     printf(" OK\n");
 
-eflash_loader:
-    if (device.chip->type == BLISP_CHIP_BL808) {
-        // Setting CLK configuration
-        // Setting Flash Config
-        // Setting Flash Parameter
-    }
-
+eflash_loader:;
     FILE* firmware_file = fopen(binary_to_write->filename[0], "rb");
     if (firmware_file == NULL) {
         fprintf(stderr,"Failed to open firmware file \"%s\".\n", binary_to_write->filename[0]);