From owner-svn-src-head@FreeBSD.ORG Sat Apr 4 22:03:20 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 45C921065672; Sat, 4 Apr 2009 22:03:20 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 190B98FC13; Sat, 4 Apr 2009 22:03:20 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n34M3JDl082221; Sat, 4 Apr 2009 22:03:19 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n34M3JaH082220; Sat, 4 Apr 2009 22:03:19 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <200904042203.n34M3JaH082220@svn.freebsd.org> From: Marcel Moolenaar Date: Sat, 4 Apr 2009 22:03:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r190702 - head/sys/powerpc/include X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Apr 2009 22:03:20 -0000 Author: marcel Date: Sat Apr 4 22:03:19 2009 New Revision: 190702 URL: http://svn.freebsd.org/changeset/base/190702 Log: First round of cleanups. There's a lot of NetBSDism in this header. Modified: head/sys/powerpc/include/intr.h Modified: head/sys/powerpc/include/intr.h ============================================================================== --- head/sys/powerpc/include/intr.h Sat Apr 4 22:01:43 2009 (r190701) +++ head/sys/powerpc/include/intr.h Sat Apr 4 22:03:19 2009 (r190702) @@ -63,48 +63,11 @@ #ifndef LOCORE -#if 0 -/* - * Interrupt handler chains. intr_establish() inserts a handler into - * the list. The handler is called with its (single) argument. - */ -struct intrhand { - int (*ih_fun)(void *); - void *ih_arg; - u_long ih_count; - struct intrhand *ih_next; - int ih_level; - int ih_irq; -}; -#endif - -void setsoftclock(void); -void clearsoftclock(void); -void setsoftnet(void); -void clearsoftnet(void); - void do_pending_int(void); -static __inline void softintr(int); - extern u_int cpl, ipending, tickspending; extern int imask[]; -/* Following code should be implemented with lwarx/stwcx to avoid - * the disable/enable. i need to read the manual once more.... */ -static __inline void -softintr(int ipl) -{ - unsigned int msrsave; - - msrsave = mfmsr(); - mtmsr(msrsave & ~PSL_EE); - - ipending |= 1 << ipl; - - mtmsr(msrsave); -} - #define ICU_LEN 64 /* Soft interrupt masks. */ @@ -113,46 +76,6 @@ softintr(int ipl) #define SIR_SERIAL 30 #define SPL_CLOCK 31 -#if 0 - -/* - * Hardware interrupt masks - */ - -#define splbio() splraise(imask[IPL_BIO]) -#define splnet() splraise(imask[IPL_NET]) -#define spltty() splraise(imask[IPL_TTY]) -#define splaudio() splraise(imask[IPL_AUDIO]) -#define splclock() splraise(imask[IPL_CLOCK]) -#define splstatclock() splclock() -#define splserial() splraise(imask[IPL_SERIAL]) - -#define spllpt() spltty() - -/* - * Software interrupt masks - * - * NOTE: splsoftclock() is used by hardclock() to lower the priority from - * clock to softclock before it calls softclock(). - */ -#define spllowersoftclock() spllower(imask[IPL_SOFTCLOCK]) -#define splsoftclock() splraise(imask[IPL_SOFTCLOCK]) -#define splsoftnet() splraise(imask[IPL_SOFTNET]) -#define splsoftserial() splraise(imask[IPL_SOFTSERIAL]) - -/* - * Miscellaneous - */ -#define splimp() splraise(imask[IPL_IMP]) -#define splhigh() splraise(imask[IPL_HIGH]) -#define spl0() spllower(0) - -#endif /* 0 */ - -#define setsoftclock() softintr(SIR_CLOCK) -#define setsoftnet() softintr(SIR_NET) -#define setsoftserial() softintr(SIR_SERIAL) - #define CNT_IRQ0 0 #define CNT_CLOCK 64 #define CNT_SOFTCLOCK 65