Changeset 95c675b in mainline for kernel/arch/ia32/src/drivers/i8254.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/arch/ia32/src/drivers/i8254.c (modified) (3 diffs)

kernel/arch/ia32/src/drivers/i8254.c

@@ -37 +37 @@
  */
 
-#include <typedefs.h>
+#include <stdint.h>
 #include <time/clock.h>
 #include <time/delay.h>
@@ -51 +51 @@
 #include <arch.h>
 #include <ddi/irq.h>
-#include <ddi/device.h>
 
 #define CLK_PORT1  ((ioport8_t *) 0x40U)
@@ -86 +85 @@
         irq_initialize(&i8254_irq);
         i8254_irq.preack = true;
-        i8254_irq.devno = device_assign_devno();
         i8254_irq.inr = IRQ_CLK;
         i8254_irq.claim = i8254_claim;