userspace: moved libs and wr_mon from ../on-switch-tests

e9ec1714 · Alessandro Rubini · 0b80f0f7 · e9ec1714 · e9ec1714 · e9ec1714
Commit e9ec1714 authored Mar 19, 2012 by Alessandro Rubini
22 changed files
--- a/userspace/Makefile
+++ b/userspace/Makefile
@@ -13,8 +13,9 @@ WR_INSTALL_ROOT ?= $(WRS_OUTPUT_DIR)/images/wr
 WRDEV_DIR ?= $(WRS_BASE_DIR)/..

 # subdirectories we want to compile
-SUBDIRS = libswitchhw wrsw_hal wrsw_rtud spll_dbg_proxy
-# SUBDIRS += wrsw_rtud wr_mon rtu_stat
+SUBDIRS = libswitchhw libwripc libptpnetif 
+SUBDIRS += wrsw_hal wrsw_rtud spll_dbg_proxy
+SUBDIRS += wr_mon #rtu_stat

 # all variables are exported
 export

--- a/on-switch-tests/libs/ptpd_exports.h
+++ b/on-switch-tests/libs/ptpd_exports.h
--- a/userspace/libptpnetif/Makefile
+++ b/userspace/libptpnetif/Makefile
+
+CC = $(CROSS_COMPILE)gcc
+AR = $(CROSS_COMPILE)ar
+CFLAGS = -I. -O2 -I../include -I../wrsw_hal -I../libwripc -DDEBUG
+
+OBJS = hal_client.o netif_test.o ptpd_netif.o
+
+LIB = libptpnetif.a
+
+all:	$(LIB)
+
+$(LIB): $(OBJS)
+	$(AR) rc $@ $^
+
+install: all
+	install -d $(WR_INSTALL_ROOT)/lib
+	install $(LIB) $(WR_INSTALL_ROOT)/lib
+
+clean:
+	rm -f $(LIB) $(OBJS)
--- a/on-switch-tests/libs/libptpnetif/hal_client.c
+++ b/on-switch-tests/libs/libptpnetif/hal_client.c
--- a/on-switch-tests/libs/libptpnetif/hal_client.h
+++ b/on-switch-tests/libs/libptpnetif/hal_client.h
--- a/on-switch-tests/libs/libptpnetif/netif_test.c
+++ b/on-switch-tests/libs/libptpnetif/netif_test.c
--- a/on-switch-tests/libs/libptpnetif/ptpd_netif.c
+++ b/on-switch-tests/libs/libptpnetif/ptpd_netif.c
--- a/on-switch-tests/libs/libptpnetif/ptpd_netif.h
+++ b/on-switch-tests/libs/libptpnetif/ptpd_netif.h
@@ -4,7 +4,7 @@
 #define __PTPD_NETIF_H

 #include <stdio.h>
-//#include <inttypes.h>
+#include <stdint.h>

 #define PTPD_SOCK_RAW_ETHERNET 	1
 #define PTPD_SOCK_UDP 		2

--- a/userspace/libwripc/Makefile
+++ b/userspace/libwripc/Makefile
+
+CC = $(CROSS_COMPILE)gcc
+AR = $(CROSS_COMPILE)ar
+CFLAGS = -I. -O2 -I../include
+
+OBJS = helper_arm.o wr_ipc.o
+
+LIB = libwripc.a
+
+all:	$(LIB)
+
+$(LIB): $(OBJS)
+	$(AR) rc $@ $^
+
+install: all
+	install -d $(WR_INSTALL_ROOT)/lib
+	install $(LIB) $(WR_INSTALL_ROOT)/lib
+
+clean:
+	rm -f $(LIB) $(OBJS)
--- a/on-switch-tests/libs/libwripc/asm_helpers.h
+++ b/on-switch-tests/libs/libwripc/asm_helpers.h
--- a/on-switch-tests/libs/libwripc/helper_arm.S
+++ b/on-switch-tests/libs/libwripc/helper_arm.S
--- a/on-switch-tests/libs/libwripc/structs.h
+++ b/on-switch-tests/libs/libwripc/structs.h
--- a/on-switch-tests/libs/libwripc/test_arm.c
+++ b/on-switch-tests/libs/libwripc/test_arm.c
--- a/on-switch-tests/libs/libwripc/test_cli.c
+++ b/on-switch-tests/libs/libwripc/test_cli.c
--- a/on-switch-tests/libs/libwripc/test_floats.c
+++ b/on-switch-tests/libs/libwripc/test_floats.c
--- a/on-switch-tests/libs/libwripc/test_srv.c
+++ b/on-switch-tests/libs/libwripc/test_srv.c
--- a/on-switch-tests/libs/libwripc/wr_ipc.c
+++ b/on-switch-tests/libs/libwripc/wr_ipc.c
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>

--- a/on-switch-tests/libs/libwripc/wr_ipc.h
+++ b/on-switch-tests/libs/libwripc/wr_ipc.h
--- a/on-switch-tests/wr_mon/Makefile
+++ b/on-switch-tests/wr_mon/Makefile
@@ -12,14 +12,21 @@ OBJDUMP         = $(CROSS_COMPILE)objdump

 MON_OBJS = wr_mon.o term.o 

-CFLAGS += -O2 -DDEBUG -I$(LINUX)/include
+CFLAGS += -O2 -DDEBUG -I$(LINUX)/include -I../include \
+	-I../libptpnetif -I../wrsw_hal -I../libwripc

-ALL = wr_mon
+LDFLAGS =  -L$(WR_INSTALL_ROOT)/lib -lptpnetif -lwripc

-all: $(ALL)
+BINARY = wr_mon
+
+all: $(BINARY)

 wr_mon: $(MON_OBJS)
 	${CC} $^  $(LDFLAGS) -o $@ 

 clean:
-	rm -f $(ALL) *.o *~
\ No newline at end of file
+	rm -f $(BINARY) *.o *~
+
+install:
+	install -d $(WR_INSTALL_ROOT)/bin
+	install $(BINARY) $(WR_INSTALL_ROOT)/bin
--- a/on-switch-tests/wr_mon/term.c
+++ b/on-switch-tests/wr_mon/term.c
--- a/on-switch-tests/wr_mon/term.h
+++ b/on-switch-tests/wr_mon/term.h
--- a/on-switch-tests/wr_mon/wr_mon.c
+++ b/on-switch-tests/wr_mon/wr_mon.c