Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / b43legacy / b43legacy.h

diff --git a/drivers/net/wireless/b43legacy/b43legacy.h b/drivers/net/wireless/b43legacy/b43legacy.h
index 242b8ad4e33c88f22f7a175fa61f6c72546080f1..c40078e1fff9f3efabfa92f787dcb7217018669d 100644 (file)
--- a/drivers/net/wireless/b43legacy/b43legacy.h
+++ b/drivers/net/wireless/b43legacy/b43legacy.h
@@ -97,6 +97,7 @@
 #define B43legacy_MMIO_RADIO_HWENABLED_LO      0x49A
 #define B43legacy_MMIO_GPIO_CONTROL    0x49C
 #define B43legacy_MMIO_GPIO_MASK               0x49E
+#define B43legacy_MMIO_TSF_CFP_PRETBTT 0x612
 #define B43legacy_MMIO_TSF_0           0x632 /* core rev < 3 only */
 #define B43legacy_MMIO_TSF_1           0x634 /* core rev < 3 only */
 #define B43legacy_MMIO_TSF_2           0x636 /* core rev < 3 only */
@@ -149,6 +150,8 @@
 #define B43legacy_SHM_SH_UCODEPATCH    0x0002 /* Microcode patchlevel */
 #define B43legacy_SHM_SH_UCODEDATE     0x0004 /* Microcode date */
 #define B43legacy_SHM_SH_UCODETIME     0x0006 /* Microcode time */
+#define B43legacy_SHM_SH_SPUWKUP       0x0094 /* pre-wakeup for synth PU in us */
+#define B43legacy_SHM_SH_PRETBTT       0x0096 /* pre-TBTT in us */
 
 #define B43legacy_UCODEFLAGS_OFFSET     0x005E
 
@@ -820,23 +823,6 @@ void b43legacydbg(struct b43legacy_wl *wl, const char *fmt, ...)
 # define b43legacydbg(wl, fmt...) do { /* nothing */ } while (0)
 #endif /* DEBUG */
 
-
-/** Limit a value between two limits */
-#ifdef limit_value
-# undef limit_value
-#endif
-#define limit_value(value, min, max)  \
-       ({                                              \
-               typeof(value) __value = (value);        \
-               typeof(value) __min = (min);            \
-               typeof(value) __max = (max);            \
-               if (__value < __min)                    \
-                       __value = __min;                \
-               else if (__value > __max)               \
-                       __value = __max;                \
-               __value;                                \
-       })
-
 /* Macros for printing a value in Q5.2 format */
 #define Q52_FMT                "%u.%u"
 #define Q52_ARG(q52)   ((q52) / 4), (((q52) & 3) * 100 / 4)