From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11291 invoked by alias); 3 Dec 2008 09:47:16 -0000 Received: (qmail 11282 invoked by uid 22791); 3 Dec 2008 09:47:16 -0000 X-Spam-Level: * X-Spam-Status: No, hits=-2.8 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from lon1-post-2.mail.demon.net (HELO lon1-post-2.mail.demon.net) (195.173.77.149) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 03 Dec 2008 09:46:25 +0000 Received: from calivar.demon.co.uk ([83.104.54.243] helo=xl5.calivar.com) by lon1-post-2.mail.demon.net with esmtp (Exim 4.69) id 1L7oJK-00066p-bp for ecos-patches@ecos.sourceware.org; Wed, 03 Dec 2008 09:46:22 +0000 Received: from xl5.calivar.com (localhost [127.0.0.1]) by xl5.calivar.com (Postfix) with ESMTP id 5E8FD1386A9 for ; Wed, 3 Dec 2008 09:46:21 +0000 (GMT) To: ecos-patches@ecos.sourceware.org Subject: PC PCI interrupt translation fix From: Nick Garnett Original-Sender: nickg@ecoscentric.com Date: Wed, 03 Dec 2008 09:47:00 -0000 Message-ID: User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Mailing-List: contact ecos-patches-help@ecos.sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: ecos-patches-owner@ecos.sourceware.org X-SW-Source: 2008-12/txt/msg00014.txt.bz2 Propagate a patch from eCosCentric sources. Index: pcmb/current/ChangeLog =================================================================== RCS file: /cvs/ecos/ecos/packages/hal/i386/pcmb/current/ChangeLog,v retrieving revision 1.23 diff -u -5 -r1.23 ChangeLog --- pcmb/current/ChangeLog 27 Apr 2005 18:57:51 -0000 1.23 +++ pcmb/current/ChangeLog 2 Dec 2008 17:50:38 -0000 @@ -1,5 +1,10 @@ +2006-06-02 Nick Garnett + + * include/pcmb_io.h (HAL_PCI_TRANSLATE_INTERRUPT): Fixed PCI + interrupt vector translation. + 2005-04-27 David Vrabel * cdl/hal_i386_pcmb.cdl (CYGPKG_HAL_I386_PCMB_MEMSIZE): Moved this PC specific option to the pc package. Index: pcmb/current/include/pcmb_io.h =================================================================== RCS file: /cvs/ecos/ecos/packages/hal/i386/pcmb/current/include/pcmb_io.h,v retrieving revision 1.10 diff -u -5 -r1.10 pcmb_io.h --- pcmb/current/include/pcmb_io.h 20 Sep 2003 19:23:43 -0000 1.10 +++ pcmb/current/include/pcmb_io.h 2 Dec 2008 17:50:38 -0000 @@ -159,13 +159,13 @@ // INTC# or INTD#) to the associated CPU interrupt (i.e., HAL vector). #define HAL_PCI_TRANSLATE_INTERRUPT( __bus, __devfn, __vec, __valid) \ CYG_MACRO_START \ HAL_PCI_CFG_READ_UINT8((__bus),(__devfn),CYG_PCI_CFG_INT_LINE,(__vec)); \ - if(__vec<=15) __valid=1; \ + if(__vec<=15) __vec += 0x20, __valid=1; \ + else if( 0x20 <= __vec && __vec <= 0x30 ) __valid=1; \ else __valid=0; \ - __vec += 0x20; \ CYG_MACRO_END //----------------------------------------------------------------------------- // CMOS RAM access -- Nick Garnett eCos Kernel Architect eCosCentric Limited http://www.eCosCentric.com The eCos experts Barnwell House, Barnwell Drive, Cambridge, UK. Tel: +44 1223 245571 Registered in England and Wales: Reg No: 4422071