userspace: move rt_client.c from wrsw_hal to libwr

Also fix makefiles and documentation Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

userspace: move rt_client.c from wrsw_hal to libwr
Also fix makefiles and documentation Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
1cabcabb · Adam Wujek · Alessandro Rubini · 26a949c8 · 1cabcabb · 1cabcabb
Commit 1cabcabb authored Nov 25, 2014 by Adam Wujek 💬 Committed by Alessandro Rubini Nov 28, 2014
5 changed files
--- a/doc/wrs-developer-manual.in
+++ b/doc/wrs-developer-manual.in
@@ -1623,11 +1623,6 @@ Clients are created in the following places:
 	A temporary client is created to check whether a HAL process
        is already running.

-@item userspace/wrsw_hal/rt_client.c
-
-	The hal connects to the @i{rt} subsystem to control the
-        soft-pll.
-
 @item userspace/tools/wr_mon.c
 @c FIXME: wr_mon should use shmem

@@ -1646,6 +1641,11 @@ Clients are created in the following places:
        @i{rtud} and through @t{halexp_client_init} by @i{rtu_stat},
        @i{wr_phytool}, @i{wr_mon} and @i{wr_management}.

+@item userspace/libwr/rt_client.c
+
+	The hal connects to the @i{rt} subsystem to control the
+        soft-pll.
+
 @end table

 Functions exported by the HAL and PTP are defined in two headers:

--- a/userspace/libwr/Makefile
+++ b/userspace/libwr/Makefile
@@ -5,7 +5,7 @@ CFLAGS = -Wall -I. -O2  -DDEBUG -ggdb -I./include -I../include -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 \
       ptpd_netif.o hal_client.o \
-       shmem.o hal_shmem.o
+       shmem.o hal_shmem.o rt_client.o

 LIB = libwr.a


--- a/userspace/wrsw_hal/rt_client.c
+++ b/userspace/wrsw_hal/rt_client.c
--- a/userspace/tools/Makefile
+++ b/userspace/tools/Makefile
@@ -39,7 +39,7 @@ endif
 LDFLAGS = -L../mini-rpc \
 		-L../libwr \
 		-L../libsdb \
-		-lminipc -lwr -lsdbfs -llua -lm -ldl
+		-lwr -lminipc -lsdbfs -llua -lm -ldl

 all: 	$(TOOLS)

@@ -55,21 +55,9 @@ wr_mon: wr_mon.o term.o
 wr_management: wr_management.o term.o
 	${CC} -o $@ $^ $(LDFLAGS)

-wr_phytool: wr_phytool.o ../wrsw_hal/rt_client.o
-	${CC} -o $@ $^ $(LDFLAGS)
-
 load-virtex: load-virtex.o load-fpga.o
 	${CC} -o $@ $^ $(LDFLAGS)

-test_rt: test_rt.o ../wrsw_hal/rt_client.o
-	${CC} -o $@ $^ $(LDFLAGS)	
-
-test_ts: test_ts.o ../wrsw_hal/rt_client.o
-	${CC} -o $@ $^ $(LDFLAGS)	
-
-port_calibrator: port_calibrator.o ../wrsw_hal/rt_client.o
-	${CC} -o $@ $^ $(LDFLAGS)	
-

 clean:
 	rm -f $(TOOLS) *.o *~

--- a/userspace/wrsw_hal/Makefile
+++ b/userspace/wrsw_hal/Makefile

 CC = $(CROSS_COMPILE)gcc

-OBJS = hal_exports.o hal_main.o hal_ports.o hal_config.o rt_client.o \
-	hal_timing.o
+OBJS = hal_exports.o hal_main.o hal_ports.o hal_config.o hal_timing.o

 BINARY = wrsw_hal

@@ -12,8 +11,7 @@ WR_INSTALL_ROOT ?= /usr/lib/white-rabbit
 WR_INCLUDE = $(WR_INSTALL_ROOT)/include
 WR_LIB = $(WR_INSTALL_ROOT)/lib

-CFLAGS = -O -g -Wall -DRT_CLIENT\
-	-I../include -I../libwr/include -I../mini-rpc -I$(WR_INCLUDE)
+CFLAGS = -O -g -Wall -I../include -I../libwr/include -I../mini-rpc -I$(WR_INCLUDE)

 ifdef WRS_HAL_DEBUG
  CFLAGS += -DDEBUG