From 283026a7614a7e2576e8cd8568f8f5fb45424788 Mon Sep 17 00:00:00 2001 From: Andrei Gramakov Date: Wed, 8 Apr 2020 15:41:12 +0200 Subject: [PATCH 1/2] vfs: semihost driver bugfix --- components/vfs/vfs_semihost.c | 4 ++-- .../storage/semihost_vfs/main/semihost_vfs_example_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/vfs/vfs_semihost.c b/components/vfs/vfs_semihost.c index b89f26fbd..313567572 100644 --- a/components/vfs/vfs_semihost.c +++ b/components/vfs/vfs_semihost.c @@ -223,7 +223,7 @@ static ssize_t vfs_semihost_write(void* ctx, int fd, const void * data, size_t s if (ret == -1) { errno = host_err; } - return (ssize_t)ret; + return size - (ssize_t)ret; /* Write syscall returns the number of bytes NOT written */ } static ssize_t vfs_semihost_read(void* ctx, int fd, void* data, size_t size) @@ -237,7 +237,7 @@ static ssize_t vfs_semihost_read(void* ctx, int fd, void* data, size_t size) errno = host_err; return ret; } - return size - (ssize_t)ret; /* Write syscall returns the number of bytes NOT written */ + return size - (ssize_t)ret; /* Read syscall returns the number of bytes NOT read */ } diff --git a/examples/storage/semihost_vfs/main/semihost_vfs_example_main.c b/examples/storage/semihost_vfs/main/semihost_vfs_example_main.c index a3ed216c1..60031f56b 100644 --- a/examples/storage/semihost_vfs/main/semihost_vfs_example_main.c +++ b/examples/storage/semihost_vfs/main/semihost_vfs_example_main.c @@ -39,7 +39,7 @@ void app_main(void) return; } // Increase file buffer to perform data transfers using larger chunks. - // Every read/write triggers breakpoint, so transfering of small chunks is quite inefficient. + // Every read/write triggers breakpoint, so transferring of small chunks is quite inefficient. setvbuf(fout, (char *)s_buf, _IOFBF, sizeof(s_buf)); // this will be printed to the file on host From c0610a49b449db8a457b6caf1b6dd6e2baaad40d Mon Sep 17 00:00:00 2001 From: Alexey Gerenkov Date: Tue, 21 Apr 2020 19:43:58 +0300 Subject: [PATCH 2/2] tools: Updates OpenOCD version to 'v0.10.0-esp32-20200420' --- tools/tools.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/tools/tools.json b/tools/tools.json index 6f27b8bfe..f1c93c2f6 100644 --- a/tools/tools.json +++ b/tools/tools.json @@ -325,31 +325,31 @@ "versions": [ { "linux-amd64": { - "sha256": "b9e4070d1262e80dfdbdae337059239a5c4812698de5ee76746c648732b60392", - "size": 1725822, - "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20200406/openocd-esp32-linux64-0.10.0-esp32-20200406.tar.gz" + "sha256": "55755f03ed76cbd2fddb4bc2d85327b95e1a5c728bfacb77af08bf26e65a3628", + "size": 1728177, + "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20200420/openocd-esp32-linux64-0.10.0-esp32-20200420.tar.gz" }, "linux-armel": { - "sha256": "2588aac49d0a68e558ea1e7b7cf5a4ae182a99731da5b2ba9dacfa7df1869aea", - "size": 1776875, - "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20200406/openocd-esp32-armel-0.10.0-esp32-20200406.tar.gz" + "sha256": "dbe2f78be0f15c5e5ff9ac9e445c9cf6a9a6be31f0038c4e1822960fcd8ad615", + "size": 1777775, + "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20200420/openocd-esp32-armel-0.10.0-esp32-20200420.tar.gz" }, "macos": { - "sha256": "fc3cfa4ffac4cb7ecc20d752ef52bab9fdd5207a7159b4e8b7b11d5f10a641d4", - "size": 1810346, - "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20200406/openocd-esp32-macos-0.10.0-esp32-20200406.tar.gz" + "sha256": "a5bb0389e355c58f593a460aea2e41f0c07f9f1bb2bc08101914bb37017271c9", + "size": 1811349, + "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20200420/openocd-esp32-macos-0.10.0-esp32-20200420.tar.gz" }, - "name": "v0.10.0-esp32-20200406", + "name": "v0.10.0-esp32-20200420", "status": "recommended", "win32": { - "sha256": "f0834cda591d164ea33d8f82f29098fadc4e8e19f5a920e44fe50da55698be4e", - "size": 2150669, - "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20200406/openocd-esp32-win32-0.10.0-esp32-20200406.zip" + "sha256": "3d13feca3e7e16b8442069aec8267e6bf12de489a29647df760a1da6c33d7f2e", + "size": 2150749, + "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20200420/openocd-esp32-win32-0.10.0-esp32-20200420.zip" }, "win64": { - "sha256": "f0834cda591d164ea33d8f82f29098fadc4e8e19f5a920e44fe50da55698be4e", - "size": 2150669, - "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20200406/openocd-esp32-win32-0.10.0-esp32-20200406.zip" + "sha256": "3d13feca3e7e16b8442069aec8267e6bf12de489a29647df760a1da6c33d7f2e", + "size": 2150749, + "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20200420/openocd-esp32-win32-0.10.0-esp32-20200420.zip" } } ]