sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add chip ID funcitions for Shenzhou and Cloudctrl boards; Extened NSH ifconfig command and improve DHCPC -- All from Darcy Gong

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5393 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-11-27 16:26:54 +00:00
parent 97c584ad91
commit 36463721d0
8 changed files with 214 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -3697,3 +3697,6 @@
Windows build.
* nuttx/arch/arm/src/lpc17xx/lpc17_i2c.c: Resources not being released when
I2C is uninitialized.
* cloudctrl/src/up_chipid.c and shenzhou/src/up_chipid.c: Add functions to
get chip ID. Contributed by Darcy Gong. These should not be board-dependent,
but should be in arch/arm/src/stm32 where they can be used from any board.

4
Documentation/NuttShell.html
View File

@ -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 9, 2012</p>
<p>Last Updated: November 27, 2012</p>
</td>
</tr>
</table>
@ -1219,7 +1219,7 @@ hexdump &lt;file or device&gt;
<p><b>Command Syntax:</b></p>
<ul><pre>
ifconfig [nic_name [ip]] [dr|gw|gateway &lt;dr-address&gt;] [netmask &lt;net-mask&gt;] [dns &lt;dns-address&gt;] [hw &lt;hw-mac&gt;]]
ifconfig [nic_name [&lt;ip-address&gt;|dhcp]] [dr|gw|gateway &lt;dr-address&gt;] [netmask &lt;net-mask&gt;] [dns &lt;dns-address&gt;] [hw &lt;hw-mac&gt;]]
</pre></ul>
<p>
<b>Synopsis</b>.

11
configs/cloudctrl/include/board.h
View File

@ -406,6 +406,17 @@ EXTERN void relays_resetmodes(uint32_t relays_stat);
EXTERN void relays_powermodes(uint32_t relays_stat);
#endif
/************************************************************************************
* Chip ID functions
*
* Description:
* Non-standard functions to obtain chip ID information.
*
************************************************************************************/
EXTERN const char *stm32_getchipid(void);
EXTERN const char *stm32_getchipid_string(void);
#undef EXTERN
#if defined(__cplusplus)
}

2
configs/cloudctrl/src/Makefile
View File

@ -41,7 +41,7 @@ CFLAGS += -I$(TOPDIR)/sched
ASRCS =
AOBJS = $(ASRCS:.S=$(OBJEXT))
CSRCS = up_boot.c up_spi.c
CSRCS = up_boot.c up_spi.c up_chipid.c
ifeq ($(CONFIG_HAVE_CXX),y)
CSRCS += up_cxxinitialize.c

93
configs/cloudctrl/src/up_chipid.c Normal file
View File

@ -0,0 +1,93 @@
/************************************************************************************
* configs/cloudctrl/src/up_chipid.c
* arch/arm/src/board/up_chipid.c
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
* Darcy Gong <darcy.gong@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 <nuttx/config.h>
#include <stdio.h>
#include <arch/board/board.h>
#include "up_arch.h"
/************************************************************************************
* Definitions
************************************************************************************/
/************************************************************************************
* Private Functions
************************************************************************************/
/************************************************************************************
* Public Functions
************************************************************************************/
const char *stm32_getchipid(void)
{
static char cpuid[12];
int i;
for (i = 0; i < 12; i++)
{
cpuid[i] = getreg8(0x1ffff7e8+i);
}
return cpuid;
}
const char *stm32_getchipid_string(void)
{
static char cpuid[27];
int c;
int i;
for (i = 0, c = 0; i < 12; i++)
{
sprintf(&cpuid[c], "%02X", getreg8(0x1ffff7e8+11-i));
c += 2;
if (i % 4 == 3)
{
cpuid[c++] = '-';
}
}
cpuid[26] = '\0';
return cpuid;
}

11
configs/shenzhou/include/board.h
View File

@ -452,6 +452,17 @@ EXTERN void relays_resetmodes(uint32_t relays_stat);
EXTERN void relays_powermodes(uint32_t relays_stat);
#endif
/************************************************************************************
* Chip ID functions
*
* Description:
* Non-standard functions to obtain chip ID information.
*
************************************************************************************/
EXTERN const char *stm32_getchipid(void);
EXTERN const char *stm32_getchipid_string(void);
#undef EXTERN
#if defined(__cplusplus)
}

2
configs/shenzhou/src/Makefile
View File

@ -40,7 +40,7 @@ CFLAGS += -I$(TOPDIR)/sched
ASRCS =
AOBJS = $(ASRCS:.S=$(OBJEXT))
CSRCS = up_boot.c up_spi.c up_mmcsd.c
CSRCS = up_boot.c up_spi.c up_mmcsd.c up_chipid.c
ifeq ($(CONFIG_HAVE_CXX),y)
CSRCS += up_cxxinitialize.c

92
configs/shenzhou/src/up_chipid.c Normal file
View File

@ -0,0 +1,92 @@
/************************************************************************************
* configs/shenzhou/src/up_chipid.c
* arch/arm/src/board/up_chipid.c
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* 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 <nuttx/config.h>
#include <stdio.h>
#include <arch/board/board.h>
#include "up_arch.h"
/************************************************************************************
* Definitions
************************************************************************************/
/************************************************************************************
* Private Functions
************************************************************************************/
/************************************************************************************
* Public Functions
************************************************************************************/
const char *stm32_getchipid(void)
{
static char cpuid[12];
int i;
for (i = 0; i < 12; i++)
{
cpuid[i] = getreg8(0x1ffff7e8+i);
}
return cpuid;
}
const char *stm32_getchipid_string(void)
{
static char cpuid[27];
int c;
int i;
for (i = 0, c = 0; i < 12; i++)
{
sprintf(&cpuid[c], "%02X", getreg8(0x1ffff7e8+11-i));
c += 2;
if (i % 4 == 3)
{
cpuid[c++] = '-';
}
}
cpuid[26] = '\0';
return cpuid;
}