Changeset 277cf60 in mainline for kernel/arch

Timestamp:

2010-07-25T16:52:18Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b8b4efa

Parents:

ec08286

Message:

Use I/O structure to access S3C24xx UART registers.

File:

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

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

@@ -75 +75 @@
 static void gta02_timer_irq_handler(irq_t *irq);
 
-static void *gta02_scons_out;
 static outdev_t *gta02_scons_dev;
 static s3c24xx_irqc_t gta02_irqc;
@@ -97 +96 @@
         s3c24xx_irqc_regs_t *irqc_regs;
 
-        gta02_scons_out = (void *) hw_map(GTA02_SCONS_BASE, PAGE_SIZE);
         gta02_timer = (void *) hw_map(S3C24XX_TIMER_ADDRESS, PAGE_SIZE);
         irqc_regs = (void *) hw_map(S3C24XX_IRQC_ADDRESS, PAGE_SIZE);
@@ -176 +174 @@
 
         /* Initialize serial port of the debugging console. */
-        gta02_scons_dev = s3c24xx_uart_init((ioport8_t *) gta02_scons_out,
-                S3C24XX_INT_UART2);
+        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);
@@ -187 +187 @@
 static void gta02_input_init(void)
 {
-        s3c24xx_uart_instance_t *scons_inst;
+        s3c24xx_uart_t *scons_inst;
 
         if (gta02_scons_dev) {