diff options
author | Dmitry Shmidt <dimitrysh@google.com> | 2010-03-10 16:24:37 -0800 |
---|---|---|
committer | Dmitry Shmidt <dimitrysh@google.com> | 2010-03-10 16:24:37 -0800 |
commit | 005bbf20350954d05c8a111d3f487d6fddb049bb (patch) | |
tree | e98b2977074ccb66104d4af647b20fa593bbee98 /wl1271/platforms/os/common | |
parent | 79e900421c74530eaf337d72d3b3f7fce7725617 (diff) | |
download | wlan-005bbf20350954d05c8a111d3f487d6fddb049bb.tar.gz |
wl1271: Sync with Moto drop
Change-Id: If1cb49c1b8ac4cc1fc63eba70928484d31065b08
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'wl1271/platforms/os/common')
-rw-r--r-- | wl1271/platforms/os/common/build/linux/common.inc | 10 | ||||
-rw-r--r-- | wl1271/platforms/os/common/src/osRgstry.c | 6 |
2 files changed, 14 insertions, 2 deletions
diff --git a/wl1271/platforms/os/common/build/linux/common.inc b/wl1271/platforms/os/common/build/linux/common.inc index 305e8642..86e9235c 100644 --- a/wl1271/platforms/os/common/build/linux/common.inc +++ b/wl1271/platforms/os/common/build/linux/common.inc @@ -33,6 +33,12 @@ FW ?= 1273 # XCC ?= n + +# +# Compile with GEM support or not +# +GEM ?= n + # # Choose the bus type (n for SDIO, y for WSPI) # @@ -84,6 +90,10 @@ ifeq ($(XCC),y) DK_DEFINES += -D XCC_MODULE_INCLUDED endif +ifeq ($(GEM),y) + DK_DEFINES += -D GEM_SUPPORTED +endif + ifeq ($(INTR),n) DK_DEFINES += -D PRIODIC_INTERRUPT endif diff --git a/wl1271/platforms/os/common/src/osRgstry.c b/wl1271/platforms/os/common/src/osRgstry.c index 736d8726..f2cc7311 100644 --- a/wl1271/platforms/os/common/src/osRgstry.c +++ b/wl1271/platforms/os/common/src/osRgstry.c @@ -161,8 +161,10 @@ NDIS_STRING STRdot11BasicRateMask_A = NDIS_STRING_CONST( "dot11BasicRa NDIS_STRING STRdot11SupportedRateMask_A = NDIS_STRING_CONST( "dot11SupportedRateMaskA"); NDIS_STRING STRdot11BasicRateMask_AG = NDIS_STRING_CONST( "dot11BasicRateMaskAG"); NDIS_STRING STRdot11SupportedRateMask_AG = NDIS_STRING_CONST( "dot11SupportedRateMaskAG"); -NDIS_STRING STRdot11BasicRateMask_N = NDIS_STRING_CONST( "STRdot11BasicRateMask_N"); -NDIS_STRING STRdot11SupportedRateMask_N = NDIS_STRING_CONST( "STRdot11SupportedRateMask_N"); +/*** MODS_BEGIN_FOR_11N_RATE_REPORTING ***/ +NDIS_STRING STRdot11BasicRateMask_N = NDIS_STRING_CONST( "dot11BasicRateMask_N"); +NDIS_STRING STRdot11SupportedRateMask_N = NDIS_STRING_CONST( "dot11SupportedRateMask_N"); +/*** MODS_END_FOR_11N_RATE_REPORTING ***/ NDIS_STRING STRRadio11_RxLevel = NDIS_STRING_CONST( "Radio11_RxLevel"); NDIS_STRING STRRadio11_LNA = NDIS_STRING_CONST( "Radio11_LNA"); |