Merge pull request #8 from pine64/errors

Marginally improving error handling and rough corners

.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/

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

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';
@@ -251,12 +255,28 @@ void blisp_flash_firmware() {
 
     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);