update include paths

libwrap/semihosting/semihosting.c

@@ -1,6 +1,6 @@
-#include <stdint.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <string.h>
 #include <sys/types.h>
 
@@ -57,12 +57,13 @@ typedef struct{
   off_t pos;
 } SeekVector;
 
-static inline int __attribute__ ((always_inline)) call_host(int reason, void* arg) {
+static inline int __attribute__((always_inline))
+call_host(int reason, void *arg) {
 #if 1
   // This must always be set back to 0 to cover the case where a host wasn't
   // initially present, but only connected while the program was already up and
-    // running. In that case, trap() suddenly won't be called anymore, so we have to
+  // running. In that case, trap() suddenly won't be called anymore, so we have
-    // clear this variable *before* EBREAK is called.
+  // to clear this variable *before* EBREAK is called.
   sh_missing_host = 0;
 
   register int value asm("a0") = reason;
@@ -72,9 +73,9 @@ static inline int __attribute__ ((always_inline)) call_host(int reason, void* ar
       " .option push \n"
       " .option norvc \n"
       // Force 16-byte alignment to make sure that the 3 instruction fall
-        // within the same virtual page. If you the instruction straddle a page boundary
+      // within the same virtual page. If you the instruction straddle a page
-        // the debugger fetching the instructions could lead to a page fault.
+      // boundary the debugger fetching the instructions could lead to a page
-        // Note: align 4 means, align by 2 to the power of 4!
+      // fault. Note: align 4 means, align by 2 to the power of 4!
       " .align 4 \n"
       " slli x0, x0, 0x1f \n"
       " ebreak \n"
@@ -82,7 +83,8 @@ static inline int __attribute__ ((always_inline)) call_host(int reason, void* ar
       " .option pop \n"
 
       : "=r"(value) /* Outputs */
-        : "0" (value), "r" (ptr), [swi] "i" (RISCV_SEMIHOSTING_CALL_NUMBER) /* Inputs */
+      : "0"(value),
+        "r"(ptr), [swi] "i"(RISCV_SEMIHOSTING_CALL_NUMBER) /* Inputs */
       : "memory"                                           /* Clobbers */
   );
   return value;
@@ -91,13 +93,9 @@ static inline int __attribute__ ((always_inline)) call_host(int reason, void* ar
 #endif
 }
 
-int sh_errno(void) {
+int sh_errno(void) { return call_host(SEMIHOSTING_SYS_ERRNO, (void *)NULL); }
-    return call_host(SEMIHOSTING_SYS_ERRNO, (void*)NULL);
-}
 
-int sh_time(void) {
+int sh_time(void) { return call_host(SEMIHOSTING_SYS_TIME, (void *)NULL); }
-    return call_host(SEMIHOSTING_SYS_TIME, (void*)NULL);
-}
 
 int sh_remove(char *path) {
   size_t len = strlen(path);
@@ -134,13 +132,9 @@ void sh_exit_extended(void) {
 
 int sh_flen(int file_handle) {
   return call_host(SEMIHOSTING_SYS_FLEN, file_handle);
-
 }
 
-int sh_iserror(int num) {
+int sh_iserror(int num) { return call_host(SEMIHOSTING_SYS_ISERROR, num); }
-    return call_host(SEMIHOSTING_SYS_ISERROR, num);
-
-}
 
 int sh_istty(int file_handle) {
   return call_host(SEMIHOSTING_SYS_ISTTY, file_handle);
@@ -160,20 +154,17 @@ void sh_rename(char* old, char* new) {
   return;
 }
 
-void sh_write0(const char* buf)
+void sh_write0(const char *buf) {
-{
   // Print zero-terminated string
   call_host(SEMIHOSTING_SYS_WRITE0, (void *)buf);
 }
 
-void sh_writec(char c)
+void sh_writec(char c) {
-{
   // Print single character
   call_host(SEMIHOSTING_SYS_WRITEC, (void *)&c);
 }
 
-char sh_readc(void)
+char sh_readc(void) {
-{
   // Read character from keyboard. (Blocking operation!)
   char c = call_host(SEMIHOSTING_SYS_READC, (void *)NULL);
   return c;
@@ -187,14 +178,13 @@ int sh_open(char* str, int mode) {
   return call_host(SEMIHOSTING_SYS_OPEN, &vec);
 }
 
-void sh_read(char* buf, int file_handle, size_t length) {
+int sh_read(char *buf, int file_handle, size_t length) {
   OpenVector vec = {buf, file_handle, length};
   int i = call_host(SEMIHOSTING_SYS_READ, &vec);
   return i;
 }
 
-int sh_clock(void)
+int sh_clock(void) {
-{
   int clock = call_host(SEMIHOSTING_SYS_CLOCK, (void *)NULL);
   return clock;
 }

libwrap/semihosting/semihosting.h

@@ -1,8 +1,8 @@
 #ifndef SEMIHOSTING_H
 #define SEMIHOSTING_H
 
-#include <unistd.h>
 #include <sys/types.h>
+#include <unistd.h>
 // int32_t trace_write(const char* buf, uint32_t nbyte);
 
 void sh_seek(int, off_t);
@@ -10,7 +10,7 @@ void sh_write0(const char* buf);
 void sh_writec(char c);
 char sh_readc(void);
 int sh_clock(void);
-void sh_read(char*, int, size_t);
+int sh_read(char *, int, size_t);
 void sh_write(char *, int);
 int sh_open(char *, int);
 void sh_rename(char *, char *);

libwrap/sys/puts.c

@@ -5,12 +5,10 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "../../include/tgc-vp/devices/uart.h"
-#include "../../env/tgc-vp/platform.h"
 #include "platform.h"
+#include "semihosting.h"
 #include "stub.h"
 #include "weak_under_alias.h"
-#include "semihosting.h"
 
 int __wrap_puts(const char *s) {
 #if defined(SEMIHOSTING)

libwrap/sys/read.c

@@ -1,24 +1,20 @@
 /* See LICENSE of license details. */
 
-#include <stdint.h>
 #include <errno.h>
-#include <unistd.h>
+#include <stdint.h>
 #include <sys/types.h>
-#if defined(BOARD_ehrenberg)
+#include <unistd.h>
-#include "platform.h"
+
-#endif
-#include "../../include/tgc-vp/devices/uart.h"
-#include "/scratch/gabriel/repos/Firmwares/bare-metal-bsp/env/tgc-vp/platform.h"
 #include "platform.h"
+#include "semihosting.h"
 #include "stub.h"
 #include "weak_under_alias.h"
-#include "semihosting.h"
 
 ssize_t __wrap_read(int fd, void *ptr, size_t len) {
   uint8_t *current = (uint8_t *)ptr;
 #if defined(SEMIHOSTING)
-    sh_read(current, fd, len);
+  int i = sh_read(current, fd, len);
-    return;
+  return i;
 #endif
 #if defined(BOARD_hifive1)
   volatile uint32_t *uart_rx = (uint32_t *)(UART0_CTRL_ADDR + UART_REG_RXFIFO);

libwrap/sys/write.c

@@ -5,12 +5,10 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "../../include/tgc-vp/devices/uart.h"
-#include "../../env/tgc-vp/platform.h"
 #include "platform.h"
+#include "semihosting.h"
 #include "stub.h"
 #include "weak_under_alias.h"
-#include "semihosting.h"
 
 ssize_t __wrap_write(int fd, const void *ptr, size_t len) {
   const uint8_t *current = (const uint8_t *)ptr;