Change isa_get/set_flags() to device_get/set_flags().

Submitted by:	dfr

10 files changed, 34 insertions, 34 deletions

diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c
index 267eefc..6cac865 100644
--- a/sys/pc98/cbus/fdc.c
+++ b/sys/pc98/cbus/fdc.c
@@ -1008,7 +1008,7 @@ fd_probe(device_t dev)
 	/* look up what bios thinks we have */
 	switch (fd->fdu) {
 	case 0:
-		if (isa_get_flags(fdc->fdc_dev) & FDC_PRETEND_D0)
+		if (device_get_flags(fdc->fdc_dev) & FDC_PRETEND_D0)
 			fdt = RTCFDT_144M | RTCFDT_144M_PRETENDED;
 		else
 			fdt = (rtcin(RTC_FDISKETTE) & 0xf0);
diff --git a/sys/pc98/cbus/gdc.c b/sys/pc98/cbus/gdc.c
index 64da302..7c5b7e8 100644
--- a/sys/pc98/cbus/gdc.c
+++ b/sys/pc98/cbus/gdc.c
@@ -134,7 +134,7 @@ gdcprobe(device_t dev)
 
 	device_set_desc(dev, "Generic GDC");
 	sc = device_get_softc(dev);
-	return gdc_probe_unit(device_get_unit(dev), sc, isa_get_flags(dev));
+	return gdc_probe_unit(device_get_unit(dev), sc, device_get_flags(dev));
 }
 
 static int
@@ -144,7 +144,7 @@ gdc_attach(device_t dev)
 	int error;
 
 	sc = device_get_softc(dev);
-	error = gdc_attach_unit(device_get_unit(dev), sc, isa_get_flags(dev));
+	error = gdc_attach_unit(device_get_unit(dev), sc, device_get_flags(dev));
 	if (error)
 		return error;
 
diff --git a/sys/pc98/cbus/pckbd.c b/sys/pc98/cbus/pckbd.c
index bbd10a4..3632535 100644
--- a/sys/pc98/cbus/pckbd.c
+++ b/sys/pc98/cbus/pckbd.c
@@ -99,7 +99,7 @@ pckbdprobe(device_t dev)
 	device_set_desc(dev, "PC-98 Keyboard");
 
 	return pckbd_probe_unit(device_get_unit(dev), isa_get_port(dev),
-				(1 << isa_get_irq(dev)), isa_get_flags(dev));
+				(1 << isa_get_irq(dev)), device_get_flags(dev));
 }
 
 static int
@@ -111,7 +111,7 @@ pckbdattach(device_t dev)
 	int		zero = 0;
 
 	pckbd_attach_unit(device_get_unit(dev), &kbd, isa_get_port(dev),
-			  (1 << isa_get_irq(dev)), isa_get_flags(dev));
+			  (1 << isa_get_irq(dev)), device_get_flags(dev));
 
 	res = bus_alloc_resource(dev, SYS_RES_IRQ, &zero, 0ul, ~0ul, 1,
 				 RF_SHAREABLE | RF_ACTIVE);
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index 565b27d..714dda8 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -971,8 +971,8 @@ card_intr(struct pccard_devinfo *devi)
 }
 #endif /* NCARD > 0 */
 
-#define SET_FLAG(dev, bit)	isa_set_flags(dev, isa_get_flags(dev) | (bit))
-#define CLR_FLAG(dev, bit)	isa_set_flags(dev, isa_get_flags(dev) & ~(bit))
+#define SET_FLAG(dev, bit)	device_set_flags(dev, device_get_flags(dev) | (bit))
+#define CLR_FLAG(dev, bit)	device_set_flags(dev, device_get_flags(dev) & ~(bit))
 
 static int
 sioprobe(dev)
@@ -988,7 +988,7 @@ sioprobe(dev)
 	u_char		mcr_image;
 	int		result;
 	device_t	xdev;
