Deleted Added
full compact
ah_osdep.c (196970) ah_osdep.c (219315)
1/*-
2 * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 12 unchanged lines hidden (view full) ---

21 * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY,
22 * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
23 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
25 * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
27 * THE POSSIBILITY OF SUCH DAMAGES.
28 *
1/*-
2 * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 12 unchanged lines hidden (view full) ---

21 * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY,
22 * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
23 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
25 * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
27 * THE POSSIBILITY OF SUCH DAMAGES.
28 *
29 * $FreeBSD: head/sys/dev/ath/ah_osdep.c 196970 2009-09-08 13:19:05Z phk $
29 * $FreeBSD: head/sys/dev/ath/ah_osdep.c 219315 2011-03-05 21:20:18Z adrian $
30 */
31#include "opt_ah.h"
32
33#include <sys/param.h>
34#include <sys/systm.h>
35#include <sys/kernel.h>
36#include <sys/module.h>
37#include <sys/sysctl.h>

--- 28 unchanged lines hidden (view full) ---

66extern const char* ath_hal_ether_sprintf(const u_int8_t *mac);
67extern void *ath_hal_malloc(size_t);
68extern void ath_hal_free(void *);
69#ifdef AH_ASSERT
70extern void ath_hal_assert_failed(const char* filename,
71 int lineno, const char* msg);
72#endif
73#ifdef AH_DEBUG
30 */
31#include "opt_ah.h"
32
33#include <sys/param.h>
34#include <sys/systm.h>
35#include <sys/kernel.h>
36#include <sys/module.h>
37#include <sys/sysctl.h>

--- 28 unchanged lines hidden (view full) ---

66extern const char* ath_hal_ether_sprintf(const u_int8_t *mac);
67extern void *ath_hal_malloc(size_t);
68extern void ath_hal_free(void *);
69#ifdef AH_ASSERT
70extern void ath_hal_assert_failed(const char* filename,
71 int lineno, const char* msg);
72#endif
73#ifdef AH_DEBUG
74extern void HALDEBUG(struct ath_hal *ah, u_int mask, const char* fmt, ...);
74extern void DO_HALDEBUG(struct ath_hal *ah, u_int mask, const char* fmt, ...);
75#endif /* AH_DEBUG */
76
77/* NB: put this here instead of the driver to avoid circular references */
78SYSCTL_NODE(_hw, OID_AUTO, ath, CTLFLAG_RD, 0, "Atheros driver parameters");
79SYSCTL_NODE(_hw_ath, OID_AUTO, hal, CTLFLAG_RD, 0, "Atheros HAL parameters");
80
81#ifdef AH_DEBUG
75#endif /* AH_DEBUG */
76
77/* NB: put this here instead of the driver to avoid circular references */
78SYSCTL_NODE(_hw, OID_AUTO, ath, CTLFLAG_RD, 0, "Atheros driver parameters");
79SYSCTL_NODE(_hw_ath, OID_AUTO, hal, CTLFLAG_RD, 0, "Atheros HAL parameters");
80
81#ifdef AH_DEBUG
82static int ath_hal_debug = 0;
82int ath_hal_debug = 0;
83SYSCTL_INT(_hw_ath_hal, OID_AUTO, debug, CTLFLAG_RW, &ath_hal_debug,
84 0, "Atheros HAL debugging printfs");
85TUNABLE_INT("hw.ath.hal.debug", &ath_hal_debug);
86#endif /* AH_DEBUG */
87
88/* NB: these are deprecated; they exist for now for compatibility */
89int ath_hal_dma_beacon_response_time = 2; /* in TU's */
90SYSCTL_INT(_hw_ath_hal, OID_AUTO, dma_brt, CTLFLAG_RW,

--- 40 unchanged lines hidden (view full) ---

131const char*
132ath_hal_ether_sprintf(const u_int8_t *mac)
133{
134 return ether_sprintf(mac);
135}
136
137#ifdef AH_DEBUG
138void
83SYSCTL_INT(_hw_ath_hal, OID_AUTO, debug, CTLFLAG_RW, &ath_hal_debug,
84 0, "Atheros HAL debugging printfs");
85TUNABLE_INT("hw.ath.hal.debug", &ath_hal_debug);
86#endif /* AH_DEBUG */
87
88/* NB: these are deprecated; they exist for now for compatibility */
89int ath_hal_dma_beacon_response_time = 2; /* in TU's */
90SYSCTL_INT(_hw_ath_hal, OID_AUTO, dma_brt, CTLFLAG_RW,

--- 40 unchanged lines hidden (view full) ---

131const char*
132ath_hal_ether_sprintf(const u_int8_t *mac)
133{
134 return ether_sprintf(mac);
135}
136
137#ifdef AH_DEBUG
138void
139HALDEBUG(struct ath_hal *ah, u_int mask, const char* fmt, ...)
139DO_HALDEBUG(struct ath_hal *ah, u_int mask, const char* fmt, ...)
140{
141 if (ath_hal_debug & mask) {
142 __va_list ap;
143 va_start(ap, fmt);
144 ath_hal_vprintf(ah, fmt, ap);
145 va_end(ap);
146 }
147}

--- 208 unchanged lines hidden ---
140{
141 if (ath_hal_debug & mask) {
142 __va_list ap;
143 va_start(ap, fmt);
144 ath_hal_vprintf(ah, fmt, ap);
145 va_end(ap);
146 }
147}

--- 208 unchanged lines hidden ---