Changeset f14291b in mainline for kernel/arch/arm32/src/mach/gta02/gta02.c

Timestamp:

2010-10-19T20:55:53Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a93d79a

Parents:

1882525 (diff), a7a85d16 (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 changes.

File:

• kernel/arch/arm32/src/mach/gta02/gta02.c (modified) (8 diffs)

kernel/arch/arm32/src/mach/gta02/gta02.c

@@ -43 +43 @@
 #include <genarch/drivers/s3c24xx_irqc/s3c24xx_irqc.h>
 #include <genarch/drivers/s3c24xx_timer/s3c24xx_timer.h>
+#include <genarch/srln/srln.h>
+#include <sysinfo/sysinfo.h>
 #include <interrupt.h>
 #include <ddi/ddi.h>
@@ -68 +70 @@
 static void gta02_output_init(void);
 static void gta02_input_init(void);
+static size_t gta02_get_irq_count(void);
 
 static void gta02_timer_irq_init(void);
@@ -74 +77 @@
 static void gta02_timer_irq_handler(irq_t *irq);
 
-static void *gta02_scons_out;
-static s3c24xx_irqc_t *gta02_irqc;
+static outdev_t *gta02_scons_dev;
+static s3c24xx_irqc_t gta02_irqc;
 static s3c24xx_timer_t *gta02_timer;
 
@@ -88 +91 @@
         gta02_frame_init,
         gta02_output_init,
-        gta02_input_init
+        gta02_input_init,
+        gta02_get_irq_count
 };
 
 static void gta02_init(void)
 {
-        gta02_scons_out = (void *) hw_map(GTA02_SCONS_BASE, PAGE_SIZE);
-        gta02_irqc = (void *) hw_map(S3C24XX_IRQC_ADDRESS, PAGE_SIZE);
+        s3c24xx_irqc_regs_t *irqc_regs;
+
         gta02_timer = (void *) hw_map(S3C24XX_TIMER_ADDRESS, PAGE_SIZE);
-
-        /* Make all interrupt sources use IRQ mode (not FIQ). */
-        pio_write_32(&gta02_irqc->intmod, 0x00000000);
-
-        /* Disable all interrupt sources. */
-        pio_write_32(&gta02_irqc->intmsk, 0xffffffff);
-
-        /* Disable interrupts from all sub-sources. */
-        pio_write_32(&gta02_irqc->intsubmsk, 0xffffffff);
+        irqc_regs = (void *) hw_map(S3C24XX_IRQC_ADDRESS, PAGE_SIZE);
+
+        /* Initialize interrupt controller. */
+        s3c24xx_irqc_init(&gta02_irqc, irqc_regs);
 }
 
@@ -132 +131 @@
         uint32_t inum;
 
-        inum = pio_read_32(&gta02_irqc->intoffset);
+        /* Determine IRQ number. */
+        inum = s3c24xx_irqc_inum_get(&gta02_irqc);
+
+        /* Clear interrupt condition in the interrupt controller. */
+        s3c24xx_irqc_clear(&gta02_irqc, inum);
 
         irq_t *irq = irq_dispatch_and_lock(inum);
@@ -144 +147 @@
                     CPU->id, inum);
         }
-
-        /* Clear interrupt condition in the interrupt controller. */
-        pio_write_32(&gta02_irqc->srcpnd, S3C24XX_INT_BIT(inum));
-        pio_write_32(&gta02_irqc->intpnd, S3C24XX_INT_BIT(inum));
 }
 
@@ -176 +175 @@
         }
 #endif
-        outdev_t *scons_dev;
-
-        scons_dev = s3c24xx_uart_init((ioport8_t *) gta02_scons_out);
-        if (scons_dev)
-                stdout_wire(scons_dev);
+
+        /* Initialize serial port of the debugging console. */
+        s3c24xx_uart_io_t *scons_io;
+
+        scons_io = (void *) hw_map(GTA02_SCONS_BASE, PAGE_SIZE);
+        gta02_scons_dev = s3c24xx_uart_init(scons_io, S3C24XX_INT_UART2);
+
+        if (gta02_scons_dev) {
+                /* Create output device. */
+                stdout_wire(gta02_scons_dev);
+        }
+
+        /*
+         * This is the necessary evil until the userspace driver is entirely
+         * self-sufficient.
+         */
+        sysinfo_set_item_val("s3c24xx_uart", NULL, true);
+        sysinfo_set_item_val("s3c24xx_uart.inr", NULL, S3C24XX_INT_UART2);
+        sysinfo_set_item_val("s3c24xx_uart.address.physical", NULL,
+            (uintptr_t) GTA02_SCONS_BASE);
+
 }
 
 static void gta02_input_init(void)
 {
+        s3c24xx_uart_t *scons_inst;
+
+        if (gta02_scons_dev) {
+                /* Create input device. */
+                scons_inst = (void *) gta02_scons_dev->data;
+
+                srln_instance_t *srln_instance = srln_init();
+                if (srln_instance) {
+                        indev_t *sink = stdin_wire();
+                        indev_t *srln = srln_wire(srln_instance, sink);
+                        s3c24xx_uart_input_wire(scons_inst, srln);
+
+                        /* Enable interrupts from UART2 */
+                        s3c24xx_irqc_src_enable(&gta02_irqc,
+                            S3C24XX_INT_UART2);
+
+                        /* Enable interrupts from UART2 RXD */
+                        s3c24xx_irqc_subsrc_enable(&gta02_irqc,
+                            S3C24XX_SUBINT_RXD2);
+                }
+        }
+
+        /* Enable interrupts from ADC */
+        s3c24xx_irqc_src_enable(&gta02_irqc, S3C24XX_INT_ADC);
+
+        /* Enable interrupts from ADC sub-sources */
+        s3c24xx_irqc_subsrc_enable(&gta02_irqc, S3C24XX_SUBINT_ADC_S);
+        s3c24xx_irqc_subsrc_enable(&gta02_irqc, S3C24XX_SUBINT_TC);
+}
+
+size_t gta02_get_irq_count(void)
+{
+        return GTA02_IRQ_COUNT;
 }
 
@@ -248 +296 @@
 
         /* Enable interrupts from timer0 */
-        pio_write_32(&gta02_irqc->intmsk, pio_read_32(&gta02_irqc->intmsk) &
-            ~S3C24XX_INT_BIT(S3C24XX_INT_TIMER0));
+        s3c24xx_irqc_src_enable(&gta02_irqc, S3C24XX_INT_TIMER0);
 
         /* Load data from tcntb0/tcmpb0 into tcnt0/tcmp0. */