*** empty log message ***

diff --git a/hadaq/Makefile b/hadaq/Makefile
index 309c9a28fbeeb56776c72469871f96a41fccf1a2..ea122434e4d4749266a48e4148a73a5e0b1389c6 100644 (file)
--- a/hadaq/Makefile
+++ b/hadaq/Makefile
@@ -13,18 +13,18 @@
 #DEFINES = -UNDEBUG -DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT -DNOATM
 
 # Linux
-CC = gcc
-RPCGEN = rpcgen -k
-LOADLIBES = -L$(HOME)/lib/$(SYSTYPE) -lhadesstd -llvme
-INCLUDES = -I$(HOME)/include
-DEFINES = -UNDEBUG -DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT -DNOATM
+#CC = gcc
+#RPCGEN = rpcgen -k
+#LOADLIBES = -L$(HOME)/lib/$(SYSTYPE) -lhadesstd -llvme
+#INCLUDES = -I$(HOME)/include
+#DEFINES = -UNDEBUG -DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT -DNOATM
 
 # LynxOS
-#CC = gcc
-#RPCGEN = rpcgen
-#LOADLIBES = -L/usr/local/lib -L$(HOME)/lib/$(SYSTYPE) -lhadesstd -llvme -ltcl -lm -lrpc -lnetinet -L/lib/ces -lvme -lbma -luio
-#INCLUDES = -I/usr/local/include -I$(HOME)/include
-#DEFINES = -UNDEBUG -DHADESSTD_NEXITSTAT
+CC = gcc
+RPCGEN = rpcgen
+LOADLIBES = -L/usr/local/lib -L$(HOME)/lib/$(SYSTYPE) -lhadesstd -llvme -ltcl -lm -lrpc -lnetinet -L/usr/ATM/lib -latm -L/lib/ces -lvme -lbma -luio
+INCLUDES = -I/usr/local/include -I$(HOME)/include -I/usr/ATM/include
+DEFINES = -UNDEBUG -DHADESSTD_NEXITSTAT
 
 # LynxOS
 #CC = gcc
@@ -122,7 +122,7 @@ clean:
        online.h online_clnt.c online_svc.c online_xdr.c
 
 latm.o: latm.c latm.h
-       cc $(CFLAGS) -c latm.c
+       $(CC) $(CFLAGS) -c latm.c
 
 online_clnt.c: online.x
        $(RPCGEN) -l online.x >online_clnt.c

diff --git a/hadaq/hwsoft.c b/hadaq/hwsoft.c
index e6c9330eafb5f46ad8093bc3f42040a042cc5137..f320edc53ebb41476662e9902341e809b71fb150 100644 (file)
--- a/hadaq/hwsoft.c
+++ b/hadaq/hwsoft.c
@@ -95,10 +95,10 @@ void Hardware_readout(Hardware *my, void *subEvt)
                *data++ = 0x55aa00FF;
                *data++ = 0x55aa00FF;
 #if 0
-               data += (int) ((100.0 * rand()) / RAND_MAX);
-               data += (int) ((100.0 * rand()) / RAND_MAX);
-               data += (int) ((100.0 * rand()) / RAND_MAX);
-               data += (int) ((100.0 * rand()) / RAND_MAX);
+               data += (int) ((10000.0 * rand()) / RAND_MAX);
+               data += (int) ((10000.0 * rand()) / RAND_MAX);
+               data += (int) ((10000.0 * rand()) / RAND_MAX);
+               data += (int) ((10000.0 * rand()) / RAND_MAX);
 #endif
                break;
        }

diff --git a/hadaq/nettrans.c b/hadaq/nettrans.c
index f624f637cd7c53c47eaf40364f95aef09d34e16a..4f5043dbcbaf5c3eeff6a20d0f94176d8609cf4b 100644 (file)
--- a/hadaq/nettrans.c
+++ b/hadaq/nettrans.c
@@ -1,4 +1,4 @@
-static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/nettrans.c,v 6.3 1999-11-02 05:53:24 muench Exp $";
+static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/nettrans.c,v 6.4 1999-11-15 16:30:00 hades Exp $";
 
 #define _XOPEN_SOURCE_EXTENDED
 #include <unistd.h>
