Changeset 5273 for trunk/Ohana/src/libautocode

Timestamp:

Oct 11, 2005, 8:11:57 AM (21 years ago)

Author:

eugene

Message:

moving IOBuffer and CommOps to libohana, adding AddstarClientOptions and Stars to libautocode

Location:

trunk/Ohana/src/libautocode

Files:

• Makefile (modified) (3 diffs)
• def/AddstarClientOptions.d (added)
• def/Stars.d (added)
• def/autocode.c (modified) (1 diff)
• def/autocode.h (modified) (1 diff)

trunk/Ohana/src/libautocode/Makefile

@@ -48 +48 @@
 $(SRC)/smpdata.$(ARCH).o \
 $(SRC)/spectrum.$(ARCH).o \
-$(SRC)/spectrum-ascii.$(ARCH).o
+$(SRC)/spectrum-ascii.$(ARCH).o \
+$(SRC)/Stars.$(ARCH).o \
+$(SRC)/AddstarClientOptions.$(ARCH).o
 
 LIBINC = \
@@ -76 +78 @@
 $(INC)/smpdata.h \
 $(INC)/spectrum.h \
-$(INC)/spectrum-ascii.h
+$(INC)/spectrum-ascii.h \
+$(INC)/Stars.h \
+$(INC)/AddstarClientOptions.h
 
 objects: $(LIBOBJ)
@@ -82 +86 @@
 install: $(DESTINC)/autocode.h $(DESTLIB)/libautocode.a
         @echo done install
+
+test: $(DESTINC)/autocode.h
 
 autocode: $(INC)/autocode.h $(LIB)/libautocode.$(ARCH).a 

trunk/Ohana/src/libautocode/def/autocode.c

@@ -73 +73 @@
   return (TRUE);
 }
+
+int Send_$STRUCT (int device, $STRUCT *data, int Ndata, int copy) {
+
+  int Nbytes;
+  $STRUCT *tmpdata;
+
+  Nbytes = Ndata * sizeof ($STRUCT);
+
+  if (copy) {
+    ALLOCATE (tmpdata, $STRUCT, Ndata);
+    memcpy (tmpdata, data, Nbytes);
+  } else {
+    tmpdata = data;
+  }
+
+  fits_convert_$STRUCT (tmpdata, sizeof ($STRUCT), Ndata);
+
+  SendCommand (device, 16, "NVALUE: %6d", Ndata);
+  SendCommand (device, 16, "NBYTES: %6d", Nbytes);
+  write (device, tmpdata, Nbytes);
+  
+  /* perform handshaking? */
+
+  return (TRUE);
+}
+
+int Recv_$STRUCT (int device, $STRUCT **data, int *Ndata) {
+
+  int ndata;
+  IOBuffer message;
+  $STRUCT *tmpdata;
+
+  ExpectCommand (device, 16, 1.0, &message);
+  sscanf (message.buffer, "%*s %d", &ndata);
+  FreeIOBuffer (&message);
+  
+  /* what is reasonable for timeout? */
+  ExpectMessage (device, 1.0, &message);
+  
+  tmpdata = ($STRUCT *) message.buffer;
+  fits_convert_$STRUCT (tmpdata, sizeof ($STRUCT), *Ndata);
+
+  /* double-check data length? */
+  /* perform handshaking? */
+
+  *Ndata = ndata;
+  *data = tmpdata;
+
+  return (TRUE);
+}

trunk/Ohana/src/libautocode/def/autocode.h

@@ -6 +6 @@
 int      fits_table_mkheader_$STRUCT (Header *header);
 int      fits_convert_$STRUCT ($STRUCT *data, int size, int nitems);
+int Send_$STRUCT (int device, $STRUCT *data, int Ndata, int copy);
+int Recv_$STRUCT (int device, $STRUCT **data, int *Ndata);