-	u_int		flags = isa_get_flags(dev);
+	u_int		flags = device_get_flags(dev);
 #ifdef PC98
 	int		irqout=0;
 	int		tmp;
@@ -1520,7 +1520,7 @@ sioattach(dev)
 	void		*ih;
 	struct resource *res;
 	int		zero = 0;
-	u_int		flags = isa_get_flags(dev);
+	u_int		flags = device_get_flags(dev);
 #ifdef PC98
 	int		port_shift = 0;
 	u_char		*obuf;
@@ -1572,8 +1572,8 @@ sioattach(dev)
 
 	com->iobase = iobase;
 #ifdef PC98
-	if (pc98_set_ioport(com, isa_get_flags(dev)) == -1) {
-	    com->pc98_if_type = (isa_get_flags(dev) >> 24) & 0xff;
+	if (pc98_set_ioport(com, device_get_flags(dev)) == -1) {
+	    com->pc98_if_type = (device_get_flags(dev) >> 24) & 0xff;
 	    port_shift = if_16550a_type[com->pc98_if_type & 0x0f].port_shift;
 	    com->data_port = iobase + (com_data << port_shift);
 	    com->int_id_port = iobase + (com_iir << port_shift);
@@ -1833,7 +1833,7 @@ determined_type: ;
 				UID_UUCP, GID_DIALER, 0660, "cuaia%r", unit);
 	make_dev(&sio_cdevsw, unit | CALLOUT_MASK | CONTROL_LOCK_STATE, 
 				UID_UUCP, GID_DIALER, 0660, "cuala%r", unit);
-	com->flags = isa_get_flags(dev); /* Heritate id_flags for later */
+	com->flags = device_get_flags(dev); /* Heritate id_flags for later */
 	com->pps.ppscap = PPS_CAPTUREASSERT | PPS_CAPTURECLEAR;
 	pps_init(&com->pps);
 
@@ -4920,7 +4920,7 @@ pc98_check_if_type(device_t dev, struct siodev *iod)
 		{  3, 10, 12, 13,  5,  6,  9, -1}
 	};
 
-	iod->if_type = if_type = (isa_get_flags(dev) >> 24) & 0xff;
+	iod->if_type = if_type = (device_get_flags(dev) >> 24) & 0xff;
 	if ((if_type < 0 || if_type > COM_IF_END1) &&
 	    (if_type < 0x10 || if_type > COM_IF_END2))
 	    return(-1);
