PERFORCE change 42599 for review

[Peter Wemm]

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

Change 42599 by peter at peter_overcee on 2003/11/16 16:37:00

	take a stab at updating for the ithread_create api on powerpc

Affected files ...

.. //depot/projects/hammer/sys/powerpc/include/intr_machdep.h#3 edit
.. //depot/projects/hammer/sys/powerpc/powermac/hrowpic.c#2 edit
.. //depot/projects/hammer/sys/powerpc/powerpc/intr_machdep.c#3 edit
.. //depot/projects/hammer/sys/powerpc/powerpc/openpic.c#4 edit

Differences ...

==== //depot/projects/hammer/sys/powerpc/include/intr_machdep.h#3 (text+ko) ====

@@ -40,7 +40,7 @@
 	u_int		ih_flags;
 };
 
-void	intr_init(void (*)(void), int, void (*)(int), void (*)(int));
+void	intr_init(void (*)(void), int, void (*)(void *), void (*)(void *));
 void	intr_setup(u_int, ih_func_t *, void *, u_int);
 int	inthand_add(const char *, u_int, void (*)(void *), void *, int,
 	    void **);

==== //depot/projects/hammer/sys/powerpc/powermac/hrowpic.c#2 (text+ko) ====

@@ -94,8 +94,8 @@
  * Local routines
  */
 static void	hrowpic_intr(void);
-static void	hrowpic_ext_enable_irq(int);
-static void	hrowpic_ext_disable_irq(int);
+static void	hrowpic_ext_enable_irq(void *);
+static void	hrowpic_ext_disable_irq(void *);
 static void	hrowpic_toggle_irq(struct hrowpic_softc *sc, int, int);
 
 /*
@@ -375,14 +375,18 @@
 }
 
 static void
-hrowpic_ext_enable_irq(int irq)
+hrowpic_ext_enable_irq(void *cookie)
 {
+	int irq = (uintptr_t)cookie;
+
 	hrowpic_toggle_irq(hpicsoftc, irq, 1);
 }
 
 static void
-hrowpic_ext_disable_irq(int irq)
+hrowpic_ext_disable_irq(void *cookie)
 {
+	int irq = (uintptr_t)cookie;
+
 	hrowpic_toggle_irq(hpicsoftc, irq, 0);
 }
 

==== //depot/projects/hammer/sys/powerpc/powerpc/intr_machdep.c#3 (text+ko) ====

@@ -99,12 +99,12 @@
 static ih_func_t	intr_stray_handler;
 static ih_func_t	sched_ithd;
 
-static void		(*irq_enable)(int);
-static void		(*irq_disable)(int);
+static void		(*irq_enable)(void *);
+static void		(*irq_disable)(void *);
 
 void
-intr_init(void (*handler)(void), int nirq, void (*irq_e)(int),
-    void (*irq_d)(int))
+intr_init(void (*handler)(void), int nirq, void (*irq_e)(void *),
+    void (*irq_d)(void *))
 {
 	int		i;
 	u_int32_t	msr;
@@ -247,7 +247,7 @@
 
 	intr_handlers[irq].ih_func(intr_handlers[irq].ih_arg);
 	if ((intr_handlers[irq].ih_flags & INTR_FAST) != 0)
-		irq_enable(irq);
+		irq_enable((void *)(uintptr_t)irq);
 }
 
 static void

==== //depot/projects/hammer/sys/powerpc/powerpc/openpic.c#4 (text+ko) ====

@@ -85,8 +85,8 @@
 static void		openpic_disable_irq(struct openpic_softc *, int);
 static void		openpic_set_priority(struct openpic_softc *, int, int);
 static void		openpic_intr(void);
-static void		irq_enable(int);
-static void		irq_disable(int);
+static void		irq_enable(void *);
+static void		irq_disable(void *);
 
 /*
  * Driver methods.
@@ -476,15 +476,17 @@
 }
 
 static void
-irq_enable(int irq)
+irq_enable(void *cookie)
 {
+	int irq = (uintptr_t)cookie;
 
 	openpic_enable_irq(softc, irq, IST_LEVEL);
 }
 
 static void
-irq_disable(int irq)
+irq_disable(void *cookie)
 {
+	int irq = (uintptr_t)cookie;
 
 	openpic_disable_irq(softc, irq);
 }