summaryrefslogtreecommitdiffstats
path: root/include/asm-ia64/vga.h
diff options
context:
space:
mode:
authorMark Maule <maule@sgi.com>2005-04-25 13:51:00 -0700
committerTony Luck <tony.luck@intel.com>2005-06-28 09:09:06 -0700
commit66b7f8a30437b8639e798f7db8e9be1da5711efa (patch)
tree288703e10bab793bc399961059ad485604539955 /include/asm-ia64/vga.h
parent54522b6613a03807f057fd567794a31267ef85cb (diff)
downloadblackbird-op-linux-66b7f8a30437b8639e798f7db8e9be1da5711efa.tar.gz
blackbird-op-linux-66b7f8a30437b8639e798f7db8e9be1da5711efa.zip
[IA64-SGI] pcdp: add PCDP pci interface support
Resend 2 with changes per Bjorn Helgaas comments. Changes from original: + Change globals to vga_console_iobase/vga_console_membase and make them unconditional. + Address style-related comments. Patch to extend the PCDP vga setup code to support PCI io/mem translations for the legacy vga ioport and ram spaces on architectures (e.g. altix) which need them. Summary of the changes: drivers/firmware/pcdp.c drivers/firmware/pcdp.h ----------------------- + add declaration for the spec-defined PCI interface struct (pcdp_if_pci) as well as support macros. + extend setup_vga_console() to know about pcdp_if_pci and add a couple of globals to hold the io and mem translation offsets if present. arch/ia64/kernel/setup.c ------------------------ + tweek early_console_setup() to allow multiple early console setup routines to be called. include/asm-ia64/vga.h ---------------------- + make VGA_MAP_MEM vga_console_membase aware Signed-off-by: Mark Maule <maule@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'include/asm-ia64/vga.h')
-rw-r--r--include/asm-ia64/vga.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/asm-ia64/vga.h b/include/asm-ia64/vga.h
index 1f446d6841f6..bc3349ffc505 100644
--- a/include/asm-ia64/vga.h
+++ b/include/asm-ia64/vga.h
@@ -14,7 +14,10 @@
* videoram directly without any black magic.
*/
-#define VGA_MAP_MEM(x) ((unsigned long) ioremap((x), 0))
+extern unsigned long vga_console_iobase;
+extern unsigned long vga_console_membase;
+
+#define VGA_MAP_MEM(x) ((unsigned long) ioremap(vga_console_membase + (x), 0))
#define vga_readb(x) (*(x))
#define vga_writeb(x,y) (*(y) = (x))
OpenPOWER on IntegriCloud