diff options
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/ChangeLog | 1 | ||||
| -rw-r--r-- | nuttx/Documentation/NuttShell.html | 164 | ||||
| -rw-r--r-- | nuttx/Documentation/README.html | 72 | ||||
| -rw-r--r-- | nuttx/README.txt | 9 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/stm32/Kconfig | 1 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/stm32/chip/stm32_eth.h | 8 | ||||
| -rw-r--r-- | nuttx/libxx/Makefile | 7 | ||||
| -rw-r--r-- | nuttx/libxx/libxx_stdthrow.cxx | 74 |
8 files changed, 230 insertions, 106 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 9b2710233..39a4dff56 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -3584,3 +3584,4 @@ tool. * configs/stm32f4discovery/src/up_ug2864ambag01.c: Board-specific initialization for UG-2864AMBAG01 OLED connecte to STM32F4Disovery. + * libxx/libxx_stdthrow.cxx: Exception stubs from Petteri Aimonen. diff --git a/nuttx/Documentation/NuttShell.html b/nuttx/Documentation/NuttShell.html index 31546a100..1b14f96f6 100644 --- a/nuttx/Documentation/NuttShell.html +++ b/nuttx/Documentation/NuttShell.html @@ -8,7 +8,7 @@ <tr align="center" bgcolor="#e4e4e4"> <td> <h1><big><font color="#3c34ec"><i>NuttShell (NSH)</i></font></big></h1> - <p>Last Updated: November 4, 2012</p> + <p>Last Updated: November 9, 2012</p> </td> </tr> </table> @@ -173,187 +173,193 @@ <tr> <td><br></td> <td> - <a href="#cmdifconfig">2.16 Manage Network Configuration (ifconfig)</a> + <a href="#cmdhexdump">2.16 Hexadecimal Dump of File or Device (hexdump)</a> </td> </tr> <tr> <td><br></td> <td> - <a href="#cmdifdown">2.17 Take a network down (ifdown)</a> + <a href="#cmdifconfig">2.17 Manage Network Configuration (ifconfig)</a> </td> </tr> <tr> <td><br></td> <td> - <a href="#cmdifup">2.18 Bring a network up (ifup)</a> + <a href="#cmdifdown">2.18 Take a network down (ifdown)</a> </td> </tr> <tr> <td><br></td> <td> - <a href="#cmdkill">2.19 Send a signal to a task (kill)</a> + <a href="#cmdifup">2.19 Bring a network up (ifup)</a> </td> </tr> <tr> <td><br></td> <td> - <a href="#cmdlosetup">2.20 Setup/teardown the Loop Device (losetup)</a> + <a href="#cmdkill">2.20 Send a signal to a task (kill)</a> </td> </tr> <tr> <td><br></td> <td> - <a href="#cmdls">2.21 List Directory Contents (ls)</a> + <a href="#cmdlosetup">2.21 Setup/teardown the Loop Device (losetup)</a> </td> </tr> <tr> <td><br></td> <td> - <a href="#cmdmd5">2.22 Calculate MD5 (md5)</a> + <a href="#cmdls">2.22 List Directory Contents (ls)</a> </td> </tr> <tr> <td><br></td> <td> - <a href="#cmdmbhw">2.23 Access Memory (mb, mh, and mw)</a> + <a href="#cmdmd5">2.23 Calculate MD5 (md5)</a> </td> </tr> <tr> <td><br></td> <td> - <a href="#cmdps">2.24 Show Current Tasks and Threads (ps)</a> + <a href="#cmdmbhw">2.24 Access Memory (mb, mh, and mw)</a> </td> </tr> <tr> <td><br></td> <td> - <a href="#cmdmkdir">2.25 Create a Directory (mkdir)</a> + <a href="#cmdps">2.25 Show Current Tasks and Threads (ps)</a> </td> </tr> <tr> <td><br></td> <td> - <a href="#cmdmkfatfs">2.26 Create a FAT Filesystem (mkfatfs)</a> + <a href="#cmdmkdir">2.26 Create a Directory (mkdir)</a> </td> </tr> <tr> <td><br></td> <td> - <a href="#cmdmkfifo">2.27 Create a FIFO (mkfifo)</a> + <a href="#cmdmkfatfs">2.27 Create a FAT Filesystem (mkfatfs)</a> </td> </tr> <tr> <td><br></td> <td> - <a href="#cmdmkrd">2.28 Create a RAMDISK (mkrd)</a> + <a href="#cmdmkfifo">2.28 Create a FIFO (mkfifo)</a> </td> </tr> <tr> <td><br></td> <td> - <a href="#cmdmount">2.29 Mount a File System (mount)</a> + <a href="#cmdmkrd">2.29 Create a RAMDISK (mkrd)</a> </td> </tr> <tr> <td><br></td> <td> - <a href="#cmdmv">2.30 Rename a File (mv)</a> + <a href="#cmdmount">2.30 Mount a File System (mount)</a> </td> </tr> <tr> <td><br></td> <td> - <a href="#cmdnfsmount">2.31 Mount an NFS file system (nfsmount)</a> + <a href="#cmdmv">2.31 Rename a File (mv)</a> </td> </tr> <tr> <td><br></td> <td> - <a href="#cmdping">2.32 Check Network Peer (ping)</a> + <a href="#cmdnfsmount">2.32 Mount an NFS file system (nfsmount)</a> </td> </tr> <tr> <td><br></td> <td> - <a href="#cmdput">2.33 Send File Via TFTP (put)</a> + <a href="#cmdping">2.33 Check Network Peer (ping)</a> </td> </tr> <tr> <td><br></td> <td> - <a href="#cmdpwd">2.34 Show Current Working Directory (pwd)</a> + <a href="#cmdput">2.34 Send File Via TFTP (put)</a> </td> </tr> <tr> <td><br></td> <td> - <a href="#cmdrm">2.35 Remove a File (rm)</a> + <a href="#cmdpwd">2.35 Show Current Working Directory (pwd)</a> </td> </tr> <tr> <td><br></td> <td> - <a href="#cmdrmdir">2.36 Remove a Directory (rmdir)</a> + <a href="#cmdrm">2.36 Remove a File (rm)</a> </td> </tr> <tr> <td><br></td> <td> - <a href="#cmdset">2.37 Set an Environment Variable (set)</a> + <a href="#cmdrmdir">2.37 Remove a Directory (rmdir)</a> </td> </tr> <tr> <td><br></td> <td> - <a href="#cmdsh">2.38 Execute an NSH Script (sh)</a> + <a href="#cmdset">2.38 Set an Environment Variable (set)</a> </td> </tr> <tr> <td><br></td> <td> - <a href="#cmdsleep">2.39 Wait for Seconds (sleep)</a> + <a href="#cmdsh">2.39 Execute an NSH Script (sh)</a> </td> </tr> <tr> <td><br></td> <td> - <a href="#cmdunmount">2.40 Unmount a File System (umount)</a> + <a href="#cmdsleep">2.40 Wait for Seconds (sleep)</a> </td> </tr> <tr> <td><br></td> <td> - <a href="#cmdunset">2.41 Unset an Environment Variable (unset)</a> + <a href="#cmdunmount">2.41 Unmount a File System (umount)</a> </td> </tr> <tr> <td><br></td> <td> - <a href="#cmdurldec">2.42 URL Decode (urldecode)</a> + <a href="#cmdunset">2.42 Unset an Environment Variable (unset)</a> </td> </tr> <tr> <td><br></td> <td> - <a href="#cmdurlencode">2.43 URL Encode (urlencode)</a> + <a href="#cmdurldec">2.43 URL Decode (urldecode)</a> </td> </tr> <tr> <td><br></td> <td> - <a href="#cmdusleep">2.44 Wait for Microseconds (usleep)</a> + <a href="#cmdurlencode">2.44 URL Encode (urlencode)</a> </td> </tr> <tr> <td><br></td> <td> - <a href="#cmdwget">2.45 Get File Via HTTP (wget)</a> + <a href="#cmdusleep">2.45 Wait for Microseconds (usleep)</a> </td> </tr> <tr> <td><br></td> <td> - <a href="#cmdxd">2.46 Hexadecimal Dump (xd)</a> + <a href="#cmdwget">2.46 Get File Via HTTP (wget)</a> + </td> +</tr> +<tr> + <td><br></td> + <td> + <a href="#cmdxd">2.47 Hexadecimal Dump of Memory (xd)</a> </td> </tr> <tr> @@ -1182,7 +1188,31 @@ help [-v] [<cmd>] <table width ="100%"> <tr bgcolor="#e4e4e4"> <td> - <a name="cmdifconfig"><h2>2.16 Manage Network Configuration (ifconfig)</h2></a> + <a name="cmdhexdump"><h2>2.16 Hexadecimal Dump of File or Device (hexdump)</h2></a> + </td> + </tr> +</table> + +<p><b>Command Syntax:</b></p> +<ul><pre> +hexdump <file or device> +</pre></ul> +<p> + <b>Synopsis</b>. + Dump data in hexadecimal format from a file or character device. +</p> + +<tr> + <td><br></td> + <td> + <a href="#"></a> + </td> +</tr> + +<table width ="100%"> + <tr bgcolor="#e4e4e4"> + <td> + <a name="cmdifconfig"><h2>2.17 Manage Network Configuration (ifconfig)</h2></a> </td> </tr> </table> @@ -1236,7 +1266,7 @@ ifconfig nic_name ip_address <table width ="100%"> <tr bgcolor="#e4e4e4"> <td> - <a name="cmdifdown"><h2>2.17 Take a network down (ifdown)</h2></a> + <a name="cmdifdown"><h2>2.18 Take a network down (ifdown)</h2></a> </td> </tr> </table> @@ -1259,7 +1289,7 @@ ifdown eth0 <table width ="100%"> <tr bgcolor="#e4e4e4"> <td> - <a name="cmdifup"><h2>2.18 Bring a network up (ifup)</h2></a> + <a name="cmdifup"><h2>2.19 Bring a network up (ifup)</h2></a> </td> </tr> </table> @@ -1282,7 +1312,7 @@ ifup eth0 <table width ="100%"> <tr bgcolor="#e4e4e4"> <td> - <a name="cmdkill"><h2>2.19 Send a signal to a task (kill)</h2></a> + <a name="cmdkill"><h2>2.20 Send a signal to a task (kill)</h2></a> </td> </tr> </table> @@ -1323,7 +1353,7 @@ nsh> <table width ="100%"> <tr bgcolor="#e4e4e4"> <td> - <a name="cmdlosetup"><h2>2.20 Setup/teardown the Loop Device (losetup)</h2></a> + <a name="cmdlosetup"><h2>2.21 Setup/teardown the Loop Device (losetup)</h2></a> </td> </tr> </table> @@ -1376,7 +1406,7 @@ losetup d <dev-path> <table width ="100%"> <tr bgcolor="#e4e4e4"> <td> - <a name="cmdls"><h2>2.21 List Directory Contents (ls)</h2></a> + <a name="cmdls"><h2>2.22 List Directory Contents (ls)</h2></a> </td> </tr> </table> @@ -1413,7 +1443,7 @@ ls [-lRs] <dir-path> <table width ="100%"> <tr bgcolor="#e4e4e4"> <td> - <a name="cmdmd5"><h2>2.22 Calculate MD5 (md5)</h2></a> + <a name="cmdmd5"><h2>2.23 Calculate MD5 (md5)</h2></a> </td> </tr> </table> @@ -1430,7 +1460,7 @@ md5 [-f] <string or filepath> <table width ="100%"> <tr bgcolor="#e4e4e4"> <td> - <a name="cmdmbhw"><h2>2.23 Access Memory (mb, mh, and mw)</h2></a> + <a name="cmdmbhw"><h2>2.24 Access Memory (mb, mh, and mw)</h2></a> </td> </tr> </table> @@ -1484,7 +1514,7 @@ nsh> <table width ="100%"> <tr bgcolor="#e4e4e4"> <td> - <a name="cmdps"><h2>2.24 Show Current Tasks and Threads (ps)</h2></a> + <a name="cmdps"><h2>2.25 Show Current Tasks and Threads (ps)</h2></a> </td> </tr> </table> @@ -1510,7 +1540,7 @@ nsh> <table width ="100%"> <tr bgcolor="#e4e4e4"> <td> - <a name="cmdmkdir"><h2>2.25 Create a Directory (mkdir)</h2></a> + <a name="cmdmkdir"><h2>2.26 Create a Directory (mkdir)</h2></a> </td> </tr> </table> @@ -1545,7 +1575,7 @@ nsh> <table width ="100%"> <tr bgcolor="#e4e4e4"> <td> - <a name="cmdmkfatfs"><h2>2.26 Create a FAT Filesystem (mkfatfs)</h2></a> + <a name="cmdmkfatfs"><h2>2.27 Create a FAT Filesystem (mkfatfs)</h2></a> </td> </tr> </table> @@ -1565,7 +1595,7 @@ mkfatfs <path> <table width ="100%"> <tr bgcolor="#e4e4e4"> <td> - <a name="cmdmkfifo"><h2>2.27 Create a FIFO (mkfifo)</h2></a> + <a name="cmdmkfifo"><h2>2.28 Create a FIFO (mkfifo)</h2></a> </td> </tr> </table> @@ -1603,7 +1633,7 @@ nsh> <table width ="100%"> <tr bgcolor="#e4e4e4"> <td> - <a name="cmdmkrd"><h2>2.28 Create a RAMDISK (mkrd)</h2></a> + <a name="cmdmkrd"><h2>2.29 Create a RAMDISK (mkrd)</h2></a> </td> </tr> </table> @@ -1654,7 +1684,7 @@ nsh> <table width ="100%"> <tr bgcolor="#e4e4e4"> <td> - <a name="cmdmount"><h2>2.29 Mount a File System (mount)</h2></a> + <a name="cmdmount"><h2>2.30 Mount a File System (mount)</h2></a> </td> </tr> </table> @@ -1733,7 +1763,7 @@ nsh> mount <table width ="100%"> <tr bgcolor="#e4e4e4"> <td> - <a name="cmdmv"><h2>2.30 Rename a File (mv)</h2></a> + <a name="cmdmv"><h2>2.31 Rename a File (mv)</h2></a> </td> </tr> </table> @@ -1751,7 +1781,7 @@ mv <old-path> <new-path> <table width ="100%"> <tr bgcolor="#e4e4e4"> <td> - <a name="cmdnfsmount"><h2>2.31 Mount an NFS file system (nfsmount)</h2></a> + <a name="cmdnfsmount"><h2>2.32 Mount an NFS file system (nfsmount)</h2></a> </td> </tr> </table> @@ -1770,7 +1800,7 @@ nfsmount <server-address> <mount-point> <remote-path> <table width ="100%"> <tr bgcolor="#e4e4e4"> <td> - <a name="cmdping"><h2>2.32 Check Network Peer (ping)</h2></a> + <a name="cmdping"><h2>2.33 Check Network Peer (ping)</h2></a> </td> </tr> </table> @@ -1803,7 +1833,7 @@ nsh> <table width ="100%"> <tr bgcolor="#e4e4e4"> <td> - <a name="cmdput"><h2>2.33 Send File Via TFTP (put)</h2></a> + <a name="cmdput"><h2>2.34 Send File Via TFTP (put)</h2></a> </td> </tr> </table> @@ -1838,7 +1868,7 @@ put [-b|-n] [-f <remote-path>] -h <ip-address> <local-path> <table width ="100%"> <tr bgcolor="#e4e4e4"> <td> - <a name="cmdpwd"><h2>2.34 Show Current Working Directory (pwd)</h2></a> + <a name="cmdpwd"><h2>2.35 Show Current Working Directory (pwd)</h2></a> </td> </tr> </table> @@ -1868,7 +1898,7 @@ nsh> <table width ="100%"> <tr bgcolor="#e4e4e4"> <td> - <a name="cmdrm"><h2>2.35 Remove a File (rm)</h2></a> + <a name="cmdrm"><h2>2.36 Remove a File (rm)</h2></a> </td> </tr> </table> @@ -1902,7 +1932,7 @@ nsh> <table width ="100%"> <tr bgcolor="#e4e4e4"> <td> - <a name="cmdrmdir"><h2>2.36 Remove a Directory (rmdir)</h2></a> + <a name="cmdrmdir"><h2>2.37 Remove a Directory (rmdir)</h2></a> </td> </tr> </table> @@ -1937,7 +1967,7 @@ nsh> <table width ="100%"> <tr bgcolor="#e4e4e4"> <td> - <a name="cmdset"><h2>2.37 Set an Environment Variable (set)</h2></a> + <a name="cmdset"><h2>2.38 Set an Environment Variable (set)</h2></a> </td> </tr> </table> @@ -1963,7 +1993,7 @@ nsh> <table width ="100%"> <tr bgcolor="#e4e4e4"> <td> - <a name="cmdsh"><h2>2.38 Execute an NSH Script (sh)</h2></a> + <a name="cmdsh"><h2>2.39 Execute an NSH Script (sh)</h2></a> </td> </tr> </table> @@ -1981,7 +2011,7 @@ sh <script-path> <table width ="100%"> <tr bgcolor="#e4e4e4"> <td> - <a name="cmdsleep"><h2>2.39 Wait for Seconds (sleep)</h2></a> + <a name="cmdsleep"><h2>2.40 Wait for Seconds (sleep)</h2></a> </td> </tr> </table> @@ -1998,7 +2028,7 @@ sleep <sec> <table width ="100%"> <tr bgcolor="#e4e4e4"> <td> - <a name="cmdunmount"><h2>2.40 Unmount a File System (umount)</h2></a> + <a name="cmdunmount"><h2>2.41 Unmount a File System (umount)</h2></a> </td> </tr> </table> @@ -2028,7 +2058,7 @@ nsh> <table width ="100%"> <tr bgcolor="#e4e4e4"> <td> - <a name="cmdunset"><h2>2.41 Unset an Environment Variable (unset)</h2></a> + <a name="cmdunset"><h2>2.42 Unset an Environment Variable (unset)</h2></a> </td> </tr> </table> @@ -2054,7 +2084,7 @@ nsh> <table width ="100%"> <tr bgcolor="#e4e4e4"> <td> - <a name="cmdurldec"><h2>2.42 URL Decode (urldecode)</h2></a> + <a name="cmdurldec"><h2>2.43 URL Decode (urldecode)</h2></a> </td> </tr> </table> @@ -2071,7 +2101,7 @@ urldecode [-f] <string or filepath> <table width ="100%"> <tr bgcolor="#e4e4e4"> <td> - <a name="cmdurlencode"><h2>2.43 URL Encode (urlencode)</h2></a> + <a name="cmdurlencode"><h2>2.44 URL Encode (urlencode)</h2></a> </td> </tr> </table> @@ -2088,7 +2118,7 @@ urlencode [-f] <string or filepath> <table width ="100%"> <tr bgcolor="#e4e4e4"> <td> - <a name="cmdusleep"><h2>2.44 Wait for Microseconds (usleep)</h2></a> + <a name="cmdusleep"><h2>2.45 Wait for Microseconds (usleep)</h2></a> </td> </tr> </table> @@ -2105,7 +2135,7 @@ usleep <usec> <table width ="100%"> <tr bgcolor="#e4e4e4"> <td> - <a name="cmdwget">2.45 Get File Via HTTP (wget)</a> + <a name="cmdwget">2.46 Get File Via HTTP (wget)</a> </td> </tr> </table> @@ -2132,7 +2162,7 @@ wget [-o <local-path>] <url> <table width ="100%"> <tr bgcolor="#e4e4e4"> <td> - <a name="cmdxd"><h2>2.46 Hexadecimal dump (xd)</h2></a> + <a name="cmdxd"><h2>2.47 Hexadecimal Dump of Memory (xd)</h2></a> </td> </tr> </table> @@ -2272,6 +2302,11 @@ nsh> <td><code>CONFIG_NSH_DISABLE_HELP</code></td> </tr> <tr> + <td><b><code>hexdump</code></b></td> + <td><code>CONFIG_NFILE_DESCRIPTORS</code> > 0</td> + <td><code>CONFIG_NSH_DISABLE_HEXDUMP</code></td> + </tr> + <tr> <td><b><code>ifconfig</code></b></td> <td><code>CONFIG_NET</code></td> <td><code>CONFIG_NSH_DISABLE_IFCONFIG</code></td> @@ -3795,14 +3830,15 @@ mount -t vfat /dev/ram1 /tmp <li><a href="#cmdexec"><code>exec</code></a></li> <li><a href="#custapps"><code>exec_namedapp()</code></a></li> <li><a href="#cmdexit"><code>exit</code></a></li> + <li><a href="#cmdfree"><code>free</code></a></li> </ul></td> <td></ul> - <li><a href="#cmdfree"><code>free</code></a></li> <li><a href="#custoncmds"><code>g_cmdmap</code></a></li> <li><a href="#custinit"><code>genromfs</code></a></li> <li><a href="#cmdget"><code>get</code></a></li> <li><a href="#frontend">Greeting</a></li> <li><a href="#cmdhelp"><code>help</code></a></li> + <li><a href="#cmdhexdump"><code>hexdump</code></a></li> <li><a href="#conditional"><code>if-then[-else]-fi</code></a></li> <li><a href="#cmdifconfig"><code>ifconfig</code></a></li> <li><a href="#cmdifdown"><code>ifdown</code></a></li> diff --git a/nuttx/Documentation/README.html b/nuttx/Documentation/README.html index 7c82c3f15..61d5c43af 100644 --- a/nuttx/Documentation/README.html +++ b/nuttx/Documentation/README.html @@ -246,38 +246,46 @@ | | `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/nuttx/syscall/README.txt"><b><i>README.txt</i></b></a> | `- tools/ | `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/nuttx/tools/README.txt"><b><i>README.txt</i></b></a> - `- apps/ - |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/README.txt"><b>README.txt</b></a> - |- examples/ - | |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/examples/json/README.txt">json/README.txt</a> - | |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/examples/pashello/README.txt">pashello/README.txt</a> - | `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/examples/README.txt"><b><i>README.txt</i></b></a> - |- graphics/ - | `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/graphics/tiff/README.txt">"<b><i>tiff/README.txt</i></b></a> - |- interpreters/ - | |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/interpreters/ficl/README.txt"><b><i>ficl/README.txt</i></b></a> - | `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/interpreters/README.txt"><b><i>README.txt</i></b></a> - |- modbus/ - | `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/modbus/README.txt"><b><i>README.txt</i></b></a> - |- netutils/ - | | |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/netutils/discover/README.txt">discover/README.txt</a> - | | |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/netutils/ftpc/README.txt">ftpc/README.txt</a> - | | |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/netutils/json/README.txt">json/README.txt</a> - | | |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/netutils/telnetd/README.txt">telnetd/README.txt</a> - | `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/netutils/README.txt"><b><i>README.txt</i></b></a> - |- nshlib/ - | `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/nshlib/README.txt"><b><i>README.txt</i></b></a> - |- NxWidgets/ - | `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/NxWidgets/README.txt"><b><i>README.txt</i></b></a> - `- system/ - |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/i2c/README.txt"><b><i>i2c/README.txt</i></b></a> - |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/free/README.txt">free/README.txt</a> - |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/install/README.txt">install/README.txt</a> - |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/poweroff/README.txt">poweroff/README.txt</a> - |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/ramtron/README.txt">ramtron/README.txt</a> - |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/sdcard/README.txt">sdcard/README.txt</a> - |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/sysinfo/README.txt">sysinfo/README.txt</a> - `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/sdcard/README.txt"><b><i>README.txt</i></b></a> + |- apps/ + | |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/README.txt"><b>README.txt</b></a> + | |- examples/ + | | |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/examples/json/README.txt">json/README.txt</a> + | | |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/examples/pashello/README.txt">pashello/README.txt</a> + | | `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/examples/README.txt"><b><i>README.txt</i></b></a> + | |- graphics/ + | | `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/graphics/tiff/README.txt">"<b><i>tiff/README.txt</i></b></a> + | |- interpreters/ + | | |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/interpreters/ficl/README.txt"><b><i>ficl/README.txt</i></b></a> + | | `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/interpreters/README.txt"><b><i>README.txt</i></b></a> + | |- modbus/ + | | `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/modbus/README.txt"><b><i>README.txt</i></b></a> + | |- netutils/ + | | | |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/netutils/discover/README.txt">discover/README.txt</a> + | | | |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/netutils/ftpc/README.txt">ftpc/README.txt</a> + | | | |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/netutils/json/README.txt">json/README.txt</a> + | | | |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/netutils/telnetd/README.txt">telnetd/README.txt</a> + | | `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/netutils/README.txt"><b><i>README.txt</i></b></a> + | |- nshlib/ + | | `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/nshlib/README.txt"><b><i>README.txt</i></b></a> + | |- NxWidgets/ + | | `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/NxWidgets/README.txt"><b><i>README.txt</i></b></a> + | `- system/ + | |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/i2c/README.txt"><b><i>i2c/README.txt</i></b></a> + | |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/free/README.txt">free/README.txt</a> + | |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/install/README.txt">install/README.txt</a> + | |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/poweroff/README.txt">poweroff/README.txt</a> + | |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/ramtron/README.txt">ramtron/README.txt</a> + | |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/sdcard/README.txt">sdcard/README.txt</a> + | |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/sysinfo/README.txt">sysinfo/README.txt</a> + | `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/sdcard/README.txt"><b><i>README.txt</i></b></a> + `- NxWidgets + |- Doxygen + | `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/NxWidgets/Doxygen/README.txt"><b><i>README.txt</i></b></a> + |- tools + | `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/NxWidgets/tools/README.txt"><b><i>README.txt</i></b></a> + |- UnitTests + | `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/NxWidgets/UnitTests/README.txt"><b><i>README.txt</i></b></a> + `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/NxWidgets/README.txt"><b><i>README.txt</i></b></a> </pre></ul> </body> </html> diff --git a/nuttx/README.txt b/nuttx/README.txt index ee7f62588..85bb7f381 100644 --- a/nuttx/README.txt +++ b/nuttx/README.txt @@ -894,3 +894,12 @@ apps | `- sysinfo | `- README.txt `- README.txt + + NxWidgets + |- Doxygen + | `- README.txt + |- tools + | `- README.txt + |- UnitTests + | `- README.txt + `- README.txt diff --git a/nuttx/arch/arm/src/stm32/Kconfig b/nuttx/arch/arm/src/stm32/Kconfig index 047359ea0..a0e3fab0c 100644 --- a/nuttx/arch/arm/src/stm32/Kconfig +++ b/nuttx/arch/arm/src/stm32/Kconfig @@ -180,7 +180,6 @@ config STM32_STM32F10XX config STM32_VALUELINE bool - select ARMV7M_CMNVECTOR config STM32_HIGHDENSITY bool diff --git a/nuttx/arch/arm/src/stm32/chip/stm32_eth.h b/nuttx/arch/arm/src/stm32/chip/stm32_eth.h index a4a109d01..92a229ccc 100644 --- a/nuttx/arch/arm/src/stm32/chip/stm32_eth.h +++ b/nuttx/arch/arm/src/stm32/chip/stm32_eth.h @@ -835,14 +835,6 @@ struct eth_rxdesc_s * Public Functions ****************************************************************************************************/ -#undef EXTERN -#if defined(__cplusplus) -#define EXTERN extern "C" -extern "C" { -#else -#define EXTERN extern -#endif - #endif /* __ASSEMBLY__ */ #endif /* STM32_NETHERNET > 0 */ #endif /* __ARCH_ARM_SRC_STM32_CHIP_STM32_ETH_H */ diff --git a/nuttx/libxx/Makefile b/nuttx/libxx/Makefile index a749269b0..584af4e96 100644 --- a/nuttx/libxx/Makefile +++ b/nuttx/libxx/Makefile @@ -46,7 +46,12 @@ CXXSRCS = libxx_cxapurevirtual.cxx libxx_eabi_atexit.cxx libxx_cxa_atexit.cxx # uClibx++ replaces them ifneq ($(CONFIG_UCLIBCXX),y) -CXXSRCS += libxx_delete.cxx libxx_deletea.cxx libxx_new.cxx libxx_newa.cxx +CXXSRCS += libxx_delete.cxx libxx_deletea.cxx libxx_new.cxx libxx_newa.cxx +CXXSRCS += libxx_stdthrow.cxx +else +ifneq ($(UCLIBCXX_EXCEPTION),y) +CXXSRCS += libxx_stdthrow.cxx +endif endif # Paths diff --git a/nuttx/libxx/libxx_stdthrow.cxx b/nuttx/libxx/libxx_stdthrow.cxx new file mode 100644 index 000000000..588fae264 --- /dev/null +++ b/nuttx/libxx/libxx_stdthrow.cxx @@ -0,0 +1,74 @@ +//*************************************************************************** +// libxx/libxx_newa.cxx +// +// Copyright (C) 2012 Gregory Nutt. All rights reserved. +// Author: Petteri Aimonen <petteri.aimonen@gmail.com>; +// +// 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. +// +//*************************************************************************** + +//*************************************************************************** +// Included Files +//*************************************************************************** + +#include <cstdlib> +#include <debug.h> + +//*************************************************************************** +// Definitions +//*************************************************************************** + +//*************************************************************************** +// Private Data +//*************************************************************************** + +//*************************************************************************** +// Public Functions +//*************************************************************************** + +namespace std +{ + void __throw_out_of_range(const char*) + { + dbg("C++: Vector .at() with argument out of range\n"); + abort(); + } + + void __throw_length_error(const char*) + { + dbg("C++: Vector resize to excessive length\n"); + abort(); + } + + void __throw_bad_alloc() + { + dbg("C++: Bad allocation\n"); + abort(); + } +} |