Changeset ec08286 in mainline for kernel/genarch/include

Timestamp:

2010-07-25T14:35:05Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

277cf60

Parents:

24697c3

Message:

Kernel input device for gta02 serial console. Move s3c24xx interrupt controller functionality into a separate C file.

Location:

kernel/genarch/include/drivers

Files:

• s3c24xx_irqc/s3c24xx_irqc.h (modified) (2 diffs)
• s3c24xx_uart/s3c24xx_uart.h (modified) (1 diff)

kernel/genarch/include/drivers/s3c24xx_irqc/s3c24xx_irqc.h

@@ -53 +53 @@
         ioport32_t subsrcpnd;   /**< Sub source pending */
         ioport32_t intsubmsk;   /** Interrupt sub mask */
-} s3c24xx_irqc_t;
+} s3c24xx_irqc_regs_t;
 
 /** S3C24xx Interrupt source numbers.
@@ -120 +120 @@
 #define S3C24XX_SUBINT_BIT(subsource) (1 << (subsource))
 
+typedef struct {
+        s3c24xx_irqc_regs_t *regs;
+} s3c24xx_irqc_t;
+
+extern void s3c24xx_irqc_init(s3c24xx_irqc_t *, s3c24xx_irqc_regs_t *);
+extern unsigned s3c24xx_irqc_inum_get(s3c24xx_irqc_t *);
+extern void s3c24xx_irqc_clear(s3c24xx_irqc_t *, unsigned);
+extern void s3c24xx_irqc_src_enable(s3c24xx_irqc_t *, unsigned);
+extern void s3c24xx_irqc_src_disable(s3c24xx_irqc_t *, unsigned);
+extern void s3c24xx_irqc_subsrc_enable(s3c24xx_irqc_t *, unsigned);
+extern void s3c24xx_irqc_subsrc_disable(s3c24xx_irqc_t *, unsigned);
+
 #endif
 

kernel/genarch/include/drivers/s3c24xx_uart/s3c24xx_uart.h

@@ -38 +38 @@
 #define KERN_S3C24XX_UART_H_
 
+#include <ddi/irq.h>
+#include <console/chardev.h>
 #include <typedefs.h>
-#include <console/chardev.h>
 
-extern outdev_t *s3c24xx_uart_init(ioport8_t *);
+typedef struct {
+        ioport8_t *base;
+        indev_t *indev;
+        irq_t irq;
+} s3c24xx_uart_instance_t;
+
+extern outdev_t *s3c24xx_uart_init(ioport8_t *, inr_t inr);
+extern void s3c24xx_uart_input_wire(s3c24xx_uart_instance_t *,
+    indev_t *);
 
 #endif