diff options
| author | Peter Hessler <phessler@cvs.openbsd.org> | 2018-05-02 19:11:02 +0000 |
|---|---|---|
| committer | Peter Hessler <phessler@cvs.openbsd.org> | 2018-05-02 19:11:02 +0000 |
| commit | 48048ed9d89377f88d29d9288b10e723bba4648f (patch) | |
| tree | f2cca4752145b8b66e661e1366fd6db690c27de4 /sys/dev/pci/pucvar.h | |
| parent | ee4868aa157551cc43239a2eb62633bed4c8720d (diff) | |
Continue kettenis@'s revert:
Revert previous commit; the XR17V35X probe that was added accesses registers
that aren't guaranteed to be there and may even belong to a different device.
This triggers a fault on hppa machines like the C3000 for example.
Diffstat (limited to 'sys/dev/pci/pucvar.h')
| -rw-r--r-- | sys/dev/pci/pucvar.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/dev/pci/pucvar.h b/sys/dev/pci/pucvar.h index c4c655e6fea..da3d0784d9b 100644 --- a/sys/dev/pci/pucvar.h +++ b/sys/dev/pci/pucvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pucvar.h,v 1.15 2018/04/15 15:07:25 jcs Exp $ */ +/* $OpenBSD: pucvar.h,v 1.16 2018/05/02 19:11:01 phessler Exp $ */ /* $NetBSD: pucvar.h,v 1.2 1999/02/06 06:29:54 cgd Exp $ */ /* @@ -72,7 +72,6 @@ static const struct puc_port_type puc_port_types[] = { { PUC_PORT_COM_MUL8, COM_FREQ * 8 }, { PUC_PORT_COM_MUL10, COM_FREQ * 10 }, { PUC_PORT_COM_MUL128, COM_FREQ * 128 }, - { PUC_PORT_COM_125MHZ, 125000000 }, }; #define PUC_IS_LPT(type) ((type) == PUC_PORT_LPT) @@ -118,11 +117,7 @@ struct puc_softc { struct device *dev; /* filled in by port attachments */ void *intrhand; - int (*real_intrhand)(void *); - void *real_intrhand_arg; } sc_ports[PUC_MAX_PORTS]; - - int sc_xr17v35x; }; const struct puc_device_description * |