Changeset 8b3da13 in rtems-libbsd

Timestamp:

01/08/18 12:55:36 (6 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, 5-freebsd-12, 6-freebsd-12, master

Children:

a0633c5

Parents:

327f4e1

git-author:

Sebastian Huber <sebastian.huber@…> (01/08/18 12:55:36)

git-committer:

Sebastian Huber <sebastian.huber@…> (02/05/18 09:56:24)

Message:

termios: Update due to API changes

Update #2843.

File:

• rtemsbsd/rtems/rtems-kernel-termioskqueuepoll.c (modified) (7 diffs)

rtemsbsd/rtems/rtems-kernel-termioskqueuepoll.c

@@ -155 +155 @@
         termios_selinfo *ts;
         rtems_termios_tty *tty;
-        rtems_status_code sc;
 
         ts = arg;
         tty = ts->tty;
 
-        sc = rtems_semaphore_obtain(tty->isem, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
-        BSD_ASSERT(sc == RTEMS_SUCCESSFUL);
-
+        rtems_mutex_lock(&tty->isem);
         selwakeup(&ts->sel);
-
-        sc = rtems_semaphore_release(tty->isem);
-        BSD_ASSERT(sc == RTEMS_SUCCESSFUL);
+        rtems_mutex_unlock(&tty->isem);
 }
 
@@ -174 +169 @@
         termios_selinfo *ts;
         rtems_termios_tty *tty;
-        rtems_status_code sc;
 
         ts = arg;
         tty = ts->tty;
 
-        sc = rtems_semaphore_obtain(tty->osem, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
-        BSD_ASSERT(sc == RTEMS_SUCCESSFUL);
-
+        rtems_mutex_lock(&tty->osem);
         selwakeup(&ts->sel);
-
-        sc = rtems_semaphore_release(tty->osem);
-        BSD_ASSERT(sc == RTEMS_SUCCESSFUL);
+        rtems_mutex_unlock(&tty->osem);
 }
 
@@ -230 +220 @@
         struct selinfo *sel;
         rtems_termios_tty *tty;
-        rtems_status_code sc;
         int revents;
 
@@ -240 +229 @@
                     termios_receive_wakeup);
 
-                sc = rtems_semaphore_obtain(tty->isem, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
-                BSD_ASSERT(sc == RTEMS_SUCCESSFUL);
+                rtems_mutex_lock(&tty->isem);
 
                 if (termios_can_read(tty)) {
@@ -249 +237 @@
                 }
 
-                sc = rtems_semaphore_release(tty->isem);
-                BSD_ASSERT(sc == RTEMS_SUCCESSFUL);
+                rtems_mutex_unlock(&tty->isem);
         }
 
@@ -257 +244 @@
                     termios_transmit_wakeup);
 
-                sc = rtems_semaphore_obtain(tty->osem, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
-                BSD_ASSERT(sc == RTEMS_SUCCESSFUL);
+                rtems_mutex_lock(&tty->osem);
 
                 if (termios_can_write(tty)) {
@@ -266 +252 @@
                 }
 
-                sc = rtems_semaphore_release(tty->osem);
-                BSD_ASSERT(sc == RTEMS_SUCCESSFUL);
+                rtems_mutex_unlock(&tty->osem);
         }