8 files changed, 28 insertions, 26 deletions

diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 3244b3bb1c69d..78fe9eee9efb7 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -382,7 +382,7 @@ ed_probe_WD80x3(dev)
 	struct ed_softc *sc = device_get_softc(dev);
 	int	error;
 	int     i;
-	int	flags = isa_get_flags(dev);
+	int	flags = device_get_flags(dev);
 	u_int   memsize, maddr;
 	u_char  iptr, isa16bit, sum;
 	u_long	conf_maddr, conf_msize, irq, junk;
@@ -795,7 +795,7 @@ ed_probe_3Com(dev)
 	struct ed_softc *sc = device_get_softc(dev);
 	int	error;
 	int     i;
-	int	flags = isa_get_flags(dev);
+	int	flags = device_get_flags(dev);
 	u_int   memsize;
 	u_char  isa16bit;
 	u_long	conf_maddr, conf_msize, irq, junk;
@@ -1301,7 +1301,7 @@ static int
 ed_probe_Novell(dev)
 	device_t dev;
 {
-	return ed_probe_Novell_generic(dev, 0, isa_get_flags(dev));
+	return ed_probe_Novell_generic(dev, 0, device_get_flags(dev));
 }
 
 #if NCARDxx > 0
@@ -1539,7 +1539,7 @@ ed_probe_HP_pclanp(dev)
 
 	sc->tx_page_start = ED_HPP_TX_PAGE_OFFSET;
 
-	if (isa_get_flags(dev) & ED_FLAGS_NO_MULTI_BUFFERING)
+	if (device_get_flags(dev) & ED_FLAGS_NO_MULTI_BUFFERING)
 		sc->txb_cnt = 1;
 	else
 		sc->txb_cnt = 2;
@@ -1864,7 +1864,7 @@ ed_isa_attach(dev)
 	device_t dev;
 {
 	struct ed_softc *sc = device_get_softc(dev);
-	int flags = isa_get_flags(dev);
+	int flags = device_get_flags(dev);
 	int error;
 
 	if (sc->port_used > 0)
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 1097933d283fc..ee74217232e41 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -817,7 +817,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/dev/pcm/isa/mss.c b/sys/dev/pcm/isa/mss.c
index 13645d9debe30..ee5431295cccc 100644
--- a/sys/dev/pcm/isa/mss.c
+++ b/sys/dev/pcm/isa/mss.c
@@ -464,11 +464,11 @@ mss_probe(device_t dev)
     	if (!mss->io_base) goto no;
 
     	/* got irq/dma regs? */
-    	flags = isa_get_flags(dev);
+    	flags = device_get_flags(dev);
     	irq = isa_get_irq(dev);
     	drq = isa_get_drq(dev);
 
-    	if (!(isa_get_flags(dev) & DV_F_TRUE_MSS)) goto mss_probe_end;
+    	if (!(device_get_flags(dev) & DV_F_TRUE_MSS)) goto mss_probe_end;
 
     	/*
      	* Check if the IO port returns valid signature. The original MS
@@ -480,7 +480,7 @@ mss_probe(device_t dev)
     	tmpx = tmp = io_rd(mss, 3);
     	if (tmp == 0xff) {	/* Bus float */
 		BVDDB(printf("I/O addr inactive (%x), try pseudo_mss\n", tmp));
-		isa_set_flags(dev, flags & ~DV_F_TRUE_MSS);
+		device_set_flags(dev, flags & ~DV_F_TRUE_MSS);
 		goto mss_probe_end;
     	}
     	tmp &= 0x3f;
@@ -732,8 +732,9 @@ mss_detect(device_t dev, struct mss_info *mss)
 gotit:
     	BVDDB(printf("mss_detect() - Detected %s\n", name));
     	device_set_desc(dev, name);
-    	isa_set_flags(dev, ((isa_get_flags(dev) & ~DV_F_DEV_MASK) |
-		      ((mss->bd_id << DV_F_DEV_SHIFT) & DV_F_DEV_MASK)));
+    	device_set_flags(dev,
+			 ((device_get_flags(dev) & ~DV_F_DEV_MASK) |
+			  ((mss->bd_id << DV_F_DEV_SHIFT) & DV_F_DEV_MASK)));
     	return 0;
 no:
     	return ENXIO;
@@ -786,7 +787,7 @@ mss_doattach(device_t dev, struct mss_info *mss)
 {
     	snddev_info *d = device_get_softc(dev);
     	void *ih;
-    	int flags = isa_get_flags(dev);
+    	int flags = device_get_flags(dev);
     	char status[SND_STATUSLEN];
 
     	if (!mss_alloc_resources(mss, dev)) goto no;
@@ -863,7 +864,7 @@ static int
 mss_attach(device_t dev)
 {
     	struct mss_info *mss;
-    	int flags = isa_get_flags(dev);
+    	int flags = device_get_flags(dev);
 
     	mss = (struct mss_info *)malloc(sizeof *mss, M_DEVBUF, M_NOWAIT);
     	if (!mss) return ENXIO;
@@ -879,7 +880,7 @@ mss_attach(device_t dev)
     		         	 flags & DV_F_DRQ_MASK, 1);
 		mss->drq2_rid = 1;
     	}
-    	mss->bd_id = (isa_get_flags(dev) & DV_F_DEV_MASK) >> DV_F_DEV_SHIFT;
+    	mss->bd_id = (device_get_flags(dev) & DV_F_DEV_MASK) >> DV_F_DEV_SHIFT;
     	if (mss->bd_id == MD_YM0020) ymf_test(dev, mss);
     	return mss_doattach(dev, mss);
 }
diff --git a/sys/dev/pcm/isa/sb.c b/sys/dev/pcm/isa/sb.c
index e193ace29cf58..2c329d7549505 100644
--- a/sys/dev/pcm/isa/sb.c
+++ b/sys/dev/pcm/isa/sb.c
@@ -644,7 +644,7 @@ static int
 sb_attach(device_t dev)
 {
     	struct sb_info *sb;
-    	int flags = isa_get_flags(dev);
+    	int flags = device_get_flags(dev);
 
     	if (flags & DV_F_DUAL_DMA) {
         	ISA_SET_RESOURCE(device_get_parent(dev), dev, SYS_RES_DRQ, 1,
diff --git a/sys/dev/sound/isa/mss.c b/sys/dev/sound/isa/mss.c
index 13645d9debe30..ee5431295cccc 100644
--- a/sys/dev/sound/isa/mss.c
+++ b/sys/dev/sound/isa/mss.c
@@ -464,11 +464,11 @@ mss_probe(device_t dev)
     	if (!mss->io_base) goto no;
 
     	/* got irq/dma regs? */
-    	flags = isa_get_flags(dev);
+    	flags = device_get_flags(dev);
     	irq = isa_get_irq(dev);
     	drq = isa_get_drq(dev);
 
-    	if (!(isa_get_flags(dev) & DV_F_TRUE_MSS)) goto mss_probe_end;
+    	if (!(device_get_flags(dev) & DV_F_TRUE_MSS)) goto mss_probe_end;
 
     	/*
      	* Check if the IO port returns valid signature. The original MS
@@ -480,7 +480,7 @@ mss_probe(device_t dev)
     	tmpx = tmp = io_rd(mss, 3);
     	if (tmp == 0xff) {	/* Bus float */
 		BVDDB(printf("I/O addr inactive (%x), try pseudo_mss\n", tmp));
-		isa_set_flags(dev, flags & ~DV_F_TRUE_MSS);
+		device_set_flags(dev, flags & ~DV_F_TRUE_MSS);
 		goto mss_probe_end;
     	}
     	tmp &= 0x3f;
@@ -732,8 +732,9 @@ mss_detect(device_t dev, struct mss_info *mss)
 gotit:
     	BVDDB(printf("mss_detect() - Detected %s\n", name));
     	device_set_desc(dev, name);
-    	isa_set_flags(dev, ((isa_get_flags(dev) & ~DV_F_DEV_MASK) |
-		      ((mss->bd_id << DV_F_DEV_SHIFT) & DV_F_DEV_MASK)));
+    	device_set_flags(dev,
+			 ((device_get_flags(dev) & ~DV_F_DEV_MASK) |
+			  ((mss->bd_id << DV_F_DEV_SHIFT) & DV_F_DEV_MASK)));
     	return 0;
 no:
     	return ENXIO;
@@ -786,7 +787,7 @@ mss_doattach(device_t dev, struct mss_info *mss)
 {
     	snddev_info *d = device_get_softc(dev);
     	void *ih;
-    	int flags = isa_get_flags(dev);
+    	int flags = device_get_flags(dev);
     	char status[SND_STATUSLEN];
 
     	if (!mss_alloc_resources(mss, dev)) goto no;
@@ -863,7 +864,7 @@ static int
 mss_attach(device_t dev)
 {
     	struct mss_info *mss;
-    	int flags = isa_get_flags(dev);
+    	int flags = device_get_flags(dev);
 
     	mss = (struct mss_info *)malloc(sizeof *mss, M_DEVBUF, M_NOWAIT);
     	if (!mss) return ENXIO;
@@ -879,7 +880,7 @@ mss_attach(device_t dev)
     		         	 flags & DV_F_DRQ_MASK, 1);
 		mss->drq2_rid = 1;
     	}
-    	mss->bd_id = (isa_get_flags(dev) & DV_F_DEV_MASK) >> DV_F_DEV_SHIFT;
+    	mss->bd_id = (device_get_flags(dev) & DV_F_DEV_MASK) >> DV_F_DEV_SHIFT;
     	if (mss->bd_id == MD_YM0020) ymf_test(dev, mss);
     	return mss_doattach(dev, mss);
 }
diff --git a/sys/dev/sound/isa/sb.c b/sys/dev/sound/isa/sb.c
index e193ace29cf58..2c329d7549505 100644
--- a/sys/dev/sound/isa/sb.c
+++ b/sys/dev/sound/isa/sb.c
@@ -644,7 +644,7 @@ static int
 sb_attach(device_t dev)
 {
     	struct sb_info *sb;
-    	int flags = isa_get_flags(dev);
+    	int flags = device_get_flags(dev);
 
     	if (flags & DV_F_DUAL_DMA) {
         	ISA_SET_RESOURCE(device_get_parent(dev), dev, SYS_RES_DRQ, 1,
diff --git a/sys/dev/sound/isa/sb16.c b/sys/dev/sound/isa/sb16.c
index e193ace29cf58..2c329d7549505 100644
--- a/sys/dev/sound/isa/sb16.c
+++ b/sys/dev/sound/isa/sb16.c
@@ -644,7 +644,7 @@ static int
 sb_attach(device_t dev)
 {
     	struct sb_info *sb;
-    	int flags = isa_get_flags(dev);
+    	int flags = device_get_flags(dev);
 
     	if (flags & DV_F_DUAL_DMA) {
         	ISA_SET_RESOURCE(device_get_parent(dev), dev, SYS_RES_DRQ, 1,
diff --git a/sys/dev/sound/isa/sb8.c b/sys/dev/sound/isa/sb8.c
index e193ace29cf58..2c329d7549505 100644
--- a/sys/dev/sound/isa/sb8.c
+++ b/sys/dev/sound/isa/sb8.c
@@ -644,7 +644,7 @@ static int
 sb_attach(device_t dev)
 {
     	struct sb_info *sb;
-    	int flags = isa_get_flags(dev);
+    	int flags = device_get_flags(dev);
 
     	if (flags & DV_F_DUAL_DMA) {
         	ISA_SET_RESOURCE(device_get_parent(dev), dev, SYS_RES_DRQ, 1,