Changeset 132ab5d1 in mainline for uspace/srv/hid/output/output.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/srv/hid/output/output.c (modified) (6 diffs)

uspace/srv/hid/output/output.c

@@ -27 +27 @@
  */
 
+#include <errno.h>
 #include <stddef.h>
-#include <errno.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <macros.h>
 #include <as.h>
@@ -36 +36 @@
 #include <config.h>
 #include "port/ega.h"
-#include "port/kchar.h"
-#include "port/niagara.h"
-#include "port/ski.h"
 #include "port/chardev.h"
 #include "output.h"
@@ -222 +219 @@
                 dev->ops.cursor_update(dev, prev_col, prev_row, col, row,
                     visible);
+                dev->ops.flush(dev);
+
         }
         
@@ -345 +344 @@
                         }
                 }
-        }
+                
+                dev->ops.flush(dev);
+        }
+        
         
         async_answer_0(iid, EOK);
@@ -383 +385 @@
                         }
                 }
-        }
-        
+                dev->ops.flush(dev);
+
+        }
         async_answer_0(iid, EOK);
 }
@@ -479 +482 @@
         if (!config_key_exists("console")) {
                 ega_init();
-                kchar_init();
-                niagara_init();
-                ski_init();
-        } else {
-                chardev_init();
-        }
+        }
+        
+        chardev_init();
         
         printf("%s: Accepting connections\n", NAME);