Changeset b366a6f4 in mainline for kernel/arch/arm32/src

Timestamp:

2011-06-24T15:58:01Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7250d2c

Parents:

ee2fa30a

Message:

automatic kernel console lockout

• kernel automatically relinquishes the access to the kernel console when the uspace maps the respective physical memory area
• kernel output before uspace initialization is currently broken on Ski (no physical memory area), but this is pending further unification
• kernel console devices are now independent (there is no system-wide "silent" variable), thus on multiple devices the kernel console and uspace output might be usable at the same time

Location:

kernel/arch/arm32/src/mach

Files:

• gta02/gta02.c (modified) (2 diffs)
• integratorcp/integratorcp.c (modified) (2 diffs)

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

@@ -158 +158 @@
 {
 #ifdef CONFIG_FB
-        parea_t fb_parea;
-
         fb_properties_t prop = {
                 .addr = GTA02_FB_BASE,
@@ -170 +168 @@
 
         outdev_t *fb_dev = fb_init(&prop);
-        if (fb_dev) {
+        if (fb_dev)
                 stdout_wire(fb_dev);
-                fb_parea.pbase = GTA02_FB_BASE;
-                fb_parea.frames = 150;
-                fb_parea.unpriv = false;
-                ddi_parea_register(&fb_parea);
-        }
 #endif
 
         /* 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);
+        gta02_scons_dev =
+            s3c24xx_uart_init(GTA02_SCONS_BASE, S3C24XX_INT_UART2);
 
         if (gta02_scons_dev) {

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

@@ -53 +53 @@
 
 #define SDRAM_SIZE      (sdram[((*(uint32_t *)(ICP_CMCR+ICP_SDRAMCR_OFFSET) & ICP_SDRAM_MASK) >> 2)])
-static parea_t fb_parea;
 static icp_hw_map_t icp_hw_map;
 static irq_t icp_timer_irq;
@@ -296 +295 @@
         
         outdev_t *fbdev = fb_init(&prop);
-        if (fbdev) {
+        if (fbdev)
                 stdout_wire(fbdev);
-                fb_parea.pbase = ICP_FB;
-                fb_parea.frames = 300;
-                fb_parea.unpriv = false;
-                ddi_parea_register(&fb_parea);
-        }
 #endif
 }