symlink update, now done by Makefile

diff --git a/trbnetd/server/Makefile b/trbnetd/server/Makefile
index d3c88ee9cc05aaa26eeb5776885780c6e8143186..fbe3d44d5628d12c782edb499ce32cd8ecda085a 100644 (file)
--- a/trbnetd/server/Makefile
+++ b/trbnetd/server/Makefile
@@ -79,6 +79,7 @@ clean:
 .PHONY: distclean
 distclean: clean
        rm -f $(TARGETS) $(LIB_TARGETS)
+       find . -type l -exec rm {} \;
        rcsclean -u
 
 .PHONY: cleanrpc
@@ -100,3 +101,11 @@ trbnetd.o: trbnetd.c trbrpc.h
 server.o: server.c
 
 trbrpc_xdr.o: trbrpc_xdr.c trbrpc.h
+
+# ----------------------------------------------------------------------
+
+trbrpc.h:
+       ln -s ../trbrpc.h
+
+trbrpc_xdr.c:
+       ln -s ../trbrpc_xdr.c
\ No newline at end of file

diff --git a/trbnetd/server/trbrpc.h b/trbnetd/server/trbrpc.h
deleted file mode 100644 (file)
index 2525d85..0000000
--- a/trbnetd/server/trbrpc.h
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _TRBRPC_H_RPCGEN
-#define _TRBRPC_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-#include <pthread.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-typedef struct {
-       u_int Buffer_len;
-       uint32_t *Buffer_val;
-} Buffer;
-
-struct Status {
-       int trb_errno;
-       uint16_t status_common;
-       uint16_t status_channel;
-       uint16_t sequence;
-       uint8_t channel;
-};
-typedef struct Status Status;
-
-struct RetVal {
-       Status status;
-       Buffer data;
-};
-typedef struct RetVal RetVal;
-
-struct register_read_1_argument {
-       uint16_t arg1;
-       uint16_t arg2;
-       u_int arg3;
-};
-typedef struct register_read_1_argument register_read_1_argument;
-
-struct register_read_mem_1_argument {
-       uint16_t arg1;
-       uint16_t arg2;
-       uint8_t arg3;
-       uint16_t arg4;
-       u_int arg5;
-};
-typedef struct register_read_mem_1_argument register_read_mem_1_argument;
-
-struct register_write_1_argument {
-       uint16_t arg1;
-       uint16_t arg2;
-       uint32_t arg3;
-};
-typedef struct register_write_1_argument register_write_1_argument;
-
-struct register_write_mem_1_argument {
-       uint16_t arg1;
-       uint16_t arg2;
-       uint8_t arg3;
-       Buffer arg4;
-};
-typedef struct register_write_mem_1_argument register_write_mem_1_argument;
-
-struct read_uid_1_argument {
-       uint16_t arg1;
-       u_int arg2;
-};
-typedef struct read_uid_1_argument read_uid_1_argument;
-
-struct set_address_1_argument {
-       uint64_t arg1;
-       uint8_t arg2;
-       uint16_t arg3;
-};
-typedef struct set_address_1_argument set_address_1_argument;
-
-struct send_trigger_1_argument {
-       uint8_t arg1;
-       uint32_t arg2;
-       uint8_t arg3;
-       uint16_t arg4;
-};
-typedef struct send_trigger_1_argument send_trigger_1_argument;
-
-struct ipu_data_read_1_argument {
-       uint8_t arg1;
-       uint32_t arg2;
-       uint8_t arg3;
-       uint16_t arg4;
-       u_int arg5;
-};
-typedef struct ipu_data_read_1_argument ipu_data_read_1_argument;
-
-struct fpga_register_write_1_argument {
-       uint16_t arg1;
-       uint32_t arg2;
-};
-typedef struct fpga_register_write_1_argument fpga_register_write_1_argument;
-
-struct register_modify_1_argument {
-       uint16_t arg1;
-       uint16_t arg2;
-       int arg3;
-       uint32_t arg4;
-       uint32_t arg5;
-};
-typedef struct register_modify_1_argument register_modify_1_argument;
-
-#define TRBNETRPCPROG 0x20000099
-#define TRBNETRPCVERS 1
-
-#if defined(__STDC__) || defined(__cplusplus)
-#define REGISTER_READ 1
-extern  enum clnt_stat register_read_1(uint16_t , uint16_t , u_int , RetVal *, CLIENT *);
-extern  bool_t register_read_1_svc(uint16_t , uint16_t , u_int , RetVal *, struct svc_req *);
-#define REGISTER_READ_MEM 2
-extern  enum clnt_stat register_read_mem_1(uint16_t , uint16_t , uint8_t , uint16_t , u_int , RetVal *, CLIENT *);
-extern  bool_t register_read_mem_1_svc(uint16_t , uint16_t , uint8_t , uint16_t , u_int , RetVal *, struct svc_req *);
-#define REGISTER_WRITE 3
-extern  enum clnt_stat register_write_1(uint16_t , uint16_t , uint32_t , Status *, CLIENT *);
-extern  bool_t register_write_1_svc(uint16_t , uint16_t , uint32_t , Status *, struct svc_req *);
-#define REGISTER_WRITE_MEM 4
-extern  enum clnt_stat register_write_mem_1(uint16_t , uint16_t , uint8_t , Buffer , Status *, CLIENT *);
-extern  bool_t register_write_mem_1_svc(uint16_t , uint16_t , uint8_t , Buffer , Status *, struct svc_req *);
-#define READ_UID 5
-extern  enum clnt_stat read_uid_1(uint16_t , u_int , RetVal *, CLIENT *);
-extern  bool_t read_uid_1_svc(uint16_t , u_int , RetVal *, struct svc_req *);
-#define SET_ADDRESS 6
-extern  enum clnt_stat set_address_1(uint64_t , uint8_t , uint16_t , Status *, CLIENT *);
-extern  bool_t set_address_1_svc(uint64_t , uint8_t , uint16_t , Status *, struct svc_req *);
-#define SEND_TRIGGER 7
-extern  enum clnt_stat send_trigger_1(uint8_t , uint32_t , uint8_t , uint16_t , Status *, CLIENT *);
-extern  bool_t send_trigger_1_svc(uint8_t , uint32_t , uint8_t , uint16_t , Status *, struct svc_req *);
-#define IPU_DATA_READ 8
-extern  enum clnt_stat ipu_data_read_1(uint8_t , uint32_t , uint8_t , uint16_t , u_int , RetVal *, CLIENT *);
-extern  bool_t ipu_data_read_1_svc(uint8_t , uint32_t , uint8_t , uint16_t , u_int , RetVal *, struct svc_req *);
-#define FPGA_REGISTER_READ 9
-extern  enum clnt_stat fpga_register_read_1(uint16_t , RetVal *, CLIENT *);
-extern  bool_t fpga_register_read_1_svc(uint16_t , RetVal *, struct svc_req *);
-#define FPGA_REGISTER_WRITE 10
-extern  enum clnt_stat fpga_register_write_1(uint16_t , uint32_t , Status *, CLIENT *);
-extern  bool_t fpga_register_write_1_svc(uint16_t , uint32_t , Status *, struct svc_req *);
-#define TRB_FIFO_FLUSH 11
-extern  enum clnt_stat trb_fifo_flush_1(uint8_t , Status *, CLIENT *);
-extern  bool_t trb_fifo_flush_1_svc(uint8_t , Status *, struct svc_req *);
-#define NETWORK_RESET 12
-extern  enum clnt_stat network_reset_1(Status *, CLIENT *);
-extern  bool_t network_reset_1_svc(Status *, struct svc_req *);
-#define COM_RESET 13
-extern  enum clnt_stat com_reset_1(Status *, CLIENT *);
-extern  bool_t com_reset_1_svc(Status *, struct svc_req *);
-#define REGISTER_MODIFY 14
-extern  enum clnt_stat register_modify_1(uint16_t , uint16_t , int , uint32_t , uint32_t , Status *, CLIENT *);
-extern  bool_t register_modify_1_svc(uint16_t , uint16_t , int , uint32_t , uint32_t , Status *, struct svc_req *);
-extern int trbnetrpcprog_1_freeresult (SVCXPRT *, xdrproc_t, caddr_t);
-
-#else /* K&R C */
-#define REGISTER_READ 1
-extern  enum clnt_stat register_read_1();
-extern  bool_t register_read_1_svc();
-#define REGISTER_READ_MEM 2
-extern  enum clnt_stat register_read_mem_1();
-extern  bool_t register_read_mem_1_svc();
-#define REGISTER_WRITE 3
-extern  enum clnt_stat register_write_1();
-extern  bool_t register_write_1_svc();
-#define REGISTER_WRITE_MEM 4
-extern  enum clnt_stat register_write_mem_1();
-extern  bool_t register_write_mem_1_svc();
-#define READ_UID 5
-extern  enum clnt_stat read_uid_1();
-extern  bool_t read_uid_1_svc();
-#define SET_ADDRESS 6
-extern  enum clnt_stat set_address_1();
-extern  bool_t set_address_1_svc();
-#define SEND_TRIGGER 7
-extern  enum clnt_stat send_trigger_1();
-extern  bool_t send_trigger_1_svc();
-#define IPU_DATA_READ 8
-extern  enum clnt_stat ipu_data_read_1();
-extern  bool_t ipu_data_read_1_svc();
-#define FPGA_REGISTER_READ 9
-extern  enum clnt_stat fpga_register_read_1();
-extern  bool_t fpga_register_read_1_svc();
-#define FPGA_REGISTER_WRITE 10
-extern  enum clnt_stat fpga_register_write_1();
-extern  bool_t fpga_register_write_1_svc();
-#define TRB_FIFO_FLUSH 11
-extern  enum clnt_stat trb_fifo_flush_1();
-extern  bool_t trb_fifo_flush_1_svc();
-#define NETWORK_RESET 12
-extern  enum clnt_stat network_reset_1();
-extern  bool_t network_reset_1_svc();
-#define COM_RESET 13
-extern  enum clnt_stat com_reset_1();
-extern  bool_t com_reset_1_svc();
-#define REGISTER_MODIFY 14
-extern  enum clnt_stat register_modify_1();
-extern  bool_t register_modify_1_svc();
-extern int trbnetrpcprog_1_freeresult ();
-#endif /* K&R C */
-
-/* the xdr functions */
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  bool_t xdr_Buffer (XDR *, Buffer*);
-extern  bool_t xdr_Status (XDR *, Status*);
-extern  bool_t xdr_RetVal (XDR *, RetVal*);
-extern  bool_t xdr_register_read_1_argument (XDR *, register_read_1_argument*);
-extern  bool_t xdr_register_read_mem_1_argument (XDR *, register_read_mem_1_argument*);
-extern  bool_t xdr_register_write_1_argument (XDR *, register_write_1_argument*);
-extern  bool_t xdr_register_write_mem_1_argument (XDR *, register_write_mem_1_argument*);
-extern  bool_t xdr_read_uid_1_argument (XDR *, read_uid_1_argument*);
-extern  bool_t xdr_set_address_1_argument (XDR *, set_address_1_argument*);
-extern  bool_t xdr_send_trigger_1_argument (XDR *, send_trigger_1_argument*);
-extern  bool_t xdr_ipu_data_read_1_argument (XDR *, ipu_data_read_1_argument*);
-extern  bool_t xdr_fpga_register_write_1_argument (XDR *, fpga_register_write_1_argument*);
-extern  bool_t xdr_register_modify_1_argument (XDR *, register_modify_1_argument*);
-
-#else /* K&R C */
-extern bool_t xdr_Buffer ();
-extern bool_t xdr_Status ();
-extern bool_t xdr_RetVal ();
-extern bool_t xdr_register_read_1_argument ();
-extern bool_t xdr_register_read_mem_1_argument ();
-extern bool_t xdr_register_write_1_argument ();
-extern bool_t xdr_register_write_mem_1_argument ();
-extern bool_t xdr_read_uid_1_argument ();
-extern bool_t xdr_set_address_1_argument ();
-extern bool_t xdr_send_trigger_1_argument ();
-extern bool_t xdr_ipu_data_read_1_argument ();
-extern bool_t xdr_fpga_register_write_1_argument ();
-extern bool_t xdr_register_modify_1_argument ();
-
-#endif /* K&R C */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_TRBRPC_H_RPCGEN */

