patch-2.3.38 linux/drivers/pnp/isapnp.c

• Lines: 230
• Date: Fri Jan 7 14:09:34 2000
• Orig file: v2.3.37/linux/drivers/pnp/isapnp.c
• Orig date: Thu Jan 6 12:57:47 2000

diff -u --recursive --new-file v2.3.37/linux/drivers/pnp/isapnp.c linux/drivers/pnp/isapnp.c
@@ -17,6 +17,9 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
+ *  Changelog:
+ *  2000-01-01	Added ISAPnP quirks handling
+ *		Peter Denison <peterd@pnd-pc.demon.co.uk>
  */
 
 #include <linux/config.h>
@@ -42,6 +45,12 @@
 LIST_HEAD(isapnp_cards);
 LIST_HEAD(isapnp_devices);
 
+#define isapnp_for_each_card(card) \
+	for(card = pci_bus_b(isapnp_cards.next); card != pci_bus_b(&isapnp_cards); card = pci_bus_b(card->node.next))
+#define isapnp_for_each_dev(dev) \
+	for(dev = pci_dev_g(isapnp_devices.next); dev != pci_dev_g(&isapnp_devices); dev = pci_dev_g(dev->global_list.next))
+
+
 #ifdef CONFIG_PROC_FS
 #include "isapnp_proc.c"
 #endif
@@ -184,7 +193,7 @@
 	isapnp_write_byte(idx+3, val);
 }
 
-static void *isapnp_alloc(long size)
+void *isapnp_alloc(long size)
 {
 	void *result;
 
@@ -964,6 +973,7 @@
 	int csn;
 	unsigned char header[9], checksum;
 	struct pci_bus *card;
+	struct pci_dev *dev;
 
 	isapnp_wait();
 	isapnp_key();
@@ -993,6 +1003,9 @@
 
 		list_add_tail(&card->node, &isapnp_cards);
 	}
+	isapnp_for_each_dev(dev) {
+		isapnp_fixup_device(dev);
+	}
 	return 0;
 }
 
