diff options
| -rw-r--r-- | misc/LICENSING.txt | 15 | ||||
| -rwxr-xr-x | misc/drivers/INSTALL.sh | 97 | ||||
| -rwxr-xr-x | misc/drivers/rtl8187x/INSTALL.sh | 123 | ||||
| -rwxr-xr-x | misc/drivers/rtl8187x/rtl8187x.c (renamed from nuttx/drivers/usbhost/usbhost_rtl8187.c) | 37 | ||||
| -rwxr-xr-x | misc/drivers/rtl8187x/rtl8187x.h | 312 | ||||
| -rw-r--r-- | nuttx/ChangeLog | 13 | ||||
| -rw-r--r-- | nuttx/Documentation/NuttX.html | 14 | ||||
| -rwxr-xr-x | nuttx/configs/olimex-lpc1766stk/wlan/defconfig | 2 | ||||
| -rw-r--r-- | nuttx/configs/qemu-i486/README.txt | 22 | ||||
| -rw-r--r-- | nuttx/drivers/usbhost/Make.defs | 8 |
10 files changed, 610 insertions, 33 deletions
diff --git a/misc/LICENSING.txt b/misc/LICENSING.txt index 55690a0cc..05e96d4a2 100644 --- a/misc/LICENSING.txt +++ b/misc/LICENSING.txt @@ -17,6 +17,7 @@ below: pascal: Description: Pascal compiler with NuttX runtime add-on. License: BSD + sims: Description: This is a repository of instruction set simulators that were used to verify NuttX. The licensing of the @@ -29,3 +30,17 @@ below: instruction set emulator. That emulation is not included in this directory, but is automatically downloaded when z80sim is built. + + drivers: + Descriptions: This is a folder of drivers that are not included + in the main NuttX source tree due to licensing or other concerns. + Compatibly licensed drivers (BSD or MIT) are included in the main + source tree. These drivers have incompatible licesnes. They + may, as an example, have been leveraged from Linux and, hence, + inherit a GPL license. By installing this driver package you + agree to the licensing terms of the individual drivers. + + rtl8187x + This is a USB host driver for the RTL8187x wireless LAN. Some + of the critical logic in this driver derives from Linux and, + hence, is GPLv2. diff --git a/misc/drivers/INSTALL.sh b/misc/drivers/INSTALL.sh new file mode 100755 index 000000000..86deca589 --- /dev/null +++ b/misc/drivers/INSTALL.sh @@ -0,0 +1,97 @@ +############################################################################ +# misc/divers/INSTALL.sh +# Install ALL optional drivers into the NuttX source tree +# +# Copyright (C) 2011 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +# Directory list + +DRIVERS="rtl8187x" + +# Parse command arguments + +wd=`pwd` +usage="USAGE: $0 [-d|h] <NuttX-path>" + +unset nuttxdir +unset debug + +while [ ! -z "$1" ]; do + case "$1" in + -d ) + set -x + debug="-d" + ;; + -h ) + echo "$usage" + exit 0 + ;; + *) + nuttxdir=$1 + ;; + esac + shift +done + +# Sanity checking + +if [ -z "${nuttxdir}" ]; then + echo "Path to the top-level NuttX directory not provided" + echo "$usage" + exit 1 +fi + +if [ ! -d ${nuttxdir} ]; then + echo "NuttX directory ${nuttxdir} does not exist" + exit 2 +fi + +# Then install each driver + +for dir in "$DRIVERS"; do + + # More sanity checking + + if [ ! -d ${dir} ]; then + echo "No sub-directory ${dir} under ${wd}. Please CD into the drivers directory first" + exit 3 + fi + if [ ! -x ${dir}/INSTALL.sh ]; then + echo "No executable INSTALL.sh script in ${wd}/${dir}" + exit 3 + fi + + # Run the driver install script + + ${dir}/INSTALL.sh $debug -t "${wd}/${dir}" -n "${nuttxdir}" +done diff --git a/misc/drivers/rtl8187x/INSTALL.sh b/misc/drivers/rtl8187x/INSTALL.sh new file mode 100755 index 000000000..5e727be42 --- /dev/null +++ b/misc/drivers/rtl8187x/INSTALL.sh @@ -0,0 +1,123 @@ +############################################################################ +# nuttx/rtl8187x/INSTALL.sh +# Install the GPLv2 RTL8187x driver into the NuttX source tree +# +# Copyright (C) 2008 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +# List of files to install and where to install them + +files="\ +rtl8187x.c +rtl8187x.h +" +dest="drivers/usbhost" + +# Parse command arguments + +usage="USAGE: $0 [-d|h] -t <driver-dir> -n <nuttx-dir>" + +unset topdir +unset nuttxdir + +while [ ! -z "$1" ]; do + case "$1" in + -d ) + set -x + ;; + -t ) + shift + topdir=$1 + ;; + -n ) + shift + nuttxdir=$1 + ;; + -h ) + echo "$usage" + exit 0 + ;; + *) + echo "Unrecognized option: $1" + echo "$usage" + exit 1 + ;; + esac + shift +done + +# Sanity checking + +if [ -z "${nuttxdir}" ]; then + echo "Path to the top-level NuttX directory not provided" + echo "$usage" + exit 2 +fi + +if [ -z "${topdir}" ]; then + echo "Path to the top-level misc/drivers directory not provided" + echo "$usage" + exit 3 +fi + +if [ ! -d ${nuttxdir} ]; then + echo "NuttX directory ${nuttxdir} does not exist" + exit 4 +fi + +if [ ! -d ${topdir} ]; then + echo "misc/drivers directory ${topdir} does not exist" + exit 5 +fi + +if [ ! -d ${nuttxdir}/${dest} ]; then + echo "NuttX driver directory ${nuttxdir}/${dest} does not exist" + exit 6 +fi + +echo "Installing the RTL8187x driver to ${nuttxdir}/${dest}" + +# Copy the files + +for file in ${files}; do + if [ ! -r ${topdir}/${file} ]; then + echo "No readable source driver file ${topdir}/${file}" + exit 7 + fi + if [ -f ${nuttxdir}/${dest}/${file} ]; then + echo "Driver file ${nuttxdir}/${dest}/${file} already exists" + echo "Please remove that file and re-start the installation" + exit 8 + fi + cp ${topdir}/${file} ${nuttxdir}/${dest}/${file} || \ + { echo "ERROR: failed to copy ${topdir}/${file} to ${nuttxdir}/${dest}/${file}"; exit 9; } +done
\ No newline at end of file diff --git a/nuttx/drivers/usbhost/usbhost_rtl8187.c b/misc/drivers/rtl8187x/rtl8187x.c index 22432595d..3186daae1 100755 --- a/nuttx/drivers/usbhost/usbhost_rtl8187.c +++ b/misc/drivers/rtl8187x/rtl8187x.c @@ -5,32 +5,17 @@ * Authors: Rafael Noronha <rafael@pdsolucoes.com.br> * Gregory Nutt <spudmonkey@racsa.co.cr> * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * Portions of the logic in this file derives from the Linux RTL8187x driver + * + * Copyright 2007 Michael Wu <flamingice@sourmilk.net> + * Copyright 2007 Andrea Merello <andreamrl@tiscali.it> + * + * Based on the r8187 driver, which is: + * Copyright 2004-2005 Andrea Merello <andreamrl@tiscali.it>, et al. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. * ****************************************************************************/ diff --git a/misc/drivers/rtl8187x/rtl8187x.h b/misc/drivers/rtl8187x/rtl8187x.h new file mode 100755 index 000000000..bd5747f2e --- /dev/null +++ b/misc/drivers/rtl8187x/rtl8187x.h @@ -0,0 +1,312 @@ +/**************************************************************************** + * drivers/usbhost/rtl8187.h + * + * This file is part of NuttX: + * + * Copyright (C) 2011 Gregory Nutt. All rights reserved. + * + * Contributed by: + * + * Copyright (C) 2011 Rafael Noronha. All rights reserved. + * Authors: Rafael Noronha <rafael@pdsolucoes.com.br> + * + * Portions of the logic in this file derives from the Linux RTL8187x driver + * + * Copyright 2007 Michael Wu <flamingice@sourmilk.net> + * Copyright 2007 Andrea Merello <andreamrl@tiscali.it> + * + * Based on the r8187 driver, which is: + * Copyright 2004-2005 Andrea Merello <andreamrl@tiscali.it>, et al. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + ****************************************************************************/ + +#ifndef __DRIVERS_NET_RTL818X_H +#define __DRIVERS_NET_RTL818X_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/* Set/clear a specific bit */ + +#define set_bit(x) (1 << (x)) +#define clr_bit(x) (~(set_bit(x))) + +/* Refers to "cmd" field of "rtl818x_csr_s" struct */ + +#define RTL818X_CMD_TX_ENABLE set_bit(2) +#define RTL818X_CMD_RX_ENABLE set_bit(3) +#define RTL818X_CMD_RESET set_bit(4) + +/* Refers to "status" field of "rtl818x_csr_s" struct */ + +#define RTL818X_INT_RX_OK set_bit(0) +#define RTL818X_INT_RX_ERR set_bit(1) +#define RTL818X_INT_TXL_OK set_bit(2) +#define RTL818X_INT_TXL_ERR set_bit(3) +#define RTL818X_INT_RX_DU set_bit(4) +#define RTL818X_INT_RX_FO set_bit(5) +#define RTL818X_INT_TXN_OK set_bit(6) +#define RTL818X_INT_TXN_ERR set_bit(7) +#define RTL818X_INT_TXH_OK set_bit(8) +#define RTL818X_INT_TXH_ERR set_bit(9) +#define RTL818X_INT_TXB_OK set_bit(10) +#define RTL818X_INT_TXB_ERR set_bit(11) +#define RTL818X_INT_ATIM set_bit(12) +#define RTL818X_INT_BEACON set_bit(13) +#define RTL818X_INT_TIME_OUT set_bit(14) +#define RTL818X_INT_TX_FO set_bit(15) + +/* Refers to "tx_conf" field of "rtl818x_csr_s" struct */ + +#define RTL818X_TX_CONF_LOOPBACK_MAC set_bit(17) +#define RTL818X_TX_CONF_LOOPBACK_CONT (3 << 17) +#define RTL818X_TX_CONF_NO_ICV set_bit(19) +#define RTL818X_TX_CONF_DISCW set_bit(20) +#define RTL818X_TX_CONF_SAT_HWPLCP set_bit(24) +#define RTL818X_TX_CONF_R8180_ABCD (2 << 25) +#define RTL818X_TX_CONF_R8180_F (3 << 25) +#define RTL818X_TX_CONF_R8185_ABC (4 << 25) +#define RTL818X_TX_CONF_R8185_D (5 << 25) +#define RTL818X_TX_CONF_R8187vD (5 << 25) +#define RTL818X_TX_CONF_R8187vD_B (6 << 25) +#define RTL818X_TX_CONF_HWVER_MASK (7 << 25) +#define RTL818X_TX_CONF_DISREQQSIZE set_bit(28) +#define RTL818X_TX_CONF_PROBE_DTS set_bit(29) +#define RTL818X_TX_CONF_HW_SEQNUM set_bit(30) +#define RTL818X_TX_CONF_CW_MIN set_bit(31) + +/* Refers to "rx_conf" field of "rtl818x_csr_s" struct */ + +#define RTL818X_RX_CONF_MONITOR set_bit(0) +#define RTL818X_RX_CONF_NICMAC set_bit(1) +#define RTL818X_RX_CONF_MULTICAST set_bit(2) +#define RTL818X_RX_CONF_BROADCAST set_bit(3) +#define RTL818X_RX_CONF_FCS set_bit(5) +#define RTL818X_RX_CONF_DATA set_bit(18) +#define RTL818X_RX_CONF_CTRL set_bit(19) +#define RTL818X_RX_CONF_MGMT set_bit(20) +#define RTL818X_RX_CONF_ADDR3 set_bit(21) +#define RTL818X_RX_CONF_PM set_bit(22) +#define RTL818X_RX_CONF_BSSID set_bit(23) +#define RTL818X_RX_CONF_RX_AUTORESETPHY set_bit(28) +#define RTL818X_RX_CONF_CSDM1 set_bit(29) +#define RTL818X_RX_CONF_CSDM2 set_bit(30) +#define RTL818X_RX_CONF_ONLYERLPKT set_bit(31) + +/* Refers to "eeprom_cmd" field of "rtl818x_csr_s" struct */ + +#define RTL818X_EEPROM_CMD_READ set_bit(0) +#define RTL818X_EEPROM_CMD_WRITE set_bit(1) +#define RTL818X_EEPROM_CMD_CK set_bit(2) +#define RTL818X_EEPROM_CMD_CS set_bit(3) +#define RTL818X_EEPROM_CMD_NORMAL (0 << 6) +#define RTL818X_EEPROM_CMD_LOAD (1 << 6) +#define RTL818X_EEPROM_CMD_PROGRAM (2 << 6) +#define RTL818X_EEPROM_CMD_CONFIG (3 << 6) + +/* Refers to "config2" field of "rtl818x_csr_s" struct */ + +#define RTL818X_CONFIG2_ANTENNA_DIV set_bit(6) + +/* Refers to "msr" field of "rtl818x_csr_s" struct */ + +#define RTL818X_MSR_NO_LINK (0 << 2) +#define RTL818X_MSR_ADHOC (1 << 2) +#define RTL818X_MSR_INFRA (2 << 2) +#define RTL818X_MSR_MASTER (3 << 2) +#define RTL818X_MSR_ENEDCA (4 << 2) + +/* Refers to "config3" field of "rtl818x_csr_s" struct */ + +#define RTL818X_CONFIG3_ANAPARAM_WRITE set_bit(6) +#define RTL818X_CONFIG3_GNT_SELECT set_bit(7) + +/* Refers to "config4" field of "rtl818x_csr_s" struct */ + +#define RTL818X_CONFIG4_POWEROFF set_bit(6) +#define RTL818X_CONFIG4_VCOOFF set_bit(7) + +/* Refers to "tx_agc_ctl" field of "rtl818x_csr_s" struct */ + +#define RTL818X_TX_AGC_CTL_PERPACKET_GAIN_SHIFT set_bit(0) +#define RTL818X_TX_AGC_CTL_PERPACKET_ANTSEL_SHIFT set_bit(1) +#define RTL818X_TX_AGC_CTL_FEEDBACK_ANT set_bit(2) + +/* Refers to "cw_conf" field of "rtl818x_csr_s" struct */ + +#define RTL818X_CW_CONF_PERPACKET_CW_SHIFT set_bit(0) +#define RTL818X_CW_CONF_PERPACKET_RETRY_SHIFT set_bit(1) + +/* Refers to "rate_fallback" field of "rtl818x_csr_s" struct */ + +#define RTL818X_RATE_FALLBACK_ENABLE set_bit(7) + +/**************************************************************************** + * Type Definitions + ****************************************************************************/ + + /* RTL-818x mapping struct */ + +struct rtl818x_csr_s +{ + uint8_t mac[6]; + uint8_t reserved_0[2]; + uint32_t mar[2]; + uint8_t rx_fifo_count; + uint8_t reserved_1; + uint8_t tx_fifo_count; + uint8_t bqreq; + uint8_t reserved_2[4]; + uint32_t tsft[2]; + uint32_t tlpda; + uint32_t tnpda; + uint32_t thpda; + uint16_t brsr; + uint8_t bssid[6]; + uint8_t resp_rate; + uint8_t eifs; + uint8_t reserved_3[1]; + uint8_t cmd; + uint8_t reserved_4[4]; + uint16_t int_mask; + uint16_t int_status; + uint32_t tx_conf; + uint32_t rx_conf; + uint32_t int_timeout; + uint32_t tbda; + uint8_t eeprom_cmd; + uint8_t config0; + uint8_t config1; + uint8_t config2; + uint32_t anaparam; + uint8_t msr; + uint8_t config3; + uint8_t config4; + uint8_t testr; + uint8_t reserved_9[2]; + uint8_t pgselect; + uint8_t security; + uint32_t anaparam2; + uint8_t reserved_10[12]; + uint16_t beacon_interval; + uint16_t atim_wnd; + uint16_t beacon_interval_time; + uint16_t atimtr_interval; + uint8_t phy_delay; + uint8_t carrier_sense_counter; + uint8_t reserved_11[2]; + uint8_t phy[4]; + uint16_t rfpinsoutput; + uint16_t rfpinsenable; + uint16_t rfpinsselect; + uint16_t rfpinsinput; + uint32_t rf_para; + uint32_t rf_timing; + uint8_t gp_enable; + uint8_t gpio0; + uint8_t gpio1; + uint8_t reserved_12; + uint32_t hssi_para; + uint8_t reserved_13[4]; + uint8_t tx_agc_ctl; + uint8_t tx_gain_cck; + uint8_t tx_gain_ofdm; + uint8_t tx_antenna; + uint8_t reserved_14[16]; + uint8_t wpa_conf; + uint8_t reserved_15[3]; + uint8_t sifs; + uint8_t difs; + uint8_t slot; + uint8_t reserved_16[5]; + uint8_t cw_conf; + uint8_t cw_val; + uint8_t rate_fallback; + uint8_t acm_control; + uint8_t reserved_17[24]; + uint8_t config5; + uint8_t tx_dma_polling; + uint8_t reserved_18[2]; + uint16_t cwr; + uint8_t retry_ctr; + uint8_t reserved_19[3]; + uint16_t int_mig; + uint32_t rdsar; + uint16_t tid_ac_map; + uint8_t reserved_20[4]; + uint8_t anaparam3; + uint8_t reserved_21[5]; + uint16_t femr; + uint8_t reserved_22[4]; + uint16_t tally_cnt; + uint8_t tally_sel; +} __attribute__ ((packed)); + +/* Numbers from ioregisters */ + +enum rtl818x_r8187b_x_e +{ + RTL818X_R8187B_B = 0, + RTL818X_R8187B_D, + RTL818X_R8187B_E +}; + +struct ieee80211_conf_s; +struct ieee80211_bssconf_s; +struct rtl818x_rfops_s +{ + char *name; + void (*init) (struct ieee80211_hw_s *); + void (*stop) (struct ieee80211_hw_s *); + void (*setchan) (struct ieee80211_hw_s *, struct ieee80211_conf_s *); + void (*conferp) (struct ieee80211_hw_s *, struct ieee80211_bssconf_s *); + uint8_t (*calcrssi)(uint8_t agc, uint8_t sq); +}; + +/* Tx/Rx flags are common between RTL818X chips */ + +enum rtl818x_tx_desc_flags_e +{ + RTL818X_TX_DESC_FLAG_NO_ENC = set_bit(15), /* Disable hardware based encryption */ + RTL818X_TX_DESC_FLAG_TX_OK = set_bit(15), /* TX frame was ACKed */ + RTL818X_TX_DESC_FLAG_SPLCP = set_bit(16), /* Use short preamble */ + RTL818X_TX_DESC_FLAG_RX_UNDER = set_bit(16), + RTL818X_TX_DESC_FLAG_MOREFRAG = set_bit(17), /* More fragments follow */ + RTL818X_TX_DESC_FLAG_CTS = set_bit(18), /* Use CTS-to-self protection */ + RTL818X_TX_DESC_FLAG_RTS = set_bit(23), /* Use RTS/CTS protection */ + RTL818X_TX_DESC_FLAG_LS = set_bit(28), /* Last segment of the frame */ + RTL818X_TX_DESC_FLAG_FS = set_bit(29), /* First segment of the frame */ + RTL818X_TX_DESC_FLAG_DMA = set_bit(30), + RTL818X_TX_DESC_FLAG_OWN = set_bit(31) +}; + +enum rtl818x_rx_desc_flags_e +{ + RTL818X_RX_DESC_FLAG_ICV_ERR = set_bit(12), + RTL818X_RX_DESC_FLAG_CRC32_ERR = set_bit(13), + RTL818X_RX_DESC_FLAG_PM = set_bit(14), + RTL818X_RX_DESC_FLAG_RX_ERR = set_bit(15), + RTL818X_RX_DESC_FLAG_BCAST = set_bit(16), + RTL818X_RX_DESC_FLAG_PAM = set_bit(17), + RTL818X_RX_DESC_FLAG_MCAST = set_bit(18), + RTL818X_RX_DESC_FLAG_QOS = set_bit(19), /* RTL8187(B) only */ + RTL818X_RX_DESC_FLAG_TRSW = set_bit(24), /* RTL8187(B) only */ + RTL818X_RX_DESC_FLAG_SPLCP = set_bit(25), + RTL818X_RX_DESC_FLAG_FOF = set_bit(26), + RTL818X_RX_DESC_FLAG_DMA_FAIL = set_bit(27), + RTL818X_RX_DESC_FLAG_LS = set_bit(28), + RTL818X_RX_DESC_FLAG_FS = set_bit(29), + RTL818X_RX_DESC_FLAG_EOR = set_bit(30), + RTL818X_RX_DESC_FLAG_OWN = set_bit(31) +}; + +#endif /* __DRIVERS_NET_RTL818X_H */
\ No newline at end of file diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 205904158..f89473ba2 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -1579,3 +1579,16 @@ switching. Basically, the logic was missing the cases to handle the differing stack frames when a priority change occurs and when no priority change occurs. + * configs/qemu-i486/ostest and nsh -- The QEMU i486 port is complete. + it now passes the OS test and supports the NuttShell (NSH). + * misc/drivers -- Created a new directory to hold non-BSD licensed + drivers that may be added into NuttX via an installation script. + * drivers/usbhost/usbhost_rtl8187.c -- A decision was made to + incorporate code taken from the Linux kernel. That changes the + licensing on this module to GPL. To avoid licensing contamination, + this driver was moved to misc/drivers/rtl8187x *prior* to adding + and of the GPL log. There is an INSTALL.sh script at the location + where the GPL driver(s) can be re-installed into the NuttX source + tree. By re-installing the driver, you agree to the GPL licsensing + and all of its implications. + diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index 59c8686f5..ac90b8003 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/Documentation/NuttX.html @@ -8,7 +8,7 @@ <tr align="center" bgcolor="#e4e4e4"> <td> <h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1> - <p>Last Updated: March 17, 2011</p> + <p>Last Updated: March 18, 2011</p> </td> </tr> </table> @@ -2206,6 +2206,18 @@ nuttx-5.20 2011-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> switching. Basically, the logic was missing the cases to handle the differing stack frames when a priority change occurs and when no priority change occurs. + * configs/qemu-i486/ostest and nsh -- The QEMU i486 port is complete. + it now passes the OS test and supports the NuttShell (NSH). + * misc/drivers -- Created a new directory to hold non-BSD licensed + drivers that may be added into NuttX via an installation script. + * drivers/usbhost/usbhost_rtl8187.c -- A decision was made to + incorporate code taken from the Linux kernel. That changes the + licensing on this module to GPL. To avoid licensing contamination, + this driver was moved to misc/drivers/rtl8187x *prior* to adding + and of the GPL log. There is an INSTALL.sh script at the location + where the GPL driver(s) can be re-installed into the NuttX source + tree. By re-installing the driver, you agree to the GPL licsensing + and all of its implications. apps-5.20 2011-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> diff --git a/nuttx/configs/olimex-lpc1766stk/wlan/defconfig b/nuttx/configs/olimex-lpc1766stk/wlan/defconfig index cb5e24d98..58105751c 100755 --- a/nuttx/configs/olimex-lpc1766stk/wlan/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/wlan/defconfig @@ -816,7 +816,7 @@ CONFIG_EXAMPLES_NSH_DISABLEBG=n CONFIG_EXAMPLES_NSH_ROMFSETC=n CONFIG_EXAMPLES_NSH_CONSOLE=y CONFIG_EXAMPLES_NSH_TELNET=n -CONFIG_EXAMPLES_NSH_ARCHINIT=y +CONFIG_EXAMPLES_NSH_ARCHINIT=n CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512 CONFIG_EXAMPLES_NSH_DHCPC=n CONFIG_EXAMPLES_NSH_NOMAC=n diff --git a/nuttx/configs/qemu-i486/README.txt b/nuttx/configs/qemu-i486/README.txt index 3476f09e5..906591534 100644 --- a/nuttx/configs/qemu-i486/README.txt +++ b/nuttx/configs/qemu-i486/README.txt @@ -14,6 +14,7 @@ Contents * Toolchains - Cygwin Buildroot Toolchain - Buildroot Instructions + * FAQ * Configurations - ostest - nsh @@ -22,7 +23,7 @@ QEMU ==== QEMU is a generic and open source machine emulator and virtualizer. Here are -some links (which are mostly outdated by the time your read this): +some links (which will probably be mostly outdated by the time your read this): Home Page: http://wiki.qemu.org/Main_Page Downloads: http://wiki.qemu.org/Download @@ -34,7 +35,7 @@ Building QEMU tar zxf qemu-0.14.0.tar.gz cd qemu-0.14.0 - ./configure + ./configure --target-list=i386-softmmu make make install @@ -62,8 +63,8 @@ Cygwin Build Problems 2. Try building QEMU with MingGW (I understand that this is difficult). NOTE: As of this writing, I have not been successful getting ANY pre-built - version of QEMU to work successful; they all fail immediately with - initialization errors. + version of QEMU to work successfully with WinXP. The same binaries work + fine on Vista, however. Running QEMU ------------ @@ -72,6 +73,13 @@ Running QEMU qemu -cpu 486 -m 2 -kernel nuttx.elf -nographic + The -nographic option redirects COM1 to your console. However, the -nographic + option does not work under Cygwin. For simple testing under Cygwin, I use + + qemu -cpu 486 -m 2 -kernel nuttx.elf -serial file:test.txt + + which will send COM1 output to the file test.txt. + Toolchains ========== @@ -125,6 +133,12 @@ Buildroot Instructions detailed PLUS some special instructions that you will need to follow if you run into problems building the toolchain for Cygwin under Windows. +FAQ +=== + +Q: I get the following error message, "undefined reference to '__stack_chk_fail'" +A: Add -fno-stack-protector to ARCHCPUFLAGS in you Make.defs file. + Configurations ============== diff --git a/nuttx/drivers/usbhost/Make.defs b/nuttx/drivers/usbhost/Make.defs index 9587cab08..ffdb9c651 100644 --- a/nuttx/drivers/usbhost/Make.defs +++ b/nuttx/drivers/usbhost/Make.defs @@ -36,10 +36,16 @@ USBHOST_ASRCS = USBHOST_CSRCS = hid_parser.c +# Built-in USB driver logic + ifeq ($(CONFIG_USBHOST),y) USBHOST_CSRCS += usbhost_registry.c usbhost_registerclass.c usbhost_findclass.c USBHOST_CSRCS += usbhost_enumerate.c usbhost_storage.c usbhost_hidkbd.c + +# Add-on USB driver logic (see misc/drivers) + ifeq ($(CONFIG_NET),y) - USBHOST_CSRCS += usbhost_rtl8187.c + RTL8187_CSRC := ${shell if [ -f usbhost/rtl8187x.c ]; then echo "rtl8187x.c"; fi} + USBHOST_CSRCS += $(RTL8187_CSRC) endif endif |