userspace/hal: move public headers to userspace/include

This allows private headers to be clearly private (in userspace/wrsw_hal/). rt_ipc.h is used by phytool too, so it is not private and is now in include/. As a side effect, remove -I../wrs_hal from makefile. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

userspace/hal: move public headers to userspace/include
This allows private headers to be clearly private (in userspace/wrsw_hal/). rt_ipc.h is used by phytool too, so it is not private and is now in include/. As a side effect, remove -I../wrs_hal from makefile. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
42539804 · Alessandro Rubini · 0f64a06f · 42539804 · 42539804 · 42539804
Commit 42539804 authored Nov 20, 2014 by Alessandro Rubini
14 changed files
--- a/userspace/wrsw_hal/hal_exports.h
+++ b/userspace/wrsw_hal/hal_exports.h
--- a/userspace/wrsw_hal/rt_ipc.h
+++ b/userspace/wrsw_hal/rt_ipc.h
--- a/userspace/libwr/Makefile
+++ b/userspace/libwr/Makefile
 CC = $(CROSS_COMPILE)gcc
 AR = $(CROSS_COMPILE)ar
-CFLAGS = -Wall -I. -O2  -DDEBUG -ggdb -I./include -I../include \
+CFLAGS = -Wall -I. -O2  -DDEBUG -ggdb -I./include -I../include -I../mini-rpc
-	-I../wrsw_hal -I../mini-rpc
 OBJS = trace.o init.o fpga_io.o util.o pps_gen.o i2c.o shw_io.o i2c_bitbang.o \
       i2c_fpga_reg.o pio.o libshw_i2c.o i2c_sfp.o fan.o i2c_io.o hwiu.o \

--- a/userspace/libwr/hal_client.c
+++ b/userspace/libwr/hal_client.c
@@ -5,7 +5,7 @@
 #include <minipc.h>
 #define HAL_EXPORT_STRUCTURES
-#include "hal_exports.h"
+#include <hal/hal_exports.h>
 #define DEFAULT_TO 200000	/* ms */

--- a/userspace/libwr/include/libwr/hal_client.h
+++ b/userspace/libwr/include/libwr/hal_client.h
@@ -2,7 +2,7 @@
 #ifndef __LIBWR_HAL_CLIENT_H
 #define __LIBWR_HAL_CLIENT_H
-#include "../wrsw_hal/hal_exports.h"
+#include <hal/hal_exports.h>
 int halexp_client_init();
 int halexp_client_try_connect(int retries, int timeout);

--- a/userspace/tools/Makefile
+++ b/userspace/tools/Makefile
@@ -25,7 +25,6 @@ GIT_USR = $(shell  git config --get-all user.name)
 CFLAGS =  -O2 -g -Wall \
 		-I$(LINUX)/include \
 		-I$(LINUX)/arch/arm/mach-at91/include \
-		-I../wrsw_hal \
 		-I../wrsw_rtud \
 		-I../mini-rpc \
 		-I../libsdb \

--- a/userspace/tools/wr_phytool.c
+++ b/userspace/tools/wr_phytool.c
@@ -28,7 +28,7 @@
 #undef PACKED
 #include <libwr/ptpd_netif.h>
-#include "rt_ipc.h"
+#include <rt_ipc.h>
 #include <libwr/hal_client.h>
 #include <libwr/switch_hw.h>

--- a/userspace/wrsw_hal/Makefile
+++ b/userspace/wrsw_hal/Makefile
@@ -29,7 +29,7 @@ $(BINARY): $(OBJS)
 install: all
 	install -d        $(WR_INSTALL_ROOT)/bin $(WR_INSTALL_ROOT)/include
 	install $(BINARY) $(WR_INSTALL_ROOT)/bin
-	install hal_exports.h wrsw_hal.h $(WR_INSTALL_ROOT)/include
+	install ../include/hal/hal_exports.h wrsw_hal.h $(WR_INSTALL_ROOT)/include
 clean:
 	rm -f $(BINARY) *.o *~
--- a/userspace/wrsw_hal/hal_exports.c
+++ b/userspace/wrsw_hal/hal_exports.c
@@ -7,12 +7,12 @@
 #include <libwr/pps_gen.h> /* for direct access to DMPLL and PPS generator */
 #include "wrsw_hal.h"
-#include "rt_ipc.h"
+#include <rt_ipc.h>
 #include <minipc.h>
 #define HAL_EXPORT_STRUCTURES
-#include "hal_exports.h" /* for exported structs/function protos */
+#include <hal/hal_exports.h> /* for exported structs/function protos */
 static struct minipc_ch *hal_ch;

--- a/userspace/wrsw_hal/hal_main.c
+++ b/userspace/wrsw_hal/hal_main.c
@@ -15,7 +15,7 @@
 #include <libwr/shw_io.h>
 #include "wrsw_hal.h"
-#include "rt_ipc.h"
+#include <rt_ipc.h>
 #define MAX_CLEANUP_CALLBACKS 16

--- a/userspace/wrsw_hal/hal_ports.c
+++ b/userspace/wrsw_hal/hal_ports.c
@@ -26,8 +26,8 @@
 #include "wrsw_hal.h"
 #include "timeout.h"
-#include "rt_ipc.h"
+#include <rt_ipc.h>
-#include "hal_exports.h"
+#include <hal/hal_exports.h>
 #include "driver_stuff.h"

--- a/userspace/wrsw_hal/hal_timing.c
+++ b/userspace/wrsw_hal/hal_timing.c
@@ -10,8 +10,8 @@
 #include "wrsw_hal.h"
 #include "timeout.h"
-#include "rt_ipc.h"
+#include <rt_ipc.h>
-#include "hal_exports.h"
+#include <hal/hal_exports.h>
 #include "gps_resync/gps_resync.h"

--- a/userspace/wrsw_hal/rt_client.c
+++ b/userspace/wrsw_hal/rt_client.c
@@ -16,7 +16,7 @@
 #include "minipc.h"
 #define RTIPC_EXPORT_STRUCTURES
-#include "rt_ipc.h"
+#include <rt_ipc.h>
 #define RTS_MAILBOX_ADDR "mem:10007000"

--- a/userspace/wrsw_rtud/Makefile
+++ b/userspace/wrsw_rtud/Makefile
@@ -13,7 +13,6 @@ WR_INCLUDE = $(WR_INSTALL_ROOT)/include
 WR_LIB = $(WR_INSTALL_ROOT)/lib
 CFLAGS		= -O2 -Wall -ggdb  \
-		-I../wrsw_hal \
 		-I../mini-rpc -I../include -I../libwr/include \
 			-I$(WR_INCLUDE) -I$(LINUX)/include
 # -I$(CROSS_COMPILE_ARM_PATH)/../include