From owner-svn-src-projects@FreeBSD.ORG Sun Dec 21 16:49:43 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7658FA97; Sun, 21 Dec 2014 16:49:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 62BB431F5; Sun, 21 Dec 2014 16:49:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBLGnhhs025033; Sun, 21 Dec 2014 16:49:43 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBLGnh0U025032; Sun, 21 Dec 2014 16:49:43 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201412211649.sBLGnh0U025032@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Sun, 21 Dec 2014 16:49:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r276022 - projects/arm_intrng/sys/arm/ti X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Dec 2014 16:49:43 -0000 Author: andrew Date: Sun Dec 21 16:49:42 2014 New Revision: 276022 URL: https://svnweb.freebsd.org/changeset/base/276022 Log: Add proper guards to the read/write macros and fix a mismerge Modified: projects/arm_intrng/sys/arm/ti/aintc.c Modified: projects/arm_intrng/sys/arm/ti/aintc.c ============================================================================== --- projects/arm_intrng/sys/arm/ti/aintc.c Sun Dec 21 16:48:57 2014 (r276021) +++ projects/arm_intrng/sys/arm/ti/aintc.c Sun Dec 21 16:49:42 2014 (r276022) @@ -73,10 +73,10 @@ static struct resource_spec ti_aintc_spe { -1, 0 } }; -#define aintc_read_4(_sc,reg) \ - bus_space_read_4(_sc->aintc_bst, _sc->aintc_bsh, (reg)) +#define aintc_read_4(_sc, reg) \ + bus_space_read_4((_sc)->aintc_bst, (_sc)->aintc_bsh, (reg)) #define aintc_write_4(_sc, reg, val) \ - bus_space_write_4(_sc->aintc_bst, _sc->aintc_bsh, (reg), (val)) + bus_space_write_4((_sc)->aintc_bst, (_sc)->aintc_bsh, (reg), (val)) static int ti_aintc_probe(device_t); static int ti_aintc_attach(device_t); @@ -191,6 +191,7 @@ ti_aintc_unmask(device_t dev, int irq) aintc_write_4(sc, INTC_MIR_CLEAR(irq >> 5), (1UL << (irq & 0x1F))); arm_irq_memory_barrier(nb); +} static void ti_aintc_eoi(device_t dev, int irq) @@ -201,6 +202,3 @@ ti_aintc_eoi(device_t dev, int irq) 1UL << (irq & 0x1F)); aintc_write_4(sc, INTC_CONTROL,1); } - - aintc_write_4(INTC_MIR_CLEAR(nb >> 5), (1UL << (nb & 0x1F))); -}