@@ -1147,7 +1160,7 @@
 		list = from->node.next;
 
 	while (list != &isapnp_cards) {
-		struct pci_bus *card = list_entry(list, struct pci_bus, node);
+		struct pci_bus *card = pci_bus_b(list);
 		if (card->vendor == vendor && card->device == device)
 			return card;
 		list = list->next;
@@ -1169,7 +1182,7 @@
 
 		while (list != &isapnp_devices) {
 			int idx;
-			struct pci_dev *dev = list_entry(list, struct pci_dev, global_list);
+			struct pci_dev *dev = pci_dev_g(list);
 
 			if (dev->vendor == vendor && dev->device == function)
 				return dev;
@@ -1189,7 +1202,7 @@
 			return NULL;
 		while (list != &card->devices) {
 			int idx;
-			struct pci_dev *dev = list_entry(list, struct pci_dev, bus_list);
+			struct pci_dev *dev = pci_dev_b(list);
 
 			if (dev->vendor == vendor && dev->device == function)
 				return dev;
@@ -1437,7 +1450,7 @@
 {
 	int i, tmp, rport, rsize;
 	struct isapnp_port *xport;
-	struct list_head *list;
+	struct pci_dev *dev;
 
 	if (check_region(port, size))
 		return 1;
@@ -1450,8 +1463,7 @@
 			return 1;
 	}
 
-	for (list = isapnp_devices.next; list != &isapnp_devices ; list = list->next) {
-		struct pci_dev *dev = list_entry(list, struct pci_dev, global_list);
+	isapnp_for_each_dev(dev) {
 		if (dev->active) {
 			for (tmp = 0; tmp < 8; tmp++) {
 				if (dev->resource[tmp].flags) {
@@ -1540,7 +1552,7 @@
 static int isapnp_check_interrupt(struct isapnp_cfgtmp *cfg, int irq, int idx)
 {
 	int i;
-	struct list_head *list;
+	struct pci_dev *dev;
 
 	if (irq < 0 || irq > 15)
 		return 1;
@@ -1548,8 +1560,7 @@
 		if (isapnp_reserve_irq[i] == irq)
 			return 1;
 	}
-	for (list = isapnp_devices.next; list != &isapnp_devices; list = list->next) {
-		struct pci_dev *dev = list_entry(list, struct pci_dev, global_list);
+	isapnp_for_each_dev(dev) {
 		if (dev->active) {
 			if (dev->irq_resource[0].start == irq ||
 			    dev->irq_resource[1].start == irq)
@@ -1620,7 +1631,7 @@
 static int isapnp_check_dma(struct isapnp_cfgtmp *cfg, int dma, int idx)
 {
 	int i;
-	struct list_head *list;
+	struct pci_dev *dev;
 
 	if (dma < 0 || dma == 4 || dma > 7)
 		return 1;
@@ -1628,8 +1639,7 @@
 		if (isapnp_reserve_dma[i] == dma)
 			return 1;
 	}
-	for (list = isapnp_devices.next; list != &isapnp_devices ; list = list->next) {
-		struct pci_dev *dev = list_entry(list, struct pci_dev, global_list);
+	isapnp_for_each_dev(dev) {
 		if (dev->active) {
 			if (dev->dma_resource[0].start == dma || dev->dma_resource[1].start == dma)
 				return 1;
@@ -1695,7 +1705,7 @@
 	int i, tmp;
 	unsigned int raddr, rsize;
 	struct isapnp_mem *xmem;
-	struct list_head *list;
+	struct pci_dev *dev;
 
 	for (i = 0; i < 8; i++) {
 		raddr = (unsigned int)isapnp_reserve_mem[i << 1];
@@ -1707,8 +1717,7 @@
 		if (__check_region(&iomem_resource, addr, size))
 			return 1;
 	}
-	for (list = isapnp_devices.next; list != &isapnp_devices ; list = list->next) {
-		struct pci_dev *dev = list_entry(list, struct pci_dev, global_list);
+	isapnp_for_each_dev(dev) {
 		if (dev->active) {
 			for (tmp = 0; tmp < 4; tmp++) {
 				if (dev->resource[tmp].flags) {
@@ -1988,26 +1997,22 @@
 	}
 }
 
-static void isapnp_free_device(struct pci_dev *dev)
+static void isapnp_free_card(struct pci_bus *card)
 {
-	struct pci_dev *next;
-
-	while (dev) {
-		next = dev->sibling;
+	while (!list_empty(&card->devices)) {
+		struct list_head *list = card->devices.next;
+		struct pci_dev *dev = pci_dev_b(list);
+		list_del(list);
 		isapnp_free_resources((struct isapnp_resources *)dev->sysdata, 0);
 		kfree(dev);
-		dev = next;
 	}
+	kfree(card);
 }
 
 #endif /* MODULE */
 
 static void isapnp_free_all_resources(void)
 {
-#ifdef MODULE
-	struct pci_bus *card, *cardnext;
-#endif
-
 #ifdef ISAPNP_REGION_OK
 	release_resource(pidxr_res);
 #endif
@@ -2015,10 +2020,10 @@
 	if (isapnp_rdp >= 0x203 && isapnp_rdp <= 0x3ff)
 		release_resource(isapnp_rdp_res);
 #ifdef MODULE
-	for (card = isapnp_cards; card; card = cardnext) {
-		cardnext = card->next;
-		isapnp_free_device(card->devices);
-		kfree(card);
+	while (!list_empty(&isapnp_cards)) {
+		struct list_head *list = isapnp_cards.next;
+		list_del(list);
+		isapnp_free_card(pci_bus_b(list));
 	}
 #ifdef CONFIG_PROC_FS
 	isapnp_proc_done();
@@ -2085,7 +2090,7 @@
 int __init isapnp_init(void)
 {
 	int cards;
-	struct list_head *list;
+	struct pci_bus *card;
 
 	if (isapnp_disable) {
 		isapnp_detected = 0;
@@ -2135,9 +2140,7 @@
 	isapnp_build_device_list();
 	cards = 0;
 
-	for (list = isapnp_cards.next; list != &isapnp_cards; list=list->next) {
-		struct pci_bus *card = list_entry(list, struct pci_bus, node);
-
+	isapnp_for_each_card(card) {
 		cards++;
 		if (isapnp_verbose) {
 			struct list_head *devlist;
@@ -2145,7 +2148,7 @@
 			if (isapnp_verbose < 2)
 				continue;
 			for (devlist = card->devices.next; devlist != &card->devices; devlist = devlist->next) {
-				struct pci_dev *dev = list_entry(list, struct pci_dev, bus_list);
+				struct pci_dev *dev = pci_dev_b(devlist);
 				printk("isapnp:   Device '%s'\n", dev->name[0]?card->name:"Unknown");
 			}
 		}