Changeset d1cbad5 in mainline for kernel/genarch/include/genarch/drivers/i8259/i8259.h

Timestamp:

2019-03-30T15:24:52Z (5 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a773b8b

Parents:

87a5796

Message:

Pass device addresses to i8259_init via arguments

File:

• kernel/genarch/include/genarch/drivers/i8259/i8259.h (modified) (2 diffs)

kernel/genarch/include/genarch/drivers/i8259/i8259.h

@@ -39 +39 @@
 #include <arch/interrupt.h>
 
-#define PIC_PIC0PORT1  ((ioport8_t *) 0x20U)
-#define PIC_PIC0PORT2  ((ioport8_t *) 0x21U)
-#define PIC_PIC1PORT1  ((ioport8_t *) 0xa0U)
-#define PIC_PIC1PORT2  ((ioport8_t *) 0xa1U)
-
 /* ICW1 bits */
 #define PIC_ICW1           (1 << 4)
@@ -52 +47 @@
 #define PIC_OCW4_NSEOI     (1 << 5)
 
-extern void i8259_init(void);
+typedef struct {
+        ioport8_t port1;
+        ioport8_t port2;
+} __attribute__((packed)) i8259_t;
+
+extern void i8259_init(i8259_t *, i8259_t *);
 extern void pic_enable_irqs(uint16_t);
 extern void pic_disable_irqs(uint16_t);