The Z8530 on the MacIO has an interrupt per channel. Deal with this

by having interrupt resource variables per channel. We don't set up
different interrupt handlers per channel, though.

1 files changed, 4 insertions, 3 deletions

diff --git a/sys/dev/scc/scc_bfe.h b/sys/dev/scc/scc_bfe.h
index cb59422389e6..0107eaec9b76 100644
--- a/sys/dev/scc/scc_bfe.h
+++ b/sys/dev/scc/scc_bfe.h
@@ -85,6 +85,10 @@ struct scc_chan {
 	struct resource ch_rres;
 	struct resource_list ch_rlist;
 
+	struct resource *ch_ires;	/* Interrupt resource. */
+	void		*ch_icookie;
+	int		ch_irid;
+
 	struct scc_mode	ch_mode[SCC_NMODES];
 
 	u_int		ch_nr;
@@ -119,9 +123,6 @@ struct scc_softc {
 	struct resource	*sc_rres;	/* Register resource. */
 	int		sc_rrid;
 	int		sc_rtype;	/* SYS_RES_{IOPORT|MEMORY}. */
-	struct resource *sc_ires;	/* Interrupt resource. */
-	void		*sc_icookie;
-	int		sc_irid;
 
 	struct scc_chan	*sc_chan;