PERFORCE change 42625 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=42625

Change 42625 by peter at peter_freefall on 2003/11/16 21:42:30

	argh! you are lost in a maze of twisty cut/pasted code, all
	nearly identical

Affected files ...

.. //depot/projects/hammer/sys/alpha/alpha/interrupt.c#9 edit
.. //depot/projects/hammer/sys/alpha/include/intr.h#5 edit
.. //depot/projects/hammer/sys/alpha/mcbus/mcpcia.c#8 edit

Differences ...

==== //depot/projects/hammer/sys/alpha/alpha/interrupt.c#9 (text+ko) ====

@@ -348,7 +348,7 @@
 int
 alpha_setup_intr(const char *name, uintptr_t vector, driver_intr_t handler, void *arg,
 		 enum intr_type flags, void **cookiep, volatile long *cntp,
-    		 void (*disable)(void *), void (*enable)(void *))
+    		 void (*disable)(uintptr_t), void (*enable)(uintptr_t))
 {
 	int h = HASHVEC(vector);
 	struct alpha_intr *i;

==== //depot/projects/hammer/sys/alpha/include/intr.h#5 (text+ko) ====

@@ -31,9 +31,10 @@
 
 extern struct mtx icu_lock;
 
-int	alpha_setup_intr(const char *name, uintptr_t vector, driver_intr_t handler,
-	    void *arg, enum intr_type flags, void **cookiep,
-	    volatile long *cntp, void (*disable)(void *), void (*enable)(void *));
+int	alpha_setup_intr(const char *name, uintptr_t vector,
+	    driver_intr_t handler, void *arg, enum intr_type flags,
+	    void **cookiep, volatile long *cntp,
+	    void (*disable)(uintptr_t), void (*enable)(uintptr_t));
 int	alpha_teardown_intr(void *cookie);
 void	alpha_dispatch_intr(void *frame, unsigned long vector);
 

==== //depot/projects/hammer/sys/alpha/mcbus/mcpcia.c#8 (text+ko) ====

@@ -310,7 +310,7 @@
 	struct mcpcia_softc *sc = mcpcia_root;
 
 	if (vector < MCPCIA_VEC_PCI) {
-		printf("EISA disable (0x%x)\n", vector);
+		printf("EISA disable (0x%lx)\n", vector);
 		return;
 	}
 
@@ -324,7 +324,7 @@
 		tmp &= (MCPCIA_VECWIDTH_PER_MCPCIA - 1);
 		slot = tmp / MCPCIA_VECWIDTH_PER_SLOT;
 		if (slot < 2 || slot > 5) {
-			printf("Bad slot (%d) for vector %x\n", slot, vector);
+			printf("Bad slot (%d) for vector %lx\n", slot, vector);
 			return;
 		}
 		tmp -= (2 * MCPCIA_VECWIDTH_PER_SLOT);
@@ -338,7 +338,7 @@
 		sc = sc->next;
 	}
 	if (sc == NULL) {
-		panic("couldn't find MCPCIA softc for vector 0x%x", vector);
+		panic("couldn't find MCPCIA softc for vector 0x%lx", vector);
 	}
 	mtx_lock_spin(&icu_lock);
 	mcpcia_disable_intr(sc, irq);
@@ -352,7 +352,7 @@
 	struct mcpcia_softc *sc = mcpcia_root;
 
 	if (vector < MCPCIA_VEC_PCI) {
-		printf("EISA ensable (0x%x)\n", vector);
+		printf("EISA ensable (0x%lx)\n", vector);
 		return;
 	}
 
@@ -366,7 +366,7 @@
 		tmp &= (MCPCIA_VECWIDTH_PER_MCPCIA - 1);
 		slot = tmp / MCPCIA_VECWIDTH_PER_SLOT;
 		if (slot < 2 || slot > 5) {
-			printf("Bad slot (%d) for vector %x\n", slot, vector);
+			printf("Bad slot (%d) for vector %lx\n", slot, vector);
 			return;
 		}
 		tmp -= (2 * MCPCIA_VECWIDTH_PER_SLOT);
@@ -380,7 +380,7 @@
 		sc = sc->next;
 	}
 	if (sc == NULL) {
-		panic("couldn't find MCPCIA softc for vector 0x%x", vector);
+		panic("couldn't find MCPCIA softc for vector 0x%lx", vector);
 	}
 	mtx_lock_spin(&icu_lock);
 	mcpcia_enable_intr(sc, irq);