Changeset b50b5af2 in mainline for kernel/arch/arm32/src/arm32.c

Timestamp:

2009-08-22T10:48:00Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

04803bf

Parents:

1ea99cc (diff), a71c158 (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/arm32.c (modified) (2 diffs)

kernel/arch/arm32/src/arm32.c

@@ -89 +89 @@
         interrupt_init();
         
-#ifdef CONFIG_FB
-        machine_fb_init();
-#else
-#ifdef CONFIG_ARM_PRN
         machine_output_init();
-#endif /* CONFIG_ARM_PRN */
-#endif /* CONFIG_FB */
 }
 
@@ -182 +176 @@
 }
 
-/** Acquire console back for kernel. */
-void arch_grab_console(void)
-{
-        machine_grab_console();
-#ifdef CONFIG_FB
-        fb_redraw();
-#endif
-}
-
-/** Return console to userspace. */
-void arch_release_console(void)
-{
-        machine_release_console();
-}
-
 /** @}
  */