diff options
| author | Steve Murphree <smurph@cvs.openbsd.org> | 2002-07-05 05:41:04 +0000 |
|---|---|---|
| committer | Steve Murphree <smurph@cvs.openbsd.org> | 2002-07-05 05:41:04 +0000 |
| commit | b9f69a8a4d8fcf7c22970f3a751c586506bc7660 (patch) | |
| tree | df1f0c09fc13a8fb6c80c3ae00df8298ae823710 /sys/dev/pci/ahc_pci.c | |
| parent | 1b9150acab5574d57215c7b08f8f761af9ecd8ad (diff) | |
attempt to make ahc smaller. change PCI interrupt handler.
Diffstat (limited to 'sys/dev/pci/ahc_pci.c')
| -rw-r--r-- | sys/dev/pci/ahc_pci.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sys/dev/pci/ahc_pci.c b/sys/dev/pci/ahc_pci.c index 7f7feadcbd2..9c26a0ab988 100644 --- a/sys/dev/pci/ahc_pci.c +++ b/sys/dev/pci/ahc_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahc_pci.c,v 1.34 2002/06/30 19:19:49 smurph Exp $ */ +/* $OpenBSD: ahc_pci.c,v 1.35 2002/07/05 05:41:02 smurph Exp $ */ /* $NetBSD: ahc_pci.c,v 1.9 1996/10/21 22:56:24 thorpej Exp $ */ /* @@ -405,8 +405,9 @@ void *aux; } /* setup the PCI interrupt */ - ahc->platform_data->pci_intr_func = ahc_pci_intr; - + ahc->bus_intr = ahc_pci_intr; + ahc->unsolicited_ints = 0; + if(ahc_do_pci_config(ahc)){ ahc_free(ahc); return; @@ -1623,14 +1624,14 @@ release_seeprom(sd) #define PCI_PRINT(Printstuff) #endif -int +void ahc_pci_intr(ahc) struct ahc_softc *ahc; { pcireg_t status1; if ((ahc_inb(ahc, ERROR) & PCIERRSTAT) == 0) - return 0; + return; PCI_PRINT(("%s: PCI error Interrupt at seqaddr = 0x%x\n", ahc_name(ahc), ahc_inb(ahc, SEQADDR0) | (ahc_inb(ahc, SEQADDR1) << 8))); @@ -1672,5 +1673,5 @@ ahc_pci_intr(ahc) ahc_unpause(ahc); - return 1; + return; } |