Changeset b50b5af2 in mainline for kernel/arch/arm32/include/machine_func.h

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/include/machine_func.h (modified) (4 diffs)

kernel/arch/arm32/include/machine_func.h

@@ -49 +49 @@
 
 struct arm_machine_ops {
-        void            (*machine_grab_console)(void);
-        void            (*machine_release_console)(void);
         void            (*machine_init)(void);
         void            (*machine_timer_irq_start)(void);
         void            (*machine_cpu_halt)(void);
         uintptr_t       (*machine_get_memory_size)(void);
-        void            (*machine_fb_init)(void);
         void            (*machine_irq_exception)(int, istate_t*);
-        uintptr_t       (*machine_get_fb_address)(void);
         void            (*machine_frame_init)(void);
         void            (*machine_output_init)(void);
@@ -64 +60 @@
 
 extern struct arm_machine_ops machine_ops;
-
-
-/** Acquire console back for kernel. */
-extern void machine_grab_console(void);
-
-/** Return console to userspace. */
-extern void machine_release_console(void);
 
 
@@ -91 +80 @@
 extern uintptr_t machine_get_memory_size(void);
 
-/** Initializes the Frame Buffer
- *
- */
-extern void machine_fb_init(void);
-
 
 /** Interrupt exception handler.
@@ -104 +88 @@
 extern void machine_irq_exception(int exc_no, istate_t *istate);
 
-
-/** Returns address of framebuffer device.
- *
- *  @return Address of framebuffer device.
- */
-extern uintptr_t machine_get_fb_address(void);
 
 /*