Remove ppsi-wrappers.h

2a1a5a5b · Tristan Gingold · 1bf74119 · 2a1a5a5b · 2a1a5a5b · 2a1a5a5b
Commit 2a1a5a5b authored Apr 12, 2022 by Tristan Gingold
13 changed files
--- a/Makefile
+++ b/Makefile
@@ -77,10 +77,8 @@ cflags-$(CONFIG_ARCH_LM32)  +=  -Iinclude/std
 cflags-$(CONFIG_ARCH_RISCV) +=  -Iinclude/std

 cflags-$(CONFIG_WRPC_PPSI) += \
-	-include include/ppsi-wrappers.h \
 	-I$(PPSI)/arch-wrpc \
-	-I$(PPSI)/proto-ext-whiterabbit \
-	-Iboards/spec
+	-I$(PPSI)/proto-ext-whiterabbit

 # in order to build tools/wrpc-dump, we need these flags, even for wrs builds
 cflags-y += \

--- a/dev/syscon.c
+++ b/dev/syscon.c
@@ -9,7 +9,7 @@

 #include <errno.h>
 #include <string.h>
-
+#include "endianness.h"
 #include "dev/syscon.h"
 #include "pp-printf.h"
 #include "dev/gpio.h"

--- a/dev/w1.c
+++ b/dev/w1.c
@@ -4,7 +4,7 @@
 */
 #include <string.h>
 #include <dev/w1.h>
-#include <unistd.h>
+#include "dev/syscon.h"

 static const struct w1_ops *ops = &wrpc_w1_ops; /* local shorter name */


--- a/include/endianness.h
+++ b/include/endianness.h
@@ -10,6 +10,9 @@
 #include <arpa/inet.h>

 #else
+
+#include <stdint.h>
+
 # if defined CONFIG_ARCH_RISCV
 #  define __ENDIANNESS_SWAP 1
 # elif defined CONFIG_ARCH_LM32

--- a/include/libsdbfs-freestanding.h
+++ b/include/libsdbfs-freestanding.h

 /* Though freestanding, some minimal headers are expected to exist */
-#include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
 #include <errno.h>

--- a/include/ppsi-wrappers.h
+++ b/include/ppsi-wrappers.h
-/*
- * This includes stuff that is needed to link ppsi into wrpc-sw
- *
- * It is included by the command line (-include).
- * It is a subset of the older "ptpd-wrappers.h", in ptp-noposix
- */
-#include <sys/types.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <endianness.h>
--- a/include/shell.h
+++ b/include/shell.h
@@ -6,6 +6,8 @@
 #ifndef __SHELL_H
 #define __SHELL_H

+#include <stdint.h>
+
 #define UI_SHELL_MODE 0
 #define UI_GUI_MODE 1


--- a/lib/arp.c
+++ b/lib/arp.c
@@ -9,6 +9,7 @@
 #include <wrc.h>
 #include <string.h>

+#include "endianness.h"
 #include "dev/endpoint.h"
 #include "ipv4.h"
 #include "ptpd_netif.h"

--- a/lib/bootp.c
+++ b/lib/bootp.c
@@ -8,6 +8,7 @@
 */
 #include <string.h>
 #include <wrc.h>
+#include "endianness.h"
 #include "dev/endpoint.h"

 #include "ipv4.h"

--- a/lib/ipv4.c
+++ b/lib/ipv4.c
@@ -15,6 +15,7 @@
 #include "dev/pps_gen.h"
 #include "dev/netif.h"
 #include "hw/etherbone-config.h"
+#include "endianness.h"
 #include "wrc_ptp.h"
 #include "wrc_global.h"


--- a/lib/lldp.c
+++ b/lib/lldp.c
@@ -13,7 +13,8 @@
 */

 #include <string.h>
-
+#include <stdint.h>
+#include "endianness.h"
 #include "wrc.h"
 #include "revision.h"
 #include "ptpd_netif.h"

--- a/lib/ppsi-wrappers.c
+++ b/lib/ppsi-wrappers.c
@@ -8,6 +8,7 @@
 * Released according to the GNU GPL, version 2 or any later version.
 */
 #include <stdint.h>
+#include <stddef.h>
 #include <libwr/hal_shmem.h>
 #include <libwr/shmem.h>
 #include <wrc_ptp.h>

--- a/shell/cmd_sdb.c
+++ b/shell/cmd_sdb.c
@@ -11,6 +11,7 @@
 #include "dev/syscon.h"
 #include "storage.h"
 #include <dev/flash.h>
+#include "util.h"

 /*
 * args[1] - where to write sdbfs image (0 - Flash, 1 - I2C EEPROM,