Changeset 3bacee1 in mainline for kernel/genarch/src/drivers

Timestamp:

2018-04-12T16:27:17Z (7 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:

kernel/genarch/src/drivers

Files:

• dsrln/dsrlnin.c (modified) (1 diff)
• ega/ega.c (modified) (1 diff)
• ns16550/ns16550.c (modified) (1 diff)
• via-cuda/cuda.c (modified) (3 diffs)

kernel/genarch/src/drivers/dsrln/dsrlnin.c

@@ -56 +56 @@
 dsrlnin_instance_t *dsrlnin_init(dsrlnin_t *dev, inr_t inr)
 {
-        dsrlnin_instance_t *instance
-            = malloc(sizeof(dsrlnin_instance_t), FRAME_ATOMIC);
+        dsrlnin_instance_t *instance =
+            malloc(sizeof(dsrlnin_instance_t), FRAME_ATOMIC);
         if (instance) {
                 instance->dsrlnin = dev;

kernel/genarch/src/drivers/ega/ega.c

@@ -547 +547 @@
         switch (ch) {
         case '\n':
-                instance->cursor = (instance->cursor + EGA_COLS)
-                    - instance->cursor % EGA_COLS;
+                instance->cursor = (instance->cursor + EGA_COLS) -
+                    instance->cursor % EGA_COLS;
                 break;
         case '\t':
-                instance->cursor = (instance->cursor + 8)
-                    - instance->cursor % 8;
+                instance->cursor = (instance->cursor + 8) -
+                    instance->cursor % 8;
                 break;
         case '\b':

kernel/genarch/src/drivers/ns16550/ns16550.c

@@ -128 +128 @@
     cir_t cir, void *cir_arg, outdev_t **output)
 {
-        ns16550_instance_t *instance
-            = malloc(sizeof(ns16550_instance_t), FRAME_ATOMIC);
+        ns16550_instance_t *instance =
+            malloc(sizeof(ns16550_instance_t), FRAME_ATOMIC);
         if (instance) {
                 instance->ns16550 = dev;

kernel/genarch/src/drivers/via-cuda/cuda.c

@@ -90 +90 @@
 cuda_instance_t *cuda_init(cuda_t *dev, inr_t inr, cir_t cir, void *cir_arg)
 {
-        cuda_instance_t *instance
-            = malloc(sizeof(cuda_instance_t), FRAME_ATOMIC);
+        cuda_instance_t *instance =
+            malloc(sizeof(cuda_instance_t), FRAME_ATOMIC);
         if (instance) {
                 instance->cuda = dev;
@@ -168 +168 @@
 
         switch (instance->xstate) {
-        case cx_listen: cuda_irq_listen(irq); break;
-        case cx_receive: cuda_irq_receive(irq); break;
-        case cx_rcv_end: cuda_irq_rcv_end(irq, rbuf, &len);
-            handle = true; break;
-        case cx_send_start: cuda_irq_send_start(irq); break;
-        case cx_send: cuda_irq_send(irq); break;
+        case cx_listen:
+                cuda_irq_listen(irq);
+                break;
+        case cx_receive:
+                cuda_irq_receive(irq);
+                break;
+        case cx_rcv_end:
+                cuda_irq_rcv_end(irq, rbuf, &len);
+                handle = true;
+                break;
+        case cx_send_start:
+                cuda_irq_send_start(irq);
+                break;
+        case cx_send:
+                cuda_irq_send(irq);
+                break;
         }
 
@@ -314 +324 @@
 static void cuda_packet_handle(cuda_instance_t *instance, uint8_t *data, size_t len)
 {
-        if (data[0] != 0x00 || data[1] != 0x40 || (data[2] != 0x2c
-                && data[2] != 0x8c))
+        if (data[0] != 0x00 || data[1] != 0x40 || (data[2] != 0x2c &&
+            data[2] != 0x8c))
                 return;