From c93520d9e8e4c96b75224959c573b1fbd7c6ecef Mon Sep 17 00:00:00 2001 From: cnlohr <lohr85@gmail.com> Date: Thu, 4 May 2023 05:51:09 -0400 Subject: [PATCH] Fix build + intellisense for VS Code. --- ch32v003fun/ch32v003fun.c | 2 ++ ch32v003fun/ch32v003fun.h | 2 +- ch32v003fun/ch32v003fun.mk | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ch32v003fun/ch32v003fun.c b/ch32v003fun/ch32v003fun.c index 9fbd93d..cd0d32e 100644 --- a/ch32v003fun/ch32v003fun.c +++ b/ch32v003fun/ch32v003fun.c @@ -71,6 +71,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. typedef void * mbstate_t; +#ifdef UNICODE size_t wcrtomb(char *restrict s, wchar_t wc, mbstate_t *restrict st) { if (!s) return 1; @@ -108,6 +109,7 @@ int wctomb(char *s, wchar_t wc) if (!s) return 0; return wcrtomb(s, wc, 0); } +#endif size_t strlen(const char *s) { const char *a = s;for (; *s; s++);return s-a; } size_t strnlen(const char *s, size_t n) { const char *p = memchr(s, 0, n); return p ? p-s : n;} void *memset(void *dest, int c, size_t n) { unsigned char *s = dest; for (; n; n--, s++) *s = c; return dest; } diff --git a/ch32v003fun/ch32v003fun.h b/ch32v003fun/ch32v003fun.h index a32e339..4b33a1b 100644 --- a/ch32v003fun/ch32v003fun.h +++ b/ch32v003fun/ch32v003fun.h @@ -4822,7 +4822,7 @@ extern "C" { #define DELAY_US_TIME ((SYSTEM_CORE_CLOCK)/8000000) #define DELAY_MS_TIME ((SYSTEM_CORE_CLOCK)/8000) -#if defined(__riscv) || defined(__riscv__) +#if defined(__riscv) || defined(__riscv__) || defined( CH32V003FUN_BASE ) // Stuff that can only be compiled on device (not for the programmer, or other host programs) diff --git a/ch32v003fun/ch32v003fun.mk b/ch32v003fun/ch32v003fun.mk index 6beb3fc..756acc6 100644 --- a/ch32v003fun/ch32v003fun.mk +++ b/ch32v003fun/ch32v003fun.mk @@ -31,6 +31,9 @@ $(TARGET).bin : $(TARGET).elf monitor : $(MINICHLINK)/minichlink -T +gdbserver : + $(MINICHLINK)/minichlink -G || true + cv_flash : $(TARGET).bin make -C $(MINICHLINK) all $(MINICHLINK)/minichlink -w $< flash -b -- GitLab