Changeset 95c675b in mainline for kernel/genarch/src/drivers/ns16550/ns16550.c

Timestamp:

2017-10-17T13:11:35Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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 mainline

File:

• kernel/genarch/src/drivers/ns16550/ns16550.c (modified) (4 diffs)

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

@@ -35 +35 @@
  */
 
+#include <assert.h>
 #include <genarch/drivers/ns16550/ns16550.h>
 #include <ddi/irq.h>
@@ -40 +41 @@
 #include <console/chardev.h>
 #include <mm/slab.h>
-#include <ddi/device.h>
 #include <str.h>
 
@@ -137 +137 @@
                 
                 irq_initialize(&instance->irq);
-                instance->irq.devno = device_assign_devno();
                 instance->irq.inr = inr;
                 instance->irq.claim = ns16550_claim;
@@ -157 +156 @@
 void ns16550_wire(ns16550_instance_t *instance, indev_t *input)
 {
-        ASSERT(instance);
-        ASSERT(input);
+        assert(instance);
+        assert(input);
         
         instance->input = input;