PERFORCE change 132536 for review
Oleksandr Tymoshenko
gonzo at FreeBSD.org
Fri Jan 4 15:29:24 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=132536
Change 132536 by gonzo at gonzo_jeeves on 2008/01/04 23:29:15
o Get rid of intrmask_t, use uint32_t instead. intrmask_t seems
to be obsolete type and confuses userland pieces that try
to access kernelland strucutures like kdump/fstat/...
o Replace u_int32_t with uint32_t
Approved by: bsdimp
Affected files ...
.. //depot/projects/mips2-jnpr/src/sys/mips/include/clock.h#6 edit
.. //depot/projects/mips2-jnpr/src/sys/mips/include/intr.h#5 edit
.. //depot/projects/mips2-jnpr/src/sys/mips/mips/interrupt.c#5 edit
Differences ...
==== //depot/projects/mips2-jnpr/src/sys/mips/include/clock.h#6 (text+ko) ====
@@ -30,7 +30,7 @@
/* Standard MIPS Processors - count runs at 1/2 of the CPU pipeline frequency */
#define MIPS_COUNT_DIVIDER 2
-extern intrmask_t clockintr(intrmask_t, struct clockframe *);
+extern uint32_t clockintr(uint32_t, struct clockframe *);
#define wall_cmos_clock 0
#define adjkerntz 0
==== //depot/projects/mips2-jnpr/src/sys/mips/include/intr.h#5 (text+ko) ====
@@ -53,8 +53,8 @@
#define INTRCNT_PE 3 /* irq 4 */
#define INTRCNT_PICNIC 4 /* irq 5 */
-extern intrmask_t idle_mask;
-extern void (*mips_ack_interrupt)(int, intrmask_t);
+extern uint32_t idle_mask;
+extern void (*mips_ack_interrupt)(int, uint32_t);
typedef int ih_func_t(void *);
@@ -74,9 +74,9 @@
extern struct mips_intr_handler intr_handlers[];
struct trapframe;
-void mips_set_intr(int pri, intrmask_t mask,
- intrmask_t (*int_hand)(intrmask_t, struct trapframe *));
-intrmask_t mips_handle_interrupts(intrmask_t pending, struct trapframe *cf);
+void mips_set_intr(int pri, uint32_t mask,
+ uint32_t (*int_hand)(uint32_t, struct trapframe *));
+uint32_t mips_handle_interrupts(uint32_t pending, struct trapframe *cf);
void intr_enable_source(uintptr_t irq);
struct trapframe * mips_get_trapframe(void *ih_arg);
int inthand_add(const char *name, u_int irq, void (*handler)(void *),
==== //depot/projects/mips2-jnpr/src/sys/mips/mips/interrupt.c#5 (text+ko) ====
@@ -70,8 +70,8 @@
#include <machine/archtype.h>
#include <machine/asm.h>
-intrmask_t idle_mask;
-void (*mips_ack_interrupt)(int, intrmask_t);
+uint32_t idle_mask;
+void (*mips_ack_interrupt)(int, uint32_t);
struct mips_intr_handler intr_handlers[16];
/*
@@ -123,7 +123,7 @@
mips_interrupt(struct trapframe *trapframe)
{
struct thread *td = curthread;
- u_int32_t cause, pending;
+ uint32_t cause, pending;
/*
* Paranoic? Perhaps. But if we got here with the enable
@@ -299,11 +299,11 @@
/*
* Process interrupts. The parameter pending has non-masked interrupts.
*/
-intrmask_t
-mips_handle_interrupts (intrmask_t pending, struct trapframe *cf)
+uint32_t
+mips_handle_interrupts (uint32_t pending, struct trapframe *cf)
{
struct mips_intr_handler *ih;
- intrmask_t catched, vm;
+ uint32_t catched, vm;
volatile long *ih_count;
int v;
/*
@@ -368,11 +368,11 @@
/*
* spllower case : turning on additional INT bits
*/
-u_int32_t
-updateimask(intrmask_t newcpl)
+uint32_t
+updateimask(uint32_t newcpl)
{
- intrmask_t tmp_cpl;
- u_int32_t tmp_reg;
+ uint32_t tmp_cpl;
+ uint32_t tmp_reg;
unsigned int ic_reg, new_ic_reg;
unsigned int sr_reg, new_sr_reg;
@@ -396,11 +396,11 @@
/*
* splraise case
*/
-u_int32_t
-raiseimask(intrmask_t newcpl)
+uint32_t
+raiseimask(uint32_t newcpl)
{
- intrmask_t tmp_cpl;
- u_int32_t tmp_reg, tmp2, tmp3;
+ uint32_t tmp_cpl;
+ uint32_t tmp_reg, tmp2, tmp3;
unsigned int ic_reg;
unsigned int sr_reg;
More information about the p4-projects
mailing list