Changeset 3bacee1 in mainline for uspace/drv/char

Timestamp:

2018-04-12T16:27:17Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3cf22f9

Parents:

76d0981d

git-author:

Jiri Svoboda <jiri@…> (2018-04-11 19:25:33)

git-committer:

Jiri Svoboda <jiri@…> (2018-04-12 16:27:17)

Message:

Make ccheck-fix again and commit more good files.

Location:

uspace/drv/char

Files:

• i8042/i8042.c (modified) (1 diff)
• ns8250/ns8250.c (modified) (6 diffs)
• sun4v-con/sun4v-con.c (modified) (1 diff)

uspace/drv/char/i8042/i8042.c

@@ -115 +115 @@
 {
         assert(dev);
-        while (pio_read_8(&dev->regs->status) & i8042_INPUT_FULL);
+        while (pio_read_8(&dev->regs->status) & i8042_INPUT_FULL)
+                ;
 }
 

uspace/drv/char/ns8250/ns8250.c

@@ -388 +388 @@
 
         pio_write_8(&ns->regs->mcr, NS8250_MCR_ALL);
-        if ((pio_read_8(&ns->regs->msr) & NS8250_MSR_SIGNALS)
-            != NS8250_MSR_SIGNALS)
+        if ((pio_read_8(&ns->regs->msr) & NS8250_MSR_SIGNALS) !=
+            NS8250_MSR_SIGNALS)
                 res = false;
 
@@ -450 +450 @@
                         ddf_msg(LVL_NOTE, "Device %s was assigned I/O address = "
                             "0x%#" PRIxn ".", ddf_dev_get_name(ns->dev), ns->io_addr);
-                        break;
+                        break;
 
                 default:
@@ -483 +483 @@
         /* Interrupt when data received. */
         pio_write_8(&regs->ier, NS8250_IER_RXREADY | NS8250_IER_RXSTATUS);
-        pio_write_8(&regs->mcr, NS8250_MCR_DTR | NS8250_MCR_RTS
-            | NS8250_MCR_OUT2);
+        pio_write_8(&regs->mcr, NS8250_MCR_DTR | NS8250_MCR_RTS |
+            NS8250_MCR_OUT2);
 }
 
@@ -714 +714 @@
          * reliability.
          */
-        pio_write_8(&ns->regs->iid, NS8250_FCR_FIFOENABLE
-            | NS8250_FCR_RXFIFORESET | NS8250_FCR_TXFIFORESET
-            | NS8250_FCR_RXTRIGGERLOW);
+        pio_write_8(&ns->regs->iid, NS8250_FCR_FIFOENABLE |
+            NS8250_FCR_RXFIFORESET | NS8250_FCR_TXFIFORESET |
+            NS8250_FCR_RXTRIGGERLOW);
         /*
          * RTS/DSR set (Request to Send and Data Terminal Ready lines enabled),
          * Aux Output2 set - needed for interrupts.
          */
-        pio_write_8(&ns->regs->mcr, NS8250_MCR_DTR | NS8250_MCR_RTS
-            | NS8250_MCR_OUT2);
+        pio_write_8(&ns->regs->mcr, NS8250_MCR_DTR | NS8250_MCR_RTS |
+            NS8250_MCR_OUT2);
 }
 
@@ -1014 +1014 @@
  */
 static void
-ns8250_get_props(ddf_dev_t *dev, unsigned int *baud_rate, unsigned int *parity,
-    unsigned int *word_length, unsigned int* stop_bits)
+    ns8250_get_props(ddf_dev_t *dev, unsigned int *baud_rate, unsigned int *parity,
+    unsigned int *word_length, unsigned int *stop_bits)
 {
         ns8250_t *data = dev_ns8250(dev);
@@ -1085 +1085 @@
 
         case SERIAL_SET_COM_PROPS:
-                baud_rate = IPC_GET_ARG1(*call);
+                baud_rate = IPC_GET_ARG1(*call);
                 parity = IPC_GET_ARG2(*call);
                 word_length = IPC_GET_ARG3(*call);

uspace/drv/char/sun4v-con/sun4v-con.c

@@ -60 +60 @@
 
         while (con->output_buffer->write_ptr ==
-            (con->output_buffer->read_ptr + OUTPUT_BUFFER_SIZE - 1)
-            % OUTPUT_BUFFER_SIZE);
+            (con->output_buffer->read_ptr + OUTPUT_BUFFER_SIZE - 1) %
+            OUTPUT_BUFFER_SIZE)
+                ;
 
         con->output_buffer->data[con->output_buffer->write_ptr] = data;