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

Timestamp:

2017-10-17T13:11:35Z (8 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/i8042/i8042.c (modified) (4 diffs)

kernel/genarch/src/drivers/i8042/i8042.c

@@ -38 +38 @@
  */
 
+#include <assert.h>
 #include <genarch/drivers/i8042/i8042.h>
 #include <genarch/drivers/legacy/ia32/io.h>
@@ -43 +44 @@
 #include <console/chardev.h>
 #include <mm/slab.h>
-#include <ddi/device.h>
 #include <time/delay.h>
 
@@ -112 +112 @@
                 
                 irq_initialize(&instance->irq);
-                instance->irq.devno = device_assign_devno();
                 instance->irq.inr = inr;
                 instance->irq.claim = i8042_claim;
@@ -124 +123 @@
 void i8042_wire(i8042_instance_t *instance, indev_t *kbrdin)
 {
-        ASSERT(instance);
-        ASSERT(kbrdin);
+        assert(instance);
+        assert(kbrdin);
         
         i8042_clear_buffer(instance->i8042);