patch-2.1.110 linux/arch/alpha/kernel/bios32.c

• Lines: 104
• Date: Sun Jul 19 20:44:33 1998
• Orig file: v2.1.109/linux/arch/alpha/kernel/bios32.c
• Orig date: Wed Jun 24 22:54:02 1998

diff -u --recursive --new-file v2.1.109/linux/arch/alpha/kernel/bios32.c linux/arch/alpha/kernel/bios32.c
@@ -29,6 +29,8 @@
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
 #include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/pci.h>
 #include <asm/dma.h>
 
 #if 0
@@ -39,24 +41,11 @@
 
 #ifndef CONFIG_PCI
 
-int pcibios_present(void)
-{
-	return 0;
-}
-
-asmlinkage int sys_pciconfig_read()
-{
-	return -ENOSYS;
-}
-
-asmlinkage int sys_pciconfig_write()
-{
-	return -ENOSYS;
-}
+asmlinkage int sys_pciconfig_read() { return -ENOSYS; }
+asmlinkage int sys_pciconfig_write() { return -ENOSYS; }
 
 #else /* CONFIG_PCI */
 
-#include <linux/pci.h>
 #include <linux/malloc.h>
 #include <linux/mm.h>
 
@@ -82,17 +71,19 @@
 #define ALIGN(val,align)	(((val) + ((align) - 1)) & ~((align) - 1))
 
 
-#if defined(CONFIG_ALPHA_MCPCIA) || defined(CONFIG_ALPHA_TSUNAMI)
-/* multiple PCI bus machines */
-/* make handle from bus number */
+/*
+ * On multiple PCI bus machines, create a handle from the bus number.
+ */
+#if defined(CONFIG_ALPHA_MCPCIA) /* || defined(CONFIG_ALPHA_TSUNAMI) */
 extern struct linux_hose_info *bus2hose[256];
 #define HANDLE(b) (((unsigned long)(bus2hose[(b)]->pci_hose_index)&3)<<32)
 #define DEV_IS_ON_PRIMARY(dev) \
 	(bus2hose[(dev)->bus->number]->pci_first_busno == (dev)->bus->number)
-#else /* MCPCIA || TSUNAMI */
+#else
 #define HANDLE(b) (0)
 #define DEV_IS_ON_PRIMARY(dev) ((dev)->bus->number == 0)
-#endif /* MCPCIA || TSUNAMI */
+#endif
+
 /*
  * PCI_MODIFY
  *
@@ -1946,8 +1937,8 @@
 }
 
 
-void __init
-pcibios_fixup(void)
+__initfunc(void
+pcibios_fixup(void))
 {
 	  struct pci_bus *cur;
 
@@ -2022,6 +2013,12 @@
 }
 
 
+__initfunc(void
+pcibios_fixup_bus(struct pci_bus *bus))
+{
+}
+
+
 asmlinkage int sys_pciconfig_read(unsigned long bus, unsigned long dfn,
 				  unsigned long off, unsigned long len,
 				  unsigned char *buf)
@@ -2193,7 +2190,6 @@
 #ifdef CONFIG_ALPHA_SRM_SETUP
 void reset_for_srm(void)
 {
-	extern void scrreset(void);
 	struct pci_dev *dev;
 	int i;
 
@@ -2224,9 +2220,7 @@
 		   io_to_reset[i]);
 #endif
 }
-
-	/* reset the visible screen to the top of display memory */
-	scrreset();
+	/* FIXME: reset the video origin.  */
 }
 #endif /* CONFIG_ALPHA_SRM_SETUP */