retronetworking
/
isdn4linux
13
0
Fork 0
Code Pull Requests Releases Activity

apply Martin's pci driver patch to isdn drivers (vgerCVS)

This commit is contained in:
Fritz Elfert 1998-02-25 09:15:36 +00:00
parent 92068e8164
commit 365f9159af
1 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/isdn/avmb1/b1pci.c
View File

@ -6,6 +6,9 @@
* (c) Copyright 1997 by Carsten Paeth (calle@calle.in-berlin.de)
*
* $Log$
* Revision 1.5 1998/01/31 11:14:43 calle
* merged changes to 2.0 tree, prepare 2.1.82 to work.
*
* Revision 1.4 1997/12/10 20:00:50 calle
* get changes from 2.0 version
*
@ -27,7 +30,6 @@
#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/bios32.h>
#include <linux/pci.h>
#include <linux/skbuff.h>
#include "compat.h"
@ -67,7 +69,7 @@ int b1pci_init(void)
char *p;
char rev[10];
int rc;
int pci_index;
struct pci_dev *dev = NULL;
if ((p = strchr(revision, ':'))) {
strcpy(rev, p + 1);
@ -78,29 +80,16 @@ int b1pci_init(void)
#ifdef CONFIG_PCI
if (!pcibios_present()) {
printk(KERN_ERR "b1pci: no PCI-BIOS present\n");
if (!pci_present()) {
printk(KERN_ERR "b1pci: no PCI bus present\n");
return -EIO;
}
printk(KERN_INFO "b1pci: revision %s\n", rev);
for (pci_index = 0; pci_index < 8; pci_index++) {
unsigned char pci_bus, pci_device_fn;
unsigned int ioaddr;
unsigned char irq;
if (pcibios_find_device (PCI_VENDOR_ID_AVM,
PCI_DEVICE_ID_AVM_B1, pci_index,
&pci_bus, &pci_device_fn) != 0) {
continue;
}
pcibios_read_config_byte(pci_bus, pci_device_fn,
PCI_INTERRUPT_LINE, &irq);
pcibios_read_config_dword(pci_bus, pci_device_fn,
PCI_BASE_ADDRESS_1, &ioaddr);
/* Strip the I/O address out of the returned value */
ioaddr &= PCI_BASE_ADDRESS_IO_MASK;
while (dev = pci_find_device(PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_B1, dev)) {
unsigned int ioaddr = dev->base_address[1] & PCI_BASE_ADDRESS_IO_MASK;
unsigned int irq = dev->irq;
printk(KERN_INFO
"b1pci: PCI BIOS reports AVM-B1 at i/o %#x, irq %d\n",
ioaddr, irq);