diff --git a/trbnetd/server/trbrpc_xdr.c b/trbnetd/server/trbrpc_xdr.c
deleted file mode 100644 (file)
index 715e24a..0000000
--- a/trbnetd/server/trbrpc_xdr.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#include "trbrpc.h"
-
-bool_t
-xdr_Buffer (XDR *xdrs, Buffer *objp)
-{
-       register int32_t *buf;
-
-        if (!xdr_array (xdrs, (char **)&objp->Buffer_val, (u_int *) &objp->Buffer_len, ~0,
-               sizeof (uint32_t), (xdrproc_t) xdr_uint32_t))
-                return FALSE;
-       return TRUE;
-}
-
-bool_t
-xdr_Status (XDR *xdrs, Status *objp)
-{
-       register int32_t *buf;
-
-        if (!xdr_int (xdrs, &objp->trb_errno))
-                return FALSE;
-        if (!xdr_uint16_t (xdrs, &objp->status_common))
-                return FALSE;
-        if (!xdr_uint16_t (xdrs, &objp->status_channel))
-                return FALSE;
-        if (!xdr_uint16_t (xdrs, &objp->sequence))
-                return FALSE;
-        if (!xdr_uint8_t (xdrs, &objp->channel))
-                return FALSE;
-       return TRUE;
-}
-
-bool_t
-xdr_RetVal (XDR *xdrs, RetVal *objp)
-{
-       register int32_t *buf;
-
-        if (!xdr_Status (xdrs, &objp->status))
-                return FALSE;
-        if (!xdr_Buffer (xdrs, &objp->data))
-                return FALSE;
-       return TRUE;
-}
-
-bool_t
-xdr_register_read_1_argument (XDR *xdrs, register_read_1_argument *objp)
-{
-        if (!xdr_uint16_t (xdrs, &objp->arg1))
-                return FALSE;
-        if (!xdr_uint16_t (xdrs, &objp->arg2))
-                return FALSE;
-        if (!xdr_u_int (xdrs, &objp->arg3))
-                return FALSE;
-       return TRUE;
-}
-
-bool_t
-xdr_register_read_mem_1_argument (XDR *xdrs, register_read_mem_1_argument *objp)
-{
-        if (!xdr_uint16_t (xdrs, &objp->arg1))
-                return FALSE;
-        if (!xdr_uint16_t (xdrs, &objp->arg2))
-                return FALSE;
-        if (!xdr_uint8_t (xdrs, &objp->arg3))
-                return FALSE;
-        if (!xdr_uint16_t (xdrs, &objp->arg4))
-                return FALSE;
-        if (!xdr_u_int (xdrs, &objp->arg5))
-                return FALSE;
-       return TRUE;
-}
-
-bool_t
-xdr_register_write_1_argument (XDR *xdrs, register_write_1_argument *objp)
-{
-        if (!xdr_uint16_t (xdrs, &objp->arg1))
-                return FALSE;
-        if (!xdr_uint16_t (xdrs, &objp->arg2))
-                return FALSE;
-        if (!xdr_uint32_t (xdrs, &objp->arg3))
-                return FALSE;
-       return TRUE;
-}
-
-bool_t
-xdr_register_write_mem_1_argument (XDR *xdrs, register_write_mem_1_argument *objp)
-{
-        if (!xdr_uint16_t (xdrs, &objp->arg1))
-                return FALSE;
-        if (!xdr_uint16_t (xdrs, &objp->arg2))
-                return FALSE;
-        if (!xdr_uint8_t (xdrs, &objp->arg3))
-                return FALSE;
-        if (!xdr_Buffer (xdrs, &objp->arg4))
-                return FALSE;
-       return TRUE;
-}
-
-bool_t
-xdr_read_uid_1_argument (XDR *xdrs, read_uid_1_argument *objp)
-{
-        if (!xdr_uint16_t (xdrs, &objp->arg1))
-                return FALSE;
-        if (!xdr_u_int (xdrs, &objp->arg2))
-                return FALSE;
-       return TRUE;
-}
-
-bool_t
-xdr_set_address_1_argument (XDR *xdrs, set_address_1_argument *objp)
-{
-        if (!xdr_uint64_t (xdrs, &objp->arg1))
-                return FALSE;
-        if (!xdr_uint8_t (xdrs, &objp->arg2))
-                return FALSE;
-        if (!xdr_uint16_t (xdrs, &objp->arg3))
-                return FALSE;
-       return TRUE;
-}
-
-bool_t
-xdr_send_trigger_1_argument (XDR *xdrs, send_trigger_1_argument *objp)
-{
-        if (!xdr_uint8_t (xdrs, &objp->arg1))
-                return FALSE;
-        if (!xdr_uint32_t (xdrs, &objp->arg2))
-                return FALSE;
-        if (!xdr_uint8_t (xdrs, &objp->arg3))
-                return FALSE;
-        if (!xdr_uint16_t (xdrs, &objp->arg4))
-                return FALSE;
-       return TRUE;
-}
-
-bool_t
-xdr_ipu_data_read_1_argument (XDR *xdrs, ipu_data_read_1_argument *objp)
-{
-        if (!xdr_uint8_t (xdrs, &objp->arg1))
-                return FALSE;
-        if (!xdr_uint32_t (xdrs, &objp->arg2))
-                return FALSE;
-        if (!xdr_uint8_t (xdrs, &objp->arg3))
-                return FALSE;
-        if (!xdr_uint16_t (xdrs, &objp->arg4))
-                return FALSE;
-        if (!xdr_u_int (xdrs, &objp->arg5))
-                return FALSE;
-       return TRUE;
-}
-
-bool_t
-xdr_fpga_register_write_1_argument (XDR *xdrs, fpga_register_write_1_argument *objp)
-{
-        if (!xdr_uint16_t (xdrs, &objp->arg1))
-                return FALSE;
-        if (!xdr_uint32_t (xdrs, &objp->arg2))
-                return FALSE;
-       return TRUE;
-}
-
-bool_t
-xdr_register_modify_1_argument (XDR *xdrs, register_modify_1_argument *objp)
-{
-        if (!xdr_uint16_t (xdrs, &objp->arg1))
-                return FALSE;
-        if (!xdr_uint16_t (xdrs, &objp->arg2))
-                return FALSE;
-        if (!xdr_int (xdrs, &objp->arg3))
-                return FALSE;
-        if (!xdr_uint32_t (xdrs, &objp->arg4))
-                return FALSE;
-        if (!xdr_uint32_t (xdrs, &objp->arg5))
-                return FALSE;
-       return TRUE;
-}