@@ -46,17 +46,17 @@ static int openAtm(NetTrans *my, int vpi, int vci, size_t bw, int fl) {
        msglog(LOG_DEBUG, "aal: %d; vpi: %d; vci: %d; bandwidth: %d\n",
        lAtmAttr->aal, lAtmAttr->vpi, lAtmAttr->vci, lAtmAttr->peakBandwidth);
 
-       my->fd = lAtmOpen("/dev/fa0", fl);
+       my->lAtm = newLAtm("/dev/fa0", fl);
 
-       if (0 > my->fd) {
+       if (NULL == my->lAtm) {
                retVal = -1;
        } else {
                switch (fl) {
                case O_RDONLY:
-                       retVal = lAtmBind(my->fd, lAtmAttr);
+                       retVal = LAtm_bind(my->lAtm, lAtmAttr);
                        break;
                case O_WRONLY:
-                       retVal = lAtmConnect(my->fd, lAtmAttr);
+                       retVal = LAtm_connect(my->lAtm, lAtmAttr);
                        break;
                default:
                        errno = EINVAL;
@@ -65,7 +65,7 @@ static int openAtm(NetTrans *my, int vpi, int vci, size_t bw, int fl) {
                }
 
                if (0 > retVal) {
-                       lAtmClose(my->fd);
+                       deleteLAtm(my->lAtm);
                } else {
                        my->mtuSize = 8192;
                }
@@ -121,7 +121,8 @@ int closeGeneric(NetTrans *my) {
 
        switch (my->type) {
        case NetTransType_atm:
-               retVal = lAtmClose(my->fd);
+               deleteLAtm(my->lAtm);
+               retVal = 0;
                break;
        }
 
@@ -138,7 +139,7 @@ int sendGeneric(NetTrans *my) {
 
        switch (my->type) {
        case NetTransType_atm:
-               retVal = lAtmSend(my->fd, my->pkt, Pkt_size(my->pkt));
+               retVal = LAtm_send(my->lAtm, my->pkt, Pkt_size(my->pkt));
                break;
        }
 
@@ -159,7 +160,7 @@ int recvGeneric(NetTrans *my) {
 
        switch (my->type) {
        case NetTransType_atm:
-               retVal = lAtmRecv(my->fd, my->pkt, my->mtuSize);
+               retVal = LAtm_recv(my->lAtm, my->pkt, my->mtuSize);
                break;
        }
 
@@ -215,7 +216,6 @@ NetTrans *NetTrans_open(const char *name, size_t bandwidth, Worker *worker)
        NetTrans *my;
        char *vpi;
        char *vci;
-       LAtmAttr lAtmAttrS, *lAtmAttr = &lAtmAttrS;
        char buf[80];
 
        my = allocMem(sizeof(NetTrans));
@@ -386,13 +386,13 @@ unsigned long NetTrans_multiRecv(NetTrans *my[], void *hadTu[], size_t size[], i
        do {
                FD_ZERO(fdSet);
                for (i = 0; i < nrOfMsgs; i++) {
-                       FD_SET(my[i]->fd, fdSet);
+                       FD_SET(my[i]->lAtm->fd, fdSet);
                }
                if (0 > (getdtablesize(), fdSet, NULL, NULL, NULL)) {
                        abort();
                }
                for (i = 0; i < nrOfMsgs; i++) {
-                       if (FD_ISSET(my[i]->fd, fdSet)) {
+                       if (FD_ISSET(my[i]->lAtm->fd, fdSet)) {
                                if (assembleMsg(my[i], hadTu[i], size[i])) {
                                        msgIsComplete |= 1 << i;
                                }

diff --git a/hadaq/nettrans.h b/hadaq/nettrans.h
index 45e331399bb67b527bd7b22cc37ba70f6a4cb53f..ea1d2cc716279c41cc331fedb6176937c6ec3ab2 100644 (file)
--- a/hadaq/nettrans.h
+++ b/hadaq/nettrans.h
@@ -3,6 +3,7 @@
 
 #include <hadesstd.h>
 
+#include "latm.h"
 #include "worker.h"
 #include "hadtu.h"
 
@@ -15,7 +16,7 @@ typedef enum NetTransTypeE {
 typedef struct NetTransS {
   char name[512];
   NetTransType type;
-  int fd;
+  LAtm *lAtm;
   size_t mtuSize;
   UInt4 *pkt;
   UInt4 seqNr;