From 20b2485ab92140a2d186961b53acf5d1df8af290 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Sat, 2 Mar 2024 15:40:07 +0100 Subject: [PATCH 1/2] renames TGCP environment --- env/{TGC5L => TGCP}/.gitignore | 0 env/{TGC5L => TGCP}/init.c | 0 env/{TGC5L => TGCP}/link.lds | 0 env/{TGC5L => TGCP}/platform.h | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename env/{TGC5L => TGCP}/.gitignore (100%) rename env/{TGC5L => TGCP}/init.c (100%) rename env/{TGC5L => TGCP}/link.lds (100%) rename env/{TGC5L => TGCP}/platform.h (100%) diff --git a/env/TGC5L/.gitignore b/env/TGCP/.gitignore similarity index 100% rename from env/TGC5L/.gitignore rename to env/TGCP/.gitignore diff --git a/env/TGC5L/init.c b/env/TGCP/init.c similarity index 100% rename from env/TGC5L/init.c rename to env/TGCP/init.c diff --git a/env/TGC5L/link.lds b/env/TGCP/link.lds similarity index 100% rename from env/TGC5L/link.lds rename to env/TGCP/link.lds diff --git a/env/TGC5L/platform.h b/env/TGCP/platform.h similarity index 100% rename from env/TGC5L/platform.h rename to env/TGCP/platform.h From 664dd6774028452c8e1ef4721ca8828e58296247 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Sat, 2 Mar 2024 16:08:42 +0100 Subject: [PATCH 2/2] fixes build to adapt to renamed env --- libwrap/sys/puts.c | 2 +- libwrap/sys/read.c | 4 ++-- libwrap/sys/write.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libwrap/sys/puts.c b/libwrap/sys/puts.c index 4df45c2..4bd9baa 100644 --- a/libwrap/sys/puts.c +++ b/libwrap/sys/puts.c @@ -17,7 +17,7 @@ int __wrap_puts(const char *s) uart_write(uart, *s); #elif defined(BOARD_iss) *((uint32_t*) 0xFFFF0000) = *s; -#elif defined(BOARD_TGC5L) +#elif defined(BOARD_TGCP) //TODO: implement #else while (UART0_REG(UART_REG_TXFIFO) & 0x80000000) ; diff --git a/libwrap/sys/read.c b/libwrap/sys/read.c index 2701799..5468dd3 100644 --- a/libwrap/sys/read.c +++ b/libwrap/sys/read.c @@ -19,7 +19,7 @@ ssize_t __wrap_read(int fd, void* ptr, size_t len) volatile uint8_t * uart_rx_cnt = (uint8_t *)(UART0_CTRL_ADDR + UART_REG_RXCTRL + 2); #elif defined(BOARD_iss) volatile uint32_t * uart_rx = (uint32_t*)0xFFFF0000; -#elif defined(BOARD_TGC5L) +#elif defined(BOARD_TGCP) //TODO: implement #elif !defined(BOARD_ehrenberg) volatile uint32_t * uart_rx = (uint32_t *)(UART0_BASE_ADDR + UART_REG_RXFIFO); @@ -41,7 +41,7 @@ ssize_t __wrap_read(int fd, void* ptr, size_t len) *current = *uart_rx; result++; } -#elif defined(BOARD_TGC5L) +#elif defined(BOARD_TGCP) //TODO: implement #else for (current = (uint8_t *)ptr; diff --git a/libwrap/sys/write.c b/libwrap/sys/write.c index 254b2fd..a2be4aa 100644 --- a/libwrap/sys/write.c +++ b/libwrap/sys/write.c @@ -22,7 +22,7 @@ ssize_t __wrap_write(int fd, const void* ptr, size_t len) } #elif defined(BOARD_iss) *((uint32_t*) 0xFFFF0000) = current[jj]; -#elif defined(BOARD_TGC5L) +#elif defined(BOARD_TGCP) //TODO: implement #else while (UART0_REG(UART_REG_TXFIFO) & 0x80000000) ;