Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] powerpc: Merge asm-ppc*/vga.h

Browse source 
Merge asm-ppc*/vga.h

Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
linuxppc@jdl.com 2005-09-20 14:32:37 -05:00 committed by Paul Mackerras
parent a99eb2ef45
commit 8b22cc0105
2 changed files with 12 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
include/asm-ppc64/vga.h → include/asm-powerpc/vga.h
View file

@ -1,16 +1,14 @@
#ifndef _ASM_POWERPC_VGA_H_
#define _ASM_POWERPC_VGA_H_
#ifdef __KERNEL__
/*
* Access to VGA videoram
*
* (c) 1998 Martin Mares <mj@ucw.cz>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
*/
#ifndef _LINUX_ASM_VGA_H_
#define _LINUX_ASM_VGA_H_
#include <asm/io.h>
@ -42,9 +40,15 @@ static inline u16 scr_readw(volatile const u16 *addr)
#endif /* !CONFIG_VGA_CONSOLE && !CONFIG_MDA_CONSOLE */
extern unsigned long vgacon_remap_base;
#ifdef __powerpc64__
#define VGA_MAP_MEM(x) ((unsigned long) ioremap((x), 0))
#else
#define VGA_MAP_MEM(x) (x + vgacon_remap_base)
#endif
#define vga_readb(x) (*(x))
#define vga_writeb(x,y) (*(y) = (x))
#endif
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_VGA_H_ */

46
include/asm-ppc/vga.h
View file

@ -1,46 +0,0 @@
/*
* Access to VGA videoram
*
* (c) 1998 Martin Mares <mj@ucw.cz>
*/
#ifdef __KERNEL__
#ifndef _LINUX_ASM_VGA_H_
#define _LINUX_ASM_VGA_H_
#include <asm/io.h>
#include <linux/config.h>
#if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_MDA_CONSOLE)
#define VT_BUF_HAVE_RW
/*
* These are only needed for supporting VGA or MDA text mode, which use little
* endian byte ordering.
* In other cases, we can optimize by using native byte ordering and
* <linux/vt_buffer.h> has already done the right job for us.
*/
extern inline void scr_writew(u16 val, volatile u16 *addr)
{
st_le16(addr, val);
}
extern inline u16 scr_readw(volatile const u16 *addr)
{
return ld_le16(addr);
}
#define VT_BUF_HAVE_MEMCPYW
#define scr_memcpyw memcpy
#endif /* !CONFIG_VGA_CONSOLE && !CONFIG_MDA_CONSOLE */
extern unsigned long vgacon_remap_base;
#define VGA_MAP_MEM(x) (x + vgacon_remap_base)
#define vga_readb(x) (*(x))
#define vga_writeb(x,y) (*(y) = (x))
#endif
#endif /* __KERNEL__ */