From owner-svn-src-all@freebsd.org Sat Jan 2 18:32:21 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B9C79A5FA75; Sat, 2 Jan 2016 18:32:21 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 895BD1C4E; Sat, 2 Jan 2016 18:32:21 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u02IWKOU066404; Sat, 2 Jan 2016 18:32:20 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u02IWKQD066403; Sat, 2 Jan 2016 18:32:20 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201601021832.u02IWKQD066403@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Sat, 2 Jan 2016 18:32:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r293054 - head/sys/dev/ath X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Jan 2016 18:32:21 -0000 Author: adrian Date: Sat Jan 2 18:32:20 2016 New Revision: 293054 URL: https://svnweb.freebsd.org/changeset/base/293054 Log: ... and that would've never worked. Sorry! (Note: everything I tested on locally has ATH_DEBUG / AH_DEBUG set.) Modified: head/sys/dev/ath/ah_osdep.h Modified: head/sys/dev/ath/ah_osdep.h ============================================================================== --- head/sys/dev/ath/ah_osdep.h Sat Jan 2 18:16:24 2016 (r293053) +++ head/sys/dev/ath/ah_osdep.h Sat Jan 2 18:32:20 2016 (r293054) @@ -143,18 +143,13 @@ struct ath_hal; extern void ath_hal_reg_write(struct ath_hal *ah, u_int reg, u_int32_t val); extern u_int32_t ath_hal_reg_read(struct ath_hal *ah, u_int reg); #else +/* XXX TODO: enforce barriers */ #define OS_REG_WRITE(_ah, _reg, _val) \ - do { \ bus_space_write_4((bus_space_tag_t)(_ah)->ah_st, \ - (bus_space_handle_t)(_ah)->ah_sh, (_reg), (_val)); \ - OS_BUS_BARRIER_REG((_ah), (_reg), OS_BUS_BARRIER_WRITE); \ - } while (0) + (bus_space_handle_t)(_ah)->ah_sh, (_reg), (_val)) #define OS_REG_READ(_ah, _reg) \ - do { \ - OS_BUS_BARRIER_REG((_ah), (_reg), OS_BUS_BARRIER_READ); \ bus_space_read_4((bus_space_tag_t)(_ah)->ah_st, \ - (bus_space_handle_t)(_ah)->ah_sh, (_reg)); \ - } while (0) + (bus_space_handle_t)(_ah)->ah_sh, (_reg)) #endif #ifdef AH_DEBUG_ALQ