@@ -4966,8 +4966,8 @@ pc98_check_if_type(device_t dev, struct siodev *iod)
 	} else {
 	    irr = if_16550a_type[if_type].irr_read;
 #ifdef COM_MULTIPORT
-	    if (!COM_ISMULTIPORT(isa_get_flags(dev)) ||
-		    device_get_unit(dev) == COM_MPMASTER(isa_get_flags(dev)))
+	    if (!COM_ISMULTIPORT(device_get_flags(dev)) ||
+		    device_get_unit(dev) == COM_MPMASTER(device_get_flags(dev)))
 #endif
 	    if (irr != -1) {
 		tmp = inb(io | irr);
diff --git a/sys/pc98/cbus/syscons_cbus.c b/sys/pc98/cbus/syscons_cbus.c
index 8bf43db..514aaca 100644
--- a/sys/pc98/cbus/syscons_cbus.c
+++ b/sys/pc98/cbus/syscons_cbus.c
@@ -79,13 +79,13 @@ scprobe(device_t dev)
 		return (ENXIO);
 
 	device_set_desc(dev, "System console");
-	return sc_probe_unit(device_get_unit(dev), isa_get_flags(dev));
+	return sc_probe_unit(device_get_unit(dev), device_get_flags(dev));
 }
 
 static int
 scattach(device_t dev)
 {
-	return sc_attach_unit(device_get_unit(dev), isa_get_flags(dev));
+	return sc_attach_unit(device_get_unit(dev), device_get_flags(dev));
 }
 
 static int
diff --git a/sys/pc98/pc98/fd.c b/sys/pc98/pc98/fd.c
index 267eefc..6cac865 100644
--- a/sys/pc98/pc98/fd.c
+++ b/sys/pc98/pc98/fd.c
@@ -1008,7 +1008,7 @@ fd_probe(device_t dev)
 	/* look up what bios thinks we have */
 	switch (fd->fdu) {
 	case 0:
-		if (isa_get_flags(fdc->fdc_dev) & FDC_PRETEND_D0)
+		if (device_get_flags(fdc->fdc_dev) & FDC_PRETEND_D0)
 			fdt = RTCFDT_144M | RTCFDT_144M_PRETENDED;
 		else
 			fdt = (rtcin(RTC_FDISKETTE) & 0xf0);
diff --git a/sys/pc98/pc98/pc98gdc.c b/sys/pc98/pc98/pc98gdc.c
index 64da302..7c5b7e8 100644
--- a/sys/pc98/pc98/pc98gdc.c
+++ b/sys/pc98/pc98/pc98gdc.c
@@ -134,7 +134,7 @@ gdcprobe(device_t dev)
 
 	device_set_desc(dev, "Generic GDC");
 	sc = device_get_softc(dev);
-	return gdc_probe_unit(device_get_unit(dev), sc, isa_get_flags(dev));
+	return gdc_probe_unit(device_get_unit(dev), sc, device_get_flags(dev));
 }
 
 static int
@@ -144,7 +144,7 @@ gdc_attach(device_t dev)
 	int error;
 
 	sc = device_get_softc(dev);
-	error = gdc_attach_unit(device_get_unit(dev), sc, isa_get_flags(dev));
+	error = gdc_attach_unit(device_get_unit(dev), sc, device_get_flags(dev));
 	if (error)
 		return error;
 
diff --git a/sys/pc98/pc98/pc98kbd.c b/sys/pc98/pc98/pc98kbd.c
index bbd10a4..3632535 100644
--- a/sys/pc98/pc98/pc98kbd.c
+++ b/sys/pc98/pc98/pc98kbd.c
@@ -99,7 +99,7 @@ pckbdprobe(device_t dev)
 	device_set_desc(dev, "PC-98 Keyboard");
 
 	return pckbd_probe_unit(device_get_unit(dev), isa_get_port(dev),
-				(1 << isa_get_irq(dev)), isa_get_flags(dev));
+				(1 << isa_get_irq(dev)), device_get_flags(dev));
 }
 
 static int
@@ -111,7 +111,7 @@ pckbdattach(device_t dev)
 	int		zero = 0;
 
 	pckbd_attach_unit(device_get_unit(dev), &kbd, isa_get_port(dev),
-			  (1 << isa_get_irq(dev)), isa_get_flags(dev));
+			  (1 << isa_get_irq(dev)), device_get_flags(dev));
 
 	res = bus_alloc_resource(dev, SYS_RES_IRQ, &zero, 0ul, ~0ul, 1,
 				 RF_SHAREABLE | RF_ACTIVE);
diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c
index 565b27d..714dda8 100644
--- a/sys/pc98/pc98/sio.c
+++ b/sys/pc98/pc98/sio.c
@@ -971,8 +971,8 @@ card_intr(struct pccard_devinfo *devi)
 }
 #endif /* NCARD > 0 */
 
-#define SET_FLAG(dev, bit)	isa_set_flags(dev, isa_get_flags(dev) | (bit))
-#define CLR_FLAG(dev, bit)	isa_set_flags(dev, isa_get_flags(dev) & ~(bit))
+#define SET_FLAG(dev, bit)	device_set_flags(dev, device_get_flags(dev) | (bit))
+#define CLR_FLAG(dev, bit)	device_set_flags(dev, device_get_flags(dev) & ~(bit))
 
 static int
 sioprobe(dev)
@@ -988,7 +988,7 @@ sioprobe(dev)
 	u_char		mcr_image;
 	int		result;
 	device_t	xdev;
