patch-2.4.21 linux-2.4.21/include/asm-alpha/core_titan.h
Next file: linux-2.4.21/include/asm-alpha/delay.h
Previous file: linux-2.4.21/include/asm-alpha/core_t2.h
Back to the patch index
Back to the overall index
- Lines: 45
- Date:
2003-06-13 07:51:38.000000000 -0700
- Orig file:
linux-2.4.20/include/asm-alpha/core_titan.h
- Orig date:
2001-11-09 13:45:35.000000000 -0800
diff -urN linux-2.4.20/include/asm-alpha/core_titan.h linux-2.4.21/include/asm-alpha/core_titan.h
@@ -2,6 +2,7 @@
#define __ALPHA_TITAN__H__
#include <linux/types.h>
+#include <linux/pci.h>
#include <asm/compiler.h>
/*
@@ -293,13 +294,15 @@
* 2 - pachip 0 / A Port
* 3 - pachip 1 / A Port
*/
-#define TITAN_HOSE(h) (((unsigned long)(h)) << 33)
+#define TITAN_HOSE_SHIFT (33)
+#define TITAN_HOSE(h) (((unsigned long)(h)) << TITAN_HOSE_SHIFT)
#define TITAN_BASE (IDENT_ADDR + TI_BIAS)
#define TITAN_MEM(h) (TITAN_BASE+TITAN_HOSE(h)+0x000000000UL)
#define _TITAN_IACK_SC(h) (TITAN_BASE+TITAN_HOSE(h)+0x1F8000000UL)
#define TITAN_IO(h) (TITAN_BASE+TITAN_HOSE(h)+0x1FC000000UL)
#define TITAN_CONF(h) (TITAN_BASE+TITAN_HOSE(h)+0x1FE000000UL)
+#define TITAN_HOSE_MASK TITAN_HOSE(3)
#define TITAN_IACK_SC _TITAN_IACK_SC(0) /* hack! */
/*
@@ -427,17 +430,8 @@
* Memory functions. all accesses are done through linear space.
*/
-__EXTERN_INLINE unsigned long titan_ioremap(unsigned long addr,
- unsigned long size
- __attribute__((unused)))
-{
- return addr + TITAN_MEM_BIAS;
-}
-
-__EXTERN_INLINE void titan_iounmap(unsigned long addr)
-{
- return;
-}
+extern unsigned long titan_ioremap(unsigned long addr, unsigned long size);
+extern void titan_iounmap(unsigned long addr);
__EXTERN_INLINE int titan_is_ioaddr(unsigned long addr)
{
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)