patch-2.1.121 linux/arch/alpha/kernel/core_lca.c

• Lines: 127
• Date: Sun Sep 6 10:34:33 1998
• Orig file: v2.1.120/linux/arch/alpha/kernel/core_lca.c
• Orig date: Sat Sep 5 16:46:40 1998

diff -u --recursive --new-file v2.1.120/linux/arch/alpha/kernel/core_lca.c linux/arch/alpha/kernel/core_lca.c
@@ -128,8 +128,7 @@
 	unsigned long flags, code, stat0;
 	unsigned int value;
 
-	save_flags(flags);
-	cli();
+	__save_and_cli(flags);
 
 	/* Reset status register to avoid loosing errors.  */
 	stat0 = *(vulp)LCA_IOC_STAT0;
@@ -157,7 +156,7 @@
 
 		value = 0xffffffff;
 	}
-	restore_flags(flags);
+	__restore_flags(flags);
 	return value;
 }
 
@@ -166,8 +165,7 @@
 {
 	unsigned long flags, code, stat0;
 
-	save_flags(flags);	/* avoid getting hit by machine check */
-	cli();
+	__save_and_cli(flags);	/* avoid getting hit by machine check */
 
 	/* Reset status register to avoid loosing errors.  */
 	stat0 = *(vulp)LCA_IOC_STAT0;
@@ -193,17 +191,16 @@
 		/* Reset machine check. */
 		wrmces(0x7);
 	}
-	restore_flags(flags);
+	__restore_flags(flags);
 }
 
 int
-lca_pcibios_read_config_byte (u8 bus, u8 device_fn, u8 where, u8 *value)
+lca_hose_read_config_byte (u8 bus, u8 device_fn, u8 where, u8 *value,
+			   struct linux_hose_info *hose)
 {
 	unsigned long addr = LCA_CONF;
 	unsigned long pci_addr;
 
-	*value = 0xff;
-
 	if (mk_conf_addr(bus, device_fn, where, &pci_addr))
 		return PCIBIOS_DEVICE_NOT_FOUND;
 
@@ -213,15 +210,12 @@
 }
 
 int 
-lca_pcibios_read_config_word (u8 bus, u8 device_fn, u8 where, u16 *value)
+lca_hose_read_config_word (u8 bus, u8 device_fn, u8 where, u16 *value,
+			   struct linux_hose_info *hose)
 {
 	unsigned long addr = LCA_CONF;
 	unsigned long pci_addr;
 
-	*value = 0xffff;
-
-	if (where & 0x1)
-		return PCIBIOS_BAD_REGISTER_NUMBER;
 	if (mk_conf_addr(bus, device_fn, where, &pci_addr))
 		return PCIBIOS_DEVICE_NOT_FOUND;
 
@@ -231,14 +225,12 @@
 }
 
 int
-lca_pcibios_read_config_dword (u8 bus, u8 device_fn, u8 where, u32 *value)
+lca_hose_read_config_dword (u8 bus, u8 device_fn, u8 where, u32 *value,
+			    struct linux_hose_info *hose)
 {
 	unsigned long addr = LCA_CONF;
 	unsigned long pci_addr;
 
-	*value = 0xffffffff;
-	if (where & 0x3)
-		return PCIBIOS_BAD_REGISTER_NUMBER;
 	if (mk_conf_addr(bus, device_fn, where, &pci_addr))
 		return PCIBIOS_DEVICE_NOT_FOUND;
 
@@ -248,7 +240,8 @@
 }
 
 int 
-lca_pcibios_write_config_byte (u8 bus, u8 device_fn, u8 where, u8 value)
+lca_hose_write_config_byte (u8 bus, u8 device_fn, u8 where, u8 value,
+			    struct linux_hose_info *hose)
 {
 	unsigned long addr = LCA_CONF;
 	unsigned long pci_addr;
@@ -262,13 +255,12 @@
 }
 
 int
-lca_pcibios_write_config_word (u8 bus, u8 device_fn, u8 where, u16 value)
+lca_hose_write_config_word (u8 bus, u8 device_fn, u8 where, u16 value,
+			    struct linux_hose_info *hose)
 {
 	unsigned long addr = LCA_CONF;
 	unsigned long pci_addr;
 
-	if (where & 0x1)
-		return PCIBIOS_BAD_REGISTER_NUMBER;
 	if (mk_conf_addr(bus, device_fn, where, &pci_addr))
 		return PCIBIOS_DEVICE_NOT_FOUND;
 
@@ -278,13 +270,12 @@
 }
 
 int 
-lca_pcibios_write_config_dword (u8 bus, u8 device_fn, u8 where, u32 value)
+lca_hose_write_config_dword (u8 bus, u8 device_fn, u8 where, u32 value,
+			     struct linux_hose_info *hose)
 {
 	unsigned long addr = LCA_CONF;
 	unsigned long pci_addr;
 
-	if (where & 0x3)
-		return PCIBIOS_BAD_REGISTER_NUMBER;
 	if (mk_conf_addr(bus, device_fn, where, &pci_addr))
 		return PCIBIOS_DEVICE_NOT_FOUND;