From 5867444e732f401fc3ad95047a96950d42d90629 Mon Sep 17 00:00:00 2001 From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> Date: Thu, 21 Apr 2011 18:17:41 +0000 Subject: [PATCH] Fix RTL driver MAC address git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3529 42af7a65-404d-4744-a932-0658087f49c3 --- configs/olimex-lpc1766stk/wlan/defconfig | 4 ++-- configs/vsn/nsh/defconfig | 19 +++++++++++++++++++ drivers/wireless/chipcon_cc1101.c | 2 -- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/configs/olimex-lpc1766stk/wlan/defconfig b/configs/olimex-lpc1766stk/wlan/defconfig index 7a8441feb4..02b639bef8 100755 --- a/configs/olimex-lpc1766stk/wlan/defconfig +++ b/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/configs/vsn/nsh/defconfig b/configs/vsn/nsh/defconfig index f5b7682245..c33e36dbf9 100755 --- a/configs/vsn/nsh/defconfig +++ b/configs/vsn/nsh/defconfig @@ -254,10 +254,25 @@ 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/drivers/wireless/chipcon_cc1101.c b/drivers/wireless/chipcon_cc1101.c index 5c492a4fdc..1f5a2015af 100755 --- a/drivers/wireless/chipcon_cc1101.c +++ b/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 -- GitLab