patch-2.3.15 linux/include/linux/isapnp.h

• Lines: 69
• Date: Mon Aug 23 14:49:40 1999
• Orig file: v2.3.14/linux/include/linux/isapnp.h
• Orig date: Wed Aug 18 16:44:31 1999

diff -u --recursive --new-file v2.3.14/linux/include/linux/isapnp.h linux/include/linux/isapnp.h
@@ -63,23 +63,23 @@
 	unsigned short max;		/* max base number */
 	unsigned char align;		/* align boundary */
 	unsigned char size;		/* size of range */
-	unsigned short flags;		/* port flags */
+	unsigned char flags;		/* port flags */
+	unsigned char pad;		/* pad */
 	struct isapnp_resources *res;	/* parent */
 	struct isapnp_port *next;	/* next port */
 };
 
 struct isapnp_irq {
 	unsigned short map;		/* bitmaks for IRQ lines */
-	unsigned short flags;		/* IRQ flags */
+	unsigned char flags;		/* IRQ flags */
+	unsigned char pad;		/* pad */
 	struct isapnp_resources *res;	/* parent */
 	struct isapnp_irq *next;	/* next IRQ */
 };
 
 struct isapnp_dma {
 	unsigned char map;		/* bitmask for DMA channels */
-	unsigned char type;		/* DMA type */
 	unsigned char flags;		/* DMA flags */
-	unsigned char speed;		/* DMA speed */
 	struct isapnp_resources *res;	/* parent */
 	struct isapnp_dma *next;	/* next port */
 };
@@ -89,8 +89,8 @@
 	unsigned int max;		/* max base number */
 	unsigned int align;		/* align boundary */
 	unsigned int size;		/* size of range */
-	unsigned short flags;		/* memory flags */
-	unsigned short type;		/* memory type */
+	unsigned char flags;		/* memory flags */
+	unsigned char pad;		/* pad */
 	struct isapnp_resources *res;	/* parent */
 	struct isapnp_mem *next;	/* next memory resource */
 };
@@ -120,7 +120,7 @@
 	struct isapnp_resources *next;	/* next resource */
 };
 
-#ifdef CONFIG_ISAPNP
+#if defined(CONFIG_ISAPNP) || (defined(CONFIG_ISAPNP_MODULE) && defined(MODULE))
 
 /* lowlevel configuration */
 int isapnp_present(void);
@@ -144,6 +144,10 @@
 				unsigned short vendor,
 				unsigned short function,
 				struct pci_dev *from);
+/* misc */
+void isapnp_resource_change(struct resource *resource,
+			    unsigned long start,
+			    unsigned long size);
 /* init/main.c */
 int isapnp_init(void);
 
@@ -171,6 +175,9 @@
 				       unsigned short vendor,
 				       unsigned short function,
 				       struct pci_dev *from) { return NULL; }
+extern void isapnp_resource_change(struct resource *resource,
+				   unsigned long start,
+				   unsigned long size) { ; }
 
 #endif /* CONFIG_ISAPNP */