Changeset 30ba752 in rtems

Timestamp:

09/21/98 00:01:26 (24 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

04bc5d9

Parents:

6bd0fe4

Message:

Patch from Eric Norum:

I fixed the problems noted by Victor Vengerov.

1) Fix typo in cfsetispeed().
2) In rtems_termios_open, ensure that args->iop->data1 is set before calling
device-specific open routine.

Files:

• c/src/exec/libcsupport/src/termios.c (modified) (2 diffs)
• c/src/lib/libc/cfiospeed.c (modified) (1 diff)
• c/src/lib/libc/termios.c (modified) (2 diffs)
• cpukit/libcsupport/src/termios.c (modified) (2 diffs)

c/src/exec/libcsupport/src/termios.c

@@ -287 +287 @@
 
                 /*
-                 * Device-specific open
-                 */
-                if (tty->device.firstOpen)
-                        (*tty->device.firstOpen)(major, minor, arg);
-
-                /*
                  * Bump name characer
                  */
@@ -298 +292 @@
                         c = 'a';
         }
-        tty->refcount++;
         args->iop->data1 = tty;
+        if (!tty->refcount++ && tty->device.firstOpen)
+                (*tty->device.firstOpen)(major, minor, arg);
         rtems_semaphore_release (ttyMutex);
         return RTEMS_SUCCESSFUL;

c/src/lib/libc/cfiospeed.c

@@ -48 +48 @@
                 return -1;
         }
-        tp->c_cflag = (tp->c_cflag & ~CBAUD) | (speed * (CIBAUD / CBAUD));
+        tp->c_cflag = (tp->c_cflag & ~CIBAUD) | (speed * (CIBAUD / CBAUD));
         return 0;
 }

c/src/lib/libc/termios.c

@@ -287 +287 @@
 
                 /*
-                 * Device-specific open
-                 */
-                if (tty->device.firstOpen)
-                        (*tty->device.firstOpen)(major, minor, arg);
-
-                /*
                  * Bump name characer
                  */
@@ -298 +292 @@
                         c = 'a';
         }
-        tty->refcount++;
         args->iop->data1 = tty;
+        if (!tty->refcount++ && tty->device.firstOpen)
+                (*tty->device.firstOpen)(major, minor, arg);
         rtems_semaphore_release (ttyMutex);
         return RTEMS_SUCCESSFUL;

cpukit/libcsupport/src/termios.c

@@ -287 +287 @@
 
                 /*
-                 * Device-specific open
-                 */
-                if (tty->device.firstOpen)
-                        (*tty->device.firstOpen)(major, minor, arg);
-
-                /*
                  * Bump name characer
                  */
@@ -298 +292 @@
                         c = 'a';
         }
-        tty->refcount++;
         args->iop->data1 = tty;
+        if (!tty->refcount++ && tty->device.firstOpen)
+                (*tty->device.firstOpen)(major, minor, arg);
         rtems_semaphore_release (ttyMutex);
         return RTEMS_SUCCESSFUL;