From owner-p4-projects@FreeBSD.ORG Mon Mar 24 21:24:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E5351065671; Mon, 24 Mar 2008 21:24:06 +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 E83ED106566B for ; Mon, 24 Mar 2008 21:24:05 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from speedfactory.net (mail.speedfactory.net [66.23.216.219]) by mx1.freebsd.org (Postfix) with ESMTP id 74C9D8FC13 for ; Mon, 24 Mar 2008 21:24:04 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (unverified [66.23.211.162]) by speedfactory.net (SurgeMail 3.8s) with ESMTP id 236605004-1834499 for multiple; Mon, 24 Mar 2008 17:25:26 -0400 Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.14.2/8.14.2) with ESMTP id m2OLNrAd066408; Mon, 24 Mar 2008 17:23:54 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Oleksandr Tymoshenko Date: Mon, 24 Mar 2008 16:03:09 -0400 User-Agent: KMail/1.9.7 References: <200803241417.m2OEHVLp083423@repoman.freebsd.org> In-Reply-To: <200803241417.m2OEHVLp083423@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200803241603.09252.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Mon, 24 Mar 2008 17:23:54 -0400 (EDT) X-Virus-Scanned: ClamAV 0.91.2/6377/Mon Mar 24 17:15:18 2008 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 138427 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: Mon, 24 Mar 2008 21:24:06 -0000 On Monday 24 March 2008 10:17:31 am Oleksandr Tymoshenko wrote: > http://perforce.freebsd.org/chv.cgi?CH=138427 > > Change 138427 by gonzo@gonzo_jeeves on 2008/03/24 14:17:07 > > o Provide bogus mips_mask_irq/mips_unmask_irq functions > o Fix intr_event_create calls to conform new API, use > mips_mask_irq/mips_unmask_irq as arguments. You shouldn't need an EOI routine at all. That is a bug in the current arm code. > Affected files ... > > .. //depot/projects/mips2-jnpr/src/sys/mips/include/intr.h#6 edit > .. //depot/projects/mips2-jnpr/src/sys/mips/mips/intr_machdep.c#8 edit > .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/malta/gt_pci.c#3 edit > > Differences ... > > ==== //depot/projects/mips2-jnpr/src/sys/mips/include/intr.h#6 (text+ko) ==== > > @@ -73,6 +73,11 @@ > > extern struct mips_intr_handler intr_handlers[]; > > +typedef void (*mask_fn)(void *); > + > +void mips_mask_irq(void); > +void mips_unmask_irq(void); > + > struct trapframe; > void mips_set_intr(int pri, uint32_t mask, > uint32_t (*int_hand)(uint32_t, struct trapframe *)); > > ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/intr_machdep.c#8 (text+ko) ==== > > @@ -53,6 +53,20 @@ > static int last_printed = 0; > #endif > > +void > +mips_mask_irq(void) > +{ > + > + printf("Unimplemented: %s\n", __func__); > +} > + > +void > +mips_unmask_irq(void) > +{ > + > + printf("Unimplemented: %s\n", __func__); > +} > + > void > cpu_establish_hardintr(const char *name, driver_filter_t *filt, > void (*handler)(void*), void *arg, int irq, int flags, > @@ -71,7 +85,8 @@ > event = hardintr_events[irq]; > if (event == NULL) { > error = intr_event_create(&event, (void *)irq, 0, > - (void (*)(void *))NULL, "hard intr%d:", irq); > + (mask_fn)mips_mask_irq, (mask_fn)mips_unmask_irq, > + (mask_fn)mips_unmask_irq, NULL, "hard intr%d:", irq); > if (error) > return; > hardintr_events[irq] = event; > @@ -108,7 +123,8 @@ > event = softintr_events[irq]; > if (event == NULL) { > error = intr_event_create(&event, (void *)irq, 0, > - (void (*)(void *))NULL, "intr%d:", irq); > + (mask_fn)mips_mask_irq, (mask_fn)mips_unmask_irq, > + (mask_fn)mips_unmask_irq, NULL, "intr%d:", irq); > if (error) > return; > softintr_events[irq] = event; > > ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/malta/gt_pci.c#3 (text+ko) ==== > > @@ -657,8 +657,9 @@ > > event = sc->sc_eventstab[irq]; > if (event == NULL) { > - error = intr_event_create(&event, (void *)irq, 0, > - (void (*)(void *))NULL, "gt_pci intr%d:", irq); > + error = intr_event_create(&event, (void *)irq, 0, > + (mask_fn)mips_mask_irq, (mask_fn)mips_unmask_irq, > + (mask_fn)mips_unmask_irq, NULL, "gt_pci intr%d:", irq); > if (error) > return 0; > sc->sc_eventstab[irq] = event; > -- John Baldwin