From owner-p4-projects@FreeBSD.ORG Fri Jan 4 23:29:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AB5D16A420; Fri, 4 Jan 2008 23:29:24 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5085116A417 for ; Fri, 4 Jan 2008 23:29:24 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3C60A13C45D for ; Fri, 4 Jan 2008 23:29:24 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m04NTNG4073333 for ; Fri, 4 Jan 2008 23:29:23 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m04NTN19073330 for perforce@freebsd.org; Fri, 4 Jan 2008 23:29:23 GMT (envelope-from gonzo@FreeBSD.org) Date: Fri, 4 Jan 2008 23:29:23 GMT Message-Id: <200801042329.m04NTN19073330@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 132536 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jan 2008 23:29:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=132536 Change 132536 by gonzo@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 #include -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;