Changeset 7917 for trunk/Ohana/src/opihi/dimm/Serial.c

Timestamp:

Jul 16, 2006, 10:58:49 PM (20 years ago)

Author:

eugene

Message:

major updates to use gprint for buffered / threaded printing

File:

• trunk/Ohana/src/opihi/dimm/Serial.c (modified) (13 diffs)

trunk/Ohana/src/opihi/dimm/Serial.c

@@ -53 +53 @@
   serial.f = SerialOpen (serial.port);
   if (serial.f <= 0) {
-    fprintf (stderr, "Error opening serial port %s - error %d.\n", serial.port, serial.f);
+    gprint (GP_ERR, "Error opening serial port %s - error %d.\n", serial.port, serial.f);
     return (FALSE);
   }
@@ -77 +77 @@
    fdesc = open (port, O_RDWR);
    if (fdesc == -1) {
-     if (SER_VERBOSE) fprintf(stderr, "Cannot open %s for read/write.\n", port);
+     if (SER_VERBOSE) gprint (GP_ERR, "Cannot open %s for read/write.\n", port);
      return OPENERR;
    }
@@ -87 +87 @@
    locked = fcntl (fdesc, F_SETLK, &lock);
    if (locked == -1) {
-     fprintf (stderr, "can't lock serial line\n");
+     gprint (GP_ERR, "can't lock serial line\n");
      close (fdesc);
      return OPENERR;
@@ -94 +94 @@
    /* Get the serial port's attributes... */
    if (tcgetattr (fdesc, &term) == -1) {
-      if (SER_VERBOSE) fprintf(stderr, "Port is not a tty\n");
+      if (SER_VERBOSE) gprint (GP_ERR, "Port is not a tty\n");
       return PORTERR;
    }
@@ -133 +133 @@
    if (SER_VERBOSE) printf("Setting the serial port's baud rate.\n");
    if (tcgetattr (fdesc, &term) == -1) {
-      if (SER_VERBOSE) fprintf (stderr, "Port is not a tty\n");
+      if (SER_VERBOSE) gprint (GP_ERR, "Port is not a tty\n");
       return PORTERR;
    }
@@ -174 +174 @@
    if (SER_VERBOSE) printf("Setting the serial port's parity.\n");
    if (tcgetattr(fdesc, &term) == -1) {
-      if (SER_VERBOSE) fprintf(stderr, "Port is not a tty\n");
+      if (SER_VERBOSE) gprint (GP_ERR, "Port is not a tty\n");
       return PORTERR;
    }
@@ -202 +202 @@
    if (SER_VERBOSE) printf("Setting the serial port's data bit size.\n");
    if (tcgetattr(fdesc, &term) == -1) {
-      if (SER_VERBOSE) fprintf(stderr, "Port is not a tty\n");
+      if (SER_VERBOSE) gprint (GP_ERR, "Port is not a tty\n");
       return PORTERR;
    }
@@ -241 +241 @@
    if (SER_VERBOSE) printf("Setting the serial port's stop bit.\n");
    if (tcgetattr(fdesc, &term) == -1) {
-      if (SER_VERBOSE) fprintf(stderr, "Port is not a tty\n");
+      if (SER_VERBOSE) gprint (GP_ERR, "Port is not a tty\n");
       return PORTERR;
    }
@@ -274 +274 @@
   int done, Nread, Nin, NREAD;
   
-  if (SER_ECHO) fprintf (stderr, "command: %s\n", in); 
+  if (SER_ECHO) gprint (GP_ERR, "command: %s\n", in); 
 
   if (serial.f <= 0) {
-    fprintf (stderr, "serial line closed\n"); 
+    gprint (GP_ERR, "serial line closed\n"); 
     if (out != (char **) NULL) {
       *out = strcreate ("SERIAL OFF");
@@ -290 +290 @@
 # if (0)
   for (i = 0; i < strlen(in); i++) {
-    fprintf (stderr, "%d %x\n", i, in[i]);
+    gprint (GP_ERR, "%d %x\n", i, in[i]);
   }
 # endif
@@ -297 +297 @@
   Nin = write (serial.f, in, strlen(in));
   if (Nin != strlen(in)) {
-    fprintf (stderr, "Serial Command not sent\n");
+    gprint (GP_ERR, "Serial Command not sent\n");
     return (FALSE);
    }
@@ -316 +316 @@
     Nin = read (serial.f, &line[Nread], 256);
 # if (SER_DEBUG)
-    fprintf (stderr, "%d ", Nin);
+    gprint (GP_ERR, "%d ", Nin);
 # endif
     if (Nin < 0) { /* error, check value */
-      fprintf (stderr, "error?");
+      gprint (GP_ERR, "error?");
       continue;
     }
@@ -335 +335 @@
   }
 
-  if (SER_ECHO) fprintf (stderr, "answer: %s\n", line);
+  if (SER_ECHO) gprint (GP_ERR, "answer: %s\n", line);
 
   if (out == (char **) NULL) {