Changeset 3e828ea in mainline for kernel/genarch/include

Timestamp:

2019-09-23T12:49:29Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

Location:

kernel/genarch/include/genarch

Files:

• drivers/gicv2/gicv2.h (added)
• drivers/i8259/i8259.h (modified) (2 diffs)
• drivers/pl011/pl011.h (modified) (2 diffs)
• drivers/via-cuda/cuda.h (modified) (1 diff)
• pic/pic_ops.h (added)

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

@@ -38 +38 @@
 #include <typedefs.h>
 #include <arch/interrupt.h>
-
-/* ICW1 bits */
-#define PIC_ICW1           (1 << 4)
-#define PIC_ICW1_NEEDICW4  (1 << 0)
-
-/* OCW4 bits */
-#define PIC_OCW4           (0 << 3)
-#define PIC_OCW4_NSEOI     (1 << 5)
+#include <genarch/pic/pic_ops.h>
+#include <stdbool.h>
 
 typedef struct {
@@ -52 +46 @@
 } __attribute__((packed)) i8259_t;
 
-extern void i8259_init(i8259_t *, i8259_t *, inr_t, unsigned int, unsigned int);
-extern void pic_enable_irqs(uint16_t);
-extern void pic_disable_irqs(uint16_t);
-extern void pic_eoi(void);
+extern pic_ops_t i8259_pic_ops;
+
+extern void i8259_init(i8259_t *, i8259_t *, unsigned int);
+extern void i8259_enable_irqs(uint16_t);
+extern void i8259_disable_irqs(uint16_t);
+extern void i8259_eoi(unsigned int);
+extern bool i8259_is_spurious(unsigned int);
+extern void i8259_handle_spurious(unsigned int);
 
 #endif

kernel/genarch/include/genarch/drivers/pl011/pl011.h

@@ -38 +38 @@
 #define KERN_PL011_H_
 
+#include <ddi/ddi.h>
 #include <ddi/irq.h>
 #include <console/chardev.h>
@@ -150 +151 @@
         outdev_t outdev;
         irq_t irq;
+        parea_t parea;
 } pl011_uart_t;
 

kernel/genarch/include/genarch/drivers/via-cuda/cuda.h

@@ -42 +42 @@
 
 typedef struct {
-        uint8_t b;
+        ioport8_t b;
         uint8_t pad0[0x1ff];
 
-        uint8_t a;
+        ioport8_t a;
         uint8_t pad1[0x1ff];
 
-        uint8_t dirb;
+        ioport8_t dirb;
         uint8_t pad2[0x1ff];
 
-        uint8_t dira;
+        ioport8_t dira;
         uint8_t pad3[0x1ff];
 
-        uint8_t t1cl;
+        ioport8_t t1cl;
         uint8_t pad4[0x1ff];
 
-        uint8_t t1ch;
+        ioport8_t t1ch;
         uint8_t pad5[0x1ff];
 
-        uint8_t t1ll;
+        ioport8_t t1ll;
         uint8_t pad6[0x1ff];
 
-        uint8_t t1lh;
+        ioport8_t t1lh;
         uint8_t pad7[0x1ff];
 
-        uint8_t t2cl;
+        ioport8_t t2cl;
         uint8_t pad8[0x1ff];
 
-        uint8_t t2ch;
+        ioport8_t t2ch;
         uint8_t pad9[0x1ff];
 
-        uint8_t sr;
+        ioport8_t sr;
         uint8_t pad10[0x1ff];
 
-        uint8_t acr;
+        ioport8_t acr;
         uint8_t pad11[0x1ff];
 
-        uint8_t pcr;
+        ioport8_t pcr;
         uint8_t pad12[0x1ff];
 
-        uint8_t ifr;
+        ioport8_t ifr;
         uint8_t pad13[0x1ff];
 
-        uint8_t ier;
+        ioport8_t ier;
         uint8_t pad14[0x1ff];
 
-        uint8_t anh;
+        ioport8_t anh;
         uint8_t pad15[0x1ff];
 } cuda_t;