Date: Sat, 2 Jan 2016 18:32:20 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r293054 - head/sys/dev/ath Message-ID: <201601021832.u02IWKQD066403@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601021832.u02IWKQD066403>