-	u_int		flags = isa_get_flags(dev);
+	u_int		flags = device_get_flags(dev);
 #ifdef PC98
 	int		irqout=0;
 	int		tmp;
@@ -1520,7 +1520,7 @@ sioattach(dev)
 	void		*ih;
 	struct resource *res;
 	int		zero = 0;
-	u_int		flags = isa_get_flags(dev);
+	u_int		flags = device_get_flags(dev);
 #ifdef PC98
 	int		port_shift = 0;
 	u_char		*obuf;
@@ -1572,8 +1572,8 @@ sioattach(dev)
 
 	com->iobase = iobase;
 #ifdef PC98
-	if (pc98_set_ioport(com, isa_get_flags(dev)) == -1) {
-	    com->pc98_if_type = (isa_get_flags(dev) >> 24) & 0xff;
+	if (pc98_set_ioport(com, device_get_flags(dev)) == -1) {
+	    com->pc98_if_type = (device_get_flags(dev) >> 24) & 0xff;
 	    port_shift = if_16550a_type[com->pc98_if_type & 0x0f].port_shift;
 	    com->data_port = iobase + (com_data << port_shift);
 	    com->int_id_port = iobase + (com_iir << port_shift);
@@ -1833,7 +1833,7 @@ determined_type: ;
 				UID_UUCP, GID_DIALER, 0660, "cuaia%r", unit);
 	make_dev(&sio_cdevsw, unit | CALLOUT_MASK | CONTROL_LOCK_STATE, 
 				UID_UUCP, GID_DIALER, 0660, "cuala%r", unit);
-	com->flags = isa_get_flags(dev); /* Heritate id_flags for later */
+	com->flags = device_get_flags(dev); /* Heritate id_flags for later */
 	com->pps.ppscap = PPS_CAPTUREASSERT | PPS_CAPTURECLEAR;
 	pps_init(&com->pps);
 
@@ -4920,7 +4920,7 @@ pc98_check_if_type(device_t dev, struct siodev *iod)
 		{  3, 10, 12, 13,  5,  6,  9, -1}
 	};
 
-	iod->if_type = if_type = (isa_get_flags(dev) >> 24) & 0xff;
+	iod->if_type = if_type = (device_get_flags(dev) >> 24) & 0xff;
 	if ((if_type < 0 || if_type > COM_IF_END1) &&
 	    (if_type < 0x10 || if_type > COM_IF_END2))
 	    return(-1);
@@ -4966,8 +4966,8 @@ pc98_check_if_type(device_t dev, struct siodev *iod)
 	} else {
 	    irr = if_16550a_type[if_type].irr_read;
 #ifdef COM_MULTIPORT
-	    if (!COM_ISMULTIPORT(isa_get_flags(dev)) ||
-		    device_get_unit(dev) == COM_MPMASTER(isa_get_flags(dev)))
+	    if (!COM_ISMULTIPORT(device_get_flags(dev)) ||
+		    device_get_unit(dev) == COM_MPMASTER(device_get_flags(dev)))
 #endif
 	    if (irr != -1) {
 		tmp = inb(io | irr);
diff --git a/sys/pc98/pc98/syscons_pc98.c b/sys/pc98/pc98/syscons_pc98.c
index 8bf43db..514aaca 100644
--- a/sys/pc98/pc98/syscons_pc98.c
+++ b/sys/pc98/pc98/syscons_pc98.c
@@ -79,13 +79,13 @@ scprobe(device_t dev)
 		return (ENXIO);
 
 	device_set_desc(dev, "System console");
-	return sc_probe_unit(device_get_unit(dev), isa_get_flags(dev));
+	return sc_probe_unit(device_get_unit(dev), device_get_flags(dev));
 }
 
 static int
 scattach(device_t dev)
 {
-	return sc_attach_unit(device_get_unit(dev), isa_get_flags(dev));
+	return sc_attach_unit(device_get_unit(dev), device_get_flags(dev));
 }
 
 static int