Changeset 13326

Timestamp:

May 9, 2007, 6:31:51 PM (19 years ago)

Author:

eugene

Message:

adding KiiScanMessage

Location:

trunk/Ohana/src/libkapa

Files:

• include/kapa.h (modified) (1 diff)
• src/IOfuncs.c (modified) (2 diffs)

trunk/Ohana/src/libkapa/include/kapa.h

@@ -92 +92 @@
 /* IOfuncs.c */
 int KiiSendMessage (int device, char *format, ...);
+int KiiScanMessage (int device, char *format, ...);
 int KiiSendCommand (int device, int length, char *format, ...);
 int KiiSendCommandV (int device, int length, char *format, va_list argp);
-int KiiScanMessage (int device, char *format, ...);
+int KiiScanCommand (int device, int length, char *format, ...);
 int KiiSendData (int device, char *data, int Nbytes);
 char *KiiRecvData (int device);

trunk/Ohana/src/libkapa/src/IOfuncs.c

@@ -51 +51 @@
 }
 
-int KiiSendCommand (int device, int length, char *format, ...) {
-
-  int status;
-  va_list argp;  
-
-  va_start (argp, format);
-  status = KiiSendCommandV (device, length, format, argp);
-  va_end (argp);
-
-  return (status);
-}
-  
-int KiiSendCommandV (int device, int length, char *format, va_list argp) {
-
-  char *string;
-
-  /* string is sent WITHOUT ending NULL char */
-  /* allocate and zero length + 1 extra byte */
-  ALLOCATE (string, char, length + 1);
-  memset (string, 0, length + 1);
-  vsnprintf (string, length + 1, format, argp);
-
-  write (device, string, length);
-  free (string);
-  return (TRUE);
-}
-
 /* scan a message of arbitrary size, accepting the size first */
 int KiiScanMessage (int device, char *format, ...) {
@@ -106 +79 @@
   return (status);
 }
+
+/* send a command of fixed size */
+int KiiSendCommand (int device, int length, char *format, ...) {
+
+  int status;
+  va_list argp;  
+
+  va_start (argp, format);
+  status = KiiSendCommandV (device, length, format, argp);
+  va_end (argp);
+
+  return (status);
+}
+  
+int KiiSendCommandV (int device, int length, char *format, va_list argp) {
+
+  char *string;
+
+  /* string is sent WITHOUT ending NULL char */
+  /* allocate and zero length + 1 extra byte */
+  ALLOCATE (string, char, length + 1);
+  memset (string, 0, length + 1);
+  vsnprintf (string, length + 1, format, argp);
+
+  write (device, string, length);
+  free (string);
+  return (TRUE);
+}
+
+/* scan a command of fixed size */
+int KiiScanCommand (int device, int length, char *format, ...) {
+
+  int Nbytes, status;
+  char *buffer, *message;
+  va_list argp;  
+
+  ALLOCATE (message, char, length + 1);
+
+  /* read Nbytes from the device */
+  status = read (device, message, Nbytes);
+  if (status != Nbytes) fprintf (stderr, "Kii/Kapa comm error\n");
+  message[status] = 0;
+  /* make the string easy to parse */
+
+  /* scan the incoming message */
+  va_start (argp, format);
+  Nbytes = vsscanf (message, format, argp);
+  va_end (argp);
+
+  return (status);
+}