diff options
Diffstat (limited to 'sys/isa')
-rw-r--r-- | sys/isa/fd.c | 6 | ||||
-rw-r--r-- | sys/isa/ppc.c | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/sys/isa/fd.c b/sys/isa/fd.c index d04f98a..d6a7659 100644 --- a/sys/isa/fd.c +++ b/sys/isa/fd.c @@ -43,7 +43,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.122 1998/09/15 08:15:28 gibbs Exp $ + * $Id: fd.c,v 1.123 1998/09/15 22:07:24 gibbs Exp $ * */ @@ -221,6 +221,7 @@ static int fd_in(fdcu_t, int *); static void fdstart(fdcu_t); static timeout_t fd_iotimeout; static timeout_t fd_pseudointr; +static ointhand2_t fdintr; static int fdstate(fdcu_t, fdc_p); static int retrier(fdcu_t); static int fdformat(dev_t, struct fd_formb *, struct proc *); @@ -540,6 +541,7 @@ fdattach(struct isa_device *dev) int typesize; #endif + dev->id_ointr = fdintr; fdc->fdcu = fdcu; fdc->flags |= FDC_ATTACHED; fdc->dmachan = dev->id_drq; @@ -1275,7 +1277,7 @@ fd_pseudointr(void *arg1) * keep calling the state machine until it returns a 0 * * ALWAYS called at SPLBIO * \***********************************************************************/ -void +static void fdintr(fdcu_t fdcu) { fdc_p fdc = fdc_data + fdcu; diff --git a/sys/isa/ppc.c b/sys/isa/ppc.c index 4dc6a44..39f4b4e 100644 --- a/sys/isa/ppc.c +++ b/sys/isa/ppc.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ppc.c,v 1.8 1998/09/13 20:57:06 nsouch Exp $ + * $Id: ppc.c,v 1.9 1998/09/20 14:47:01 nsouch Exp $ * */ #include "ppc.h" @@ -124,6 +124,7 @@ static void ppc_wfifo(int unit, char byte) { w_fifo(ppcdata[unit], byte); } static void ppc_reset_epp_timeout(int); static void ppc_ecp_sync(int); +static ointhand2_t ppcintr; static int ppc_exec_microseq(int, struct ppb_microseq **); static int ppc_generic_setmode(int, int); @@ -189,7 +190,7 @@ ppc_ecp_sync(int unit) { return; } -void +static void ppcintr(int unit) { /* call directly upper code */ @@ -1276,6 +1277,8 @@ ppcattach(struct isa_device *isdp) ppc_modes[ppc->ppc_mode], (PPB_IS_EPP(ppc->ppc_mode)) ? ppc_epp_protocol[ppc->ppc_epp] : ""); + isdp->id_ointr = ppcintr; + /* * Prepare ppbus data area for upper level code. */ |