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

7 files changed, 9 insertions, 21 deletions

diff --git a/sys/isa/fd.c b/sys/isa/fd.c
index 1097933..ee74217 100644
--- a/sys/isa/fd.c
+++ b/sys/isa/fd.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/isa/isa_common.c b/sys/isa/isa_common.c
index c6e736c..1fbf7d1 100644
--- a/sys/isa/isa_common.c
+++ b/sys/isa/isa_common.c
@@ -497,7 +497,6 @@ isa_add_child(device_t dev, int order, const char *name, int unit)
 	bzero(idev, sizeof *idev);
 
 	resource_list_init(&idev->id_resources);
-	idev->id_flags = 0;
 	TAILQ_INIT(&idev->id_configs);
 
 	return device_add_child_ordered(dev, order, name, unit, idev);
@@ -541,15 +540,15 @@ isa_print_child(device_t bus, device_t dev)
 
 	retval += bus_print_child_header(bus, dev);
 
-	if (SLIST_FIRST(rl) || idev->id_flags)
+	if (SLIST_FIRST(rl) || device_get_flags(dev))
 		retval += printf(" at");
 	
 	isa_print_resources(rl, "port", SYS_RES_IOPORT, "%#lx");
 	isa_print_resources(rl, "iomem", SYS_RES_MEMORY, "%#lx");
 	isa_print_resources(rl, "irq", SYS_RES_IRQ, "%ld");
 	isa_print_resources(rl, "drq", SYS_RES_DRQ, "%ld");
-	if (idev->id_flags)
-		retval += printf(" flags %#x", idev->id_flags);
+	if (device_get_flags(dev))
+		retval += printf(" flags %#x", device_get_flags(dev));
 
 	retval += bus_print_child_footer(bus, dev);
 
@@ -660,10 +659,6 @@ isa_read_ivar(device_t bus, device_t dev, int index, uintptr_t * result)
 			*result = -1;
 		break;
 
-	case ISA_IVAR_FLAGS:
-		*result = idev->id_flags;
-		break;
-
 	case ISA_IVAR_VENDORID:
 		*result = idev->id_vendorid;
 		break;
@@ -708,10 +703,6 @@ isa_write_ivar(device_t bus, device_t dev,
 	case ISA_IVAR_DRQ_1:
 		return EINVAL;
 
-	case ISA_IVAR_FLAGS:
-		idev->id_flags = value;
-		break;
-
 	case ISA_IVAR_VENDORID:
 		idev->id_vendorid = value;
 		break;
diff --git a/sys/isa/isa_common.h b/sys/isa/isa_common.h
index 4a104fe..70b8b33 100644
--- a/sys/isa/isa_common.h
+++ b/sys/isa/isa_common.h
@@ -50,7 +50,6 @@ struct isa_config_entry {
  */
 struct isa_device {
 	struct resource_list	id_resources;
-	int			id_flags;
 	u_int32_t		id_vendorid; /* pnp vendor id */
 	u_int32_t		id_serial; /* pnp serial */
 	u_int32_t		id_logicalid; /* pnp logical device id */
diff --git a/sys/isa/isahint.c b/sys/isa/isahint.c
index 9bb333f..a8a5c8f 100644
--- a/sys/isa/isahint.c
+++ b/sys/isa/isahint.c
@@ -76,7 +76,7 @@ isahint_add_device(device_t parent, const char *name, int unit)
 		ISA_SET_RESOURCE(parent, child, SYS_RES_DRQ, 0, start, 1);
 
 	if (resource_int_value(name, unit, "flags", &t) == 0)
-		isa_set_flags(child, t);
+		device_set_flags(child, t);
 
 	if (resource_int_value(name, unit, "disabled", &t) == 0 && t != 0)
 		device_disable(child);
diff --git a/sys/isa/isavar.h b/sys/isa/isavar.h
index 7f912e5..5340b83 100644
--- a/sys/isa/isavar.h
+++ b/sys/isa/isavar.h
@@ -100,7 +100,6 @@ enum isa_device_ivars {
 	ISA_IVAR_MSIZE,
 	ISA_IVAR_MSIZE_0 = ISA_IVAR_MSIZE,
 	ISA_IVAR_MSIZE_1,
-	ISA_IVAR_FLAGS,
 	ISA_IVAR_IRQ,
 	ISA_IVAR_IRQ_0 = ISA_IVAR_IRQ,
 	ISA_IVAR_IRQ_1,
@@ -137,7 +136,6 @@ ISA_ACCESSOR(irq, IRQ, int)
 ISA_ACCESSOR(drq, DRQ, int)
 ISA_ACCESSOR(maddr, MADDR, int)
 ISA_ACCESSOR(msize, MSIZE, int)
-ISA_ACCESSOR(flags, FLAGS, int)
 ISA_ACCESSOR(vendorid, VENDORID, int)
 ISA_ACCESSOR(serial, SERIAL, int)
 ISA_ACCESSOR(logicalid, LOGICALID, int)
diff --git a/sys/isa/syscons_isa.c b/sys/isa/syscons_isa.c
index 2f8111d..dc0bb6f 100644
--- a/sys/isa/syscons_isa.c
+++ b/sys/isa/syscons_isa.c
@@ -92,13 +92,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/isa/vga_isa.c b/sys/isa/vga_isa.c
index decd080..95cc1b1 100644
--- a/sys/isa/vga_isa.c
+++ b/sys/isa/vga_isa.c
@@ -126,7 +126,7 @@ isavga_probe(device_t dev)
 		return (ENXIO);
 
 	device_set_desc(dev, "Generic ISA VGA");
-	error = vga_probe_unit(device_get_unit(dev), &adp, isa_get_flags(dev));
+	error = vga_probe_unit(device_get_unit(dev), &adp, device_get_flags(dev));
 	if (error == 0) {
 		bus = device_get_parent(dev);
 		ISA_SET_RESOURCE(bus, dev, SYS_RES_IOPORT, 0,
@@ -163,7 +163,7 @@ isavga_attach(device_t dev)
 	mem = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid,
 				 0, ~0, 0, RF_ACTIVE | RF_SHAREABLE);
 
-	error = vga_attach_unit(unit, sc, isa_get_flags(dev));
+	error = vga_attach_unit(unit, sc, device_get_flags(dev));
 	if (error)
 		return error;