diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-04-21 18:17:41 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-04-21 18:17:41 +0000 |
| commit | 87b4b06d09f0a188286304756f84019e4c177922 (patch) | |
| tree | 05890f28b7ad36bd13f4b53b080c04c2c7955b18 /nuttx | |
| parent | 2c6eb1d98e93b702ab5fe8dbfd69b9ed95d79843 (diff) | |
| download | px4-nuttx-87b4b06d09f0a188286304756f84019e4c177922.tar.gz px4-nuttx-87b4b06d09f0a188286304756f84019e4c177922.tar.bz2 px4-nuttx-87b4b06d09f0a188286304756f84019e4c177922.zip | |
Fix RTL driver MAC address
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3529 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
| -rwxr-xr-x | nuttx/configs/olimex-lpc1766stk/wlan/defconfig | 4 | ||||
| -rwxr-xr-x | nuttx/configs/vsn/nsh/defconfig | 19 | ||||
| -rwxr-xr-x | nuttx/drivers/wireless/chipcon_cc1101.c | 2 |
3 files changed, 21 insertions, 4 deletions
diff --git a/nuttx/configs/olimex-lpc1766stk/wlan/defconfig b/nuttx/configs/olimex-lpc1766stk/wlan/defconfig index 7a8441feb..02b639bef 100755 --- a/nuttx/configs/olimex-lpc1766stk/wlan/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/wlan/defconfig @@ -900,5 +900,5 @@ CONFIG_HEAP_SIZE= # # USB WLAN device identification # -CONFIG_USB_WLAN_VID=0x148f -CONFIG_USB_WLAN_PID=0x3071 +CONFIG_USB_WLAN_VID=0x0bda +CONFIG_USB_WLAN_PID=0x8189 diff --git a/nuttx/configs/vsn/nsh/defconfig b/nuttx/configs/vsn/nsh/defconfig index f5b768224..c33e36dbf 100755 --- a/nuttx/configs/vsn/nsh/defconfig +++ b/nuttx/configs/vsn/nsh/defconfig @@ -255,9 +255,24 @@ CONFIG_SSI_POLLWAIT=y CONFIG_I2C=y # +# OS support for various wireless chipsets such as +# - Chipcon CC1101 operating in bands 300-400, 800-900 MHz +# - Chipcon CC2500 operating in band of 2 GHz +# +# Note: this has (at the moment) nothing to do with WIFI +# +CONFIG_WIRELESS=y + +# # OS support for hardware RTC # CONFIG_RTC=y +CONFIG_SYSTEM_UTC=y + +# +# OS support for events +# +CONFIG_EVENT=y # # General build options @@ -884,3 +899,7 @@ CONFIG_APPS_DIR="../apps" # Application configuration CONFIG_APPS_DIR="../apps" + +# Application configuration + +CONFIG_APPS_DIR="../apps" diff --git a/nuttx/drivers/wireless/chipcon_cc1101.c b/nuttx/drivers/wireless/chipcon_cc1101.c index 5c492a4fd..1f5a2015a 100755 --- a/nuttx/drivers/wireless/chipcon_cc1101.c +++ b/nuttx/drivers/wireless/chipcon_cc1101.c @@ -51,8 +51,6 @@ #include <nuttx/kmalloc.h> #include <nuttx/wireless/chipcon_cc1101.h> -#include <nuttx/ptimer.h> - /************************************************************************************ * Chipcon CC1101 Internal Registers |