Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 14:53:47 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Changes from review of last PR

Browse Source
This commit is contained in:
Gregory Nutt
2017-02-19 14:58:37 -06:00
parent b566baaf5c
commit 0fc226dd53
18 changed files with 61 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Documentation/README.html
+3 -1
View File
@@ -8,7 +8,7 @@
<tr align="center" bgcolor="#e4e4e4"> <tr align="center" bgcolor="#e4e4e4">
<td> <td>
<h1><big><font color="#3c34ec"><i>NuttX README Files</i></font></big></h1> <h1><big><font color="#3c34ec"><i>NuttX README Files</i></font></big></h1>
<p>Last Updated: February 14, 2017</p> <p>Last Updated: February 19, 2017</p>
</td> </td>
</tr> </tr>
</table> </table>
@@ -287,6 +287,8 @@ nuttx/
| | `- <a href="https://bitbucket.org/nuttx/nuttx/src/master/configs/tm4c1294-launchpad/README.txt" target="_blank"><b><i>README.txt</i></b></a> | | `- <a href="https://bitbucket.org/nuttx/nuttx/src/master/configs/tm4c1294-launchpad/README.txt" target="_blank"><b><i>README.txt</i></b></a>
| |- twr-k60n512/ | |- twr-k60n512/
| | `- <a href="https://bitbucket.org/nuttx/nuttx/src/master/configs/twr-k60n512/README.txt" target="_blank"><b><i>README.txt</i></b></a> | | `- <a href="https://bitbucket.org/nuttx/nuttx/src/master/configs/twr-k60n512/README.txt" target="_blank"><b><i>README.txt</i></b></a>
| |- twr-k64f120m/
| | `- <a href="https://bitbucket.org/nuttx/nuttx/src/master/configs/twr-k64f120m/README.txt" target="_blank"><b><i>README.txt</i></b></a>
| |- "u-blox-c027/ | |- "u-blox-c027/
| | `- <a href="https://bitbucket.org/nuttx/nuttx/src/master/configs/u-blox-c027/README.txt" target="_blank"><b><i>README.txt</i></b></a> | | `- <a href="https://bitbucket.org/nuttx/nuttx/src/master/configs/u-blox-c027/README.txt" target="_blank"><b><i>README.txt</i></b></a>
| |- ubw32/ | |- ubw32/
README.txt
+2
View File
@@ -1671,6 +1671,8 @@ nuttx/
| | `- README.txt | | `- README.txt
| |- twr-k60n512/ | |- twr-k60n512/
| | `- README.txt | | `- README.txt
| |- twr-k64f120m/
| | `- README.txt
| |- u-blox-co27/ | |- u-blox-co27/
| | `- README.txt | | `- README.txt
| |- ubw32/ | |- ubw32/
arch/arm/src/kinetis/kinetis_enet.c
+11 -8
View File
@@ -164,6 +164,7 @@
#else #else
# error "Unrecognized or missing PHY selection" # error "Unrecognized or missing PHY selection"
#endif #endif
#define BOARD_PHY_10BASET(s) (((s) & (1 << MII_PHYCTRL2_MODE_SHIFT)) != 0) #define BOARD_PHY_10BASET(s) (((s) & (1 << MII_PHYCTRL2_MODE_SHIFT)) != 0)
#define BOARD_PHY_100BASET(s) (((s) & (2 << MII_PHYCTRL2_MODE_SHIFT)) != 0) #define BOARD_PHY_100BASET(s) (((s) & (2 << MII_PHYCTRL2_MODE_SHIFT)) != 0)
#define BOARD_PHY_ISDUPLEX(s) (((s) & (4 << MII_PHYCTRL2_MODE_SHIFT)) != 0) #define BOARD_PHY_ISDUPLEX(s) (((s) & (4 << MII_PHYCTRL2_MODE_SHIFT)) != 0)
@@ -207,7 +208,6 @@
# define SIM_SOPT2_RMIISRC SIM_SOPT2_RMIISRC_EXTBYP # define SIM_SOPT2_RMIISRC SIM_SOPT2_RMIISRC_EXTBYP
#endif #endif
/**************************************************************************** /****************************************************************************
* Private Types * Private Types
****************************************************************************/ ****************************************************************************/
@@ -1757,7 +1757,7 @@ static inline int kinetis_initphy(struct kinetis_driver_s *priv)
/* Start auto negotiation */ /* Start auto negotiation */
ninfo("%s: Start autonegotiation...\n", BOARD_PHY_NAME); ninfo("%s: Start Autonegotiation...\n", BOARD_PHY_NAME);
kinetis_writemii(priv, phyaddr, MII_MCR, kinetis_writemii(priv, phyaddr, MII_MCR,
(MII_MCR_ANRESTART | MII_MCR_ANENABLE)); (MII_MCR_ANRESTART | MII_MCR_ANENABLE));
@@ -1772,10 +1772,12 @@ static inline int kinetis_initphy(struct kinetis_driver_s *priv)
BOARD_PHY_NAME, ret); BOARD_PHY_NAME, ret);
return ret; return ret;
} }
if (phydata & MII_MSR_ANEGCOMPLETE) if (phydata & MII_MSR_ANEGCOMPLETE)
{ {
break; break;
} }
usleep(LINK_WAITUS); usleep(LINK_WAITUS);
} }
@@ -1786,14 +1788,14 @@ static inline int kinetis_initphy(struct kinetis_driver_s *priv)
} }
else else
{ {
/* TODO: autonegotitation has right now failed. Maybe the Eth cable is not connected. /* TODO: Autonegotitation has right now failed. Maybe the Eth cable is not connected.
PHY chip have mechanisms to configure link OK. We should leave autconf on, PHY chip have mechanisms to configure link OK. We should leave autconf on,
and find a way to re-configure MCU whenever the link is ready. */ and find a way to re-configure MCU whenever the link is ready. */
ninfo("%s: Autonegotiation failed (is cable plugged-in ?), default to 10Mbs mode\n", \ ninfo("%s: Autonegotiation failed (is cable plugged-in ?), default to 10Mbs mode\n", \
BOARD_PHY_NAME); BOARD_PHY_NAME);
/* Stop auto negociation */ /* Stop auto negotiation */
kinetis_writemii(priv, phyaddr, MII_MCR, 0); kinetis_writemii(priv, phyaddr, MII_MCR, 0);
} }
@@ -1809,7 +1811,6 @@ static inline int kinetis_initphy(struct kinetis_driver_s *priv)
return ret; return ret;
} }
ninfo("%s: BOARD_PHY_STATUS: %04x\n", BOARD_PHY_NAME, phydata); ninfo("%s: BOARD_PHY_STATUS: %04x\n", BOARD_PHY_NAME, phydata);
/* Set up the transmit and receive control registers based on the /* Set up the transmit and receive control registers based on the
@@ -1862,7 +1863,7 @@ static inline int kinetis_initphy(struct kinetis_driver_s *priv)
} }
else else
{ {
/* This might happen if autonegotiation did not complete(?) */ /* This might happen if Autonegotiation did not complete(?) */
nerr("ERROR: Neither 10- nor 100-BaseT reported: PHY STATUS=%04x\n", nerr("ERROR: Neither 10- nor 100-BaseT reported: PHY STATUS=%04x\n",
phydata); phydata);
@@ -2151,8 +2152,10 @@ int kinetis_netinitialize(int intf)
#ifdef CONFIG_NET_ETHERNET #ifdef CONFIG_NET_ETHERNET
/* Determine a semi-unique MAC address from MCU UID /* Determine a semi-unique MAC address from MCU UID
We use UID Low and Mid Low registers to get 64 bits, from which we keep 48 bits. * We use UID Low and Mid Low registers to get 64 bits, from which we keep
We then force unicast and locally administered bits (b0 and b1, 1st octet) */ * 48 bits. We then force unicast and locally administered bits (b0 and b1,
* 1st octet)
*/
uint32_t uidl = getreg32(KINETIS_SIM_UIDL); uint32_t uidl = getreg32(KINETIS_SIM_UIDL);
uint32_t uidml = getreg32(KINETIS_SIM_UIDML); uint32_t uidml = getreg32(KINETIS_SIM_UIDML);
configs/Kconfig
+11 -11
View File
@@ -71,12 +71,12 @@ config ARCH_BOARD_CLOUDCTRL
board design. board design.
config ARCH_BOARD_DEMOS92S12NEC64 config ARCH_BOARD_DEMOS92S12NEC64
bool "Freescale DMO9S12NE64 board" bool "NXP/FreeScale DMO9S12NE64 board"
depends on ARCH_CHIP_MCS92S12NEC64 depends on ARCH_CHIP_MCS92S12NEC64
select ARCH_HAVE_LEDS select ARCH_HAVE_LEDS
select ARCH_HAVE_BUTTONS select ARCH_HAVE_BUTTONS
---help--- ---help---
Freescale DMO9S12NE64 board based on the MC9S12NE64 hcs12 cpu. This NXP/FreeScale DMO9S12NE64 board based on the MC9S12NE64 hcs12 cpu. This
port uses the m9s12x GCC toolchain. STATUS: (Still) under development; it port uses the m9s12x GCC toolchain. STATUS: (Still) under development; it
is code complete but has not yet been verified. is code complete but has not yet been verified.
@@ -185,7 +185,7 @@ config ARCH_BOARD_FREEDOM_K64F
select ARCH_HAVE_IRQBUTTONS select ARCH_HAVE_IRQBUTTONS
---help--- ---help---
development board. development board.
This port uses the FreeScale FREEDOM-K64F development board. This This port uses the NXP/FreeScale FREEDOM-K64F development board. This
board uses the Kinetis K64 MK64FN1M0VLL12 Cortex-M4 MCU. board uses the Kinetis K64 MK64FN1M0VLL12 Cortex-M4 MCU.
config ARCH_BOARD_FREEDOM_K66F config ARCH_BOARD_FREEDOM_K66F
@@ -196,23 +196,23 @@ config ARCH_BOARD_FREEDOM_K66F
select ARCH_HAVE_IRQBUTTONS select ARCH_HAVE_IRQBUTTONS
---help--- ---help---
development board. development board.
This port uses the FreeScale FREEDOM-K66F development board. This This port uses the NXP/FreeScale FREEDOM-K66F development board. This
board uses the Kinetis K66 MK66FN2M0VMD18 Cortex-M4 MCU. board uses the Kinetis K66 MK66FN2M0VMD18 Cortex-M4 MCU.
config ARCH_BOARD_FREEDOM_KL25Z config ARCH_BOARD_FREEDOM_KL25Z
bool "Freescale Freedom KL25Z" bool "NXP/FreeScale Freedom KL25Z"
depends on ARCH_CHIP_MKL25Z128 depends on ARCH_CHIP_MKL25Z128
select ARCH_HAVE_LEDS select ARCH_HAVE_LEDS
---help--- ---help---
This is the configuration for the Freescale Freedom KL25Z board. This This is the configuration for the NXP/FreeScale Freedom KL25Z board. This
board has the K25Z120LE3AN chip with a built-in SDA debugger. board has the K25Z120LE3AN chip with a built-in SDA debugger.
config ARCH_BOARD_FREEDOM_KL26Z config ARCH_BOARD_FREEDOM_KL26Z
bool "Freescale Freedom KL26Z" bool "NXP/FreeScale Freedom KL26Z"
depends on ARCH_CHIP_MKL26Z128 depends on ARCH_CHIP_MKL26Z128
select ARCH_HAVE_LEDS select ARCH_HAVE_LEDS
---help--- ---help---
This is the configuration for the Freescale Freedom KL26Z board. This This is the configuration for the NXP/FreeScale Freedom KL26Z board. This
board has the K26Z128VLH4 chip with a built-in SDA debugger. board has the K26Z128VLH4 chip with a built-in SDA debugger.
config ARCH_BOARD_HYMINI_STM32V config ARCH_BOARD_HYMINI_STM32V
@@ -235,13 +235,13 @@ config ARCH_BOARD_LINCOLN60
Micromint Lincoln 60 board using the NXP LPC1769 MCU. Micromint Lincoln 60 board using the NXP LPC1769 MCU.
config ARCH_BOARD_KWIKSTIK_K40 config ARCH_BOARD_KWIKSTIK_K40
bool "FreeScale KwikStik-K40 development board" bool "NXP/FreeScale KwikStik-K40 development board"
depends on ARCH_CHIP_MK40X256VLQ100 depends on ARCH_CHIP_MK40X256VLQ100
select ARCH_HAVE_LEDS select ARCH_HAVE_LEDS
select ARCH_HAVE_BUTTONS select ARCH_HAVE_BUTTONS
select ARCH_HAVE_IRQBUTTONS select ARCH_HAVE_IRQBUTTONS
---help--- ---help---
Kinetis K40 Cortex-M4 MCU. This port uses the FreeScale KwikStik-K40 Kinetis K40 Cortex-M4 MCU. This port uses the NXP/FreeScale KwikStik-K40
development board. development board.
config ARCH_BOARD_LAUNCHXL_TMS57004 config ARCH_BOARD_LAUNCHXL_TMS57004
@@ -387,7 +387,7 @@ config ARCH_BOARD_MX1ADS
select ARCH_HAVE_LEDS select ARCH_HAVE_LEDS
---help--- ---help---
This is a port to the Motorola MX1ADS development board. That board This is a port to the Motorola MX1ADS development board. That board
is based on the Freescale i.MX1 processor. The i.MX1 is an ARM920T. is based on the NXP/FreeScale i.MX1 processor. The i.MX1 is an ARM920T.
STATUS: This port is nearly code complete but was never fully STATUS: This port is nearly code complete but was never fully
integrated due to tool-related issues. integrated due to tool-related issues.
configs/README.txt
+9 -5
View File
@@ -207,7 +207,7 @@ configs/cloudctrl
the STM32F107VC MCU. the STM32F107VC MCU.
configs/demo9s12ne64 configs/demo9s12ne64
Freescale DMO9S12NE64 board based on the MC9S12NE64 hcs12 cpu. This NXP/FreeScale DMO9S12NE64 board based on the MC9S12NE64 hcs12 cpu. This
port uses the m9s12x GCC toolchain. STATUS: (Still) under development; it port uses the m9s12x GCC toolchain. STATUS: (Still) under development; it
is code complete but has not yet been verified. is code complete but has not yet been verified.
@@ -266,12 +266,12 @@ configs/fire-stm32v2
the boards are supported but only version 2 has been tested. the boards are supported but only version 2 has been tested.
configs/freedom-k64f configs/freedom-k64f
This port uses the FreeScale FREEDOM-K64F development board. This board This port uses the NXP/FreeScale FREEDOM-K64F development board. This board
uses the Kinetis K64 MK64FN1M0VLL12 Cortex-M4 MCU. uses the Kinetis K64 MK64FN1M0VLL12 Cortex-M4 MCU.
configs/freedom-kl25z configs/freedom-kl25z
configs/freedom-kl26z configs/freedom-kl26z
These configurations are for the Freescale Freedom KL25Z and very similar These configurations are for the NXP/FreeScale Freedom KL25Z and very similar
KL26Z board. The Freedom-KL25Z features the K25Z120LE3AN chip; the KL26Z board. The Freedom-KL25Z features the K25Z120LE3AN chip; the
Freedom-KL26Z has the K26Z128VLH4 chip. These are separate configurations Freedom-KL26Z has the K26Z128VLH4 chip. These are separate configurations
because of minor differences in the on-board logic. Both include a because of minor differences in the on-board logic. Both include a
@@ -282,7 +282,7 @@ configs/hymini-stm32v
STM32F103VCT chip. STM32F103VCT chip.
configs/kwikstik-k40. configs/kwikstik-k40.
Kinetis K40 Cortex-M4 MCU. This port uses the FreeScale KwikStik-K40 Kinetis K40 Cortex-M4 MCU. This port uses the NXP/FreeScale KwikStik-K40
development board. development board.
configs/launchxl-tms57004 configs/launchxl-tms57004
@@ -375,7 +375,7 @@ configs/moxa
configs/mx1ads configs/mx1ads
This is a port to the Motorola MX1ADS development board. That board This is a port to the Motorola MX1ADS development board. That board
is based on the Freescale i.MX1 processor. The i.MX1 is an ARM920T. is based on the NXP/FreeScale i.MX1 processor. The i.MX1 is an ARM920T.
STATUS: This port is nearly code complete but was never fully STATUS: This port is nearly code complete but was never fully
integrated due to tool-related issues. integrated due to tool-related issues.
@@ -737,6 +737,10 @@ configs/twr-k60n512
Kinetis K60 Cortex-M4 MCU. This port uses the FreeScale TWR-K60N512 Kinetis K60 Cortex-M4 MCU. This port uses the FreeScale TWR-K60N512
development board. development board.
configs/twr-k64f120m
Kinetis K64 Cortex-M4 MCU. This port uses the FreeScale TWR-K64F120M
development board.
configs/ubw32 configs/ubw32
This is the port to the Sparkfun UBW32 board. This port uses the original v2.4 This is the port to the Sparkfun UBW32 board. This port uses the original v2.4
configs/twr-k64f120m/Kconfig
+1 -2
View File
@@ -33,5 +33,4 @@ config TWR_K64F120M_SDHC_AUTOMOUNT_UDELAY
default 2000 default 2000
endif # TWR_K64F120M_SDHC_AUTOMOUNT endif # TWR_K64F120M_SDHC_AUTOMOUNT
endif # ARCH_BOARD_TWR_K64F120M
endif
configs/twr-k64f120m/include/board.h
+6 -7
View File
@@ -1,8 +1,7 @@
/************************************************************************************ /************************************************************************************
* configs/twr-k60n512/include/board.h * configs/twr-k64f120m/include/board.h
* include/arch/board/board.h
* *
* Copyright (C) 2011 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -34,8 +33,8 @@
* *
************************************************************************************/ ************************************************************************************/
#ifndef __ARCH_BOARD_BOARD_H #ifndef __CONFIGS_TWR_K64F120M_INCLUDE_BOARCH_H
#define __ARCH_BOARD_BOARD_H #define __CONFIGS_TWR_K64F120M_INCLUDE_BOARCH_H
/************************************************************************************ /************************************************************************************
* Included Files * Included Files
@@ -187,7 +186,7 @@ extern "C" {
* *
************************************************************************************/ ************************************************************************************/
EXTERN void kinetis_boardinitialize(void); void kinetis_boardinitialize(void);
#undef EXTERN #undef EXTERN
#if defined(__cplusplus) #if defined(__cplusplus)
@@ -195,4 +194,4 @@ EXTERN void kinetis_boardinitialize(void);
#endif #endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __ARCH_BOARD_BOARD_H */ #endif /* __CONFIGS_TWR_K64F120M_INCLUDE_BOARCH_H */
configs/twr-k64f120m/netnsh/Make.defs
+1 -1
View File
@@ -1,7 +1,7 @@
############################################################################ ############################################################################
# configs/twr-k64f120m/netnsh/Make.defs # configs/twr-k64f120m/netnsh/Make.defs
# #
# Copyright (C) 2011 Gregory Nutt. All rights reserved. # Copyright (C) 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
configs/twr-k64f120m/netnsh/setenv.sh
+1 -1
View File
@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# configs/twr-k64f120m/netnsh/setenv.sh # configs/twr-k64f120m/netnsh/setenv.sh
# #
# Copyright (C) 2011 Gregory Nutt. All rights reserved. # Copyright (C) 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
configs/twr-k64f120m/nsh/Make.defs
+1 -1
View File
@@ -1,7 +1,7 @@
############################################################################ ############################################################################
# configs/twr-k64f120m/nsh/Make.defs # configs/twr-k64f120m/nsh/Make.defs
# #
# Copyright (C) 2011 Gregory Nutt. All rights reserved. # Copyright (C) 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
configs/twr-k64f120m/nsh/setenv.sh
+1 -1
View File
@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# configs/twr-k64f120m/nsh/setenv.sh # configs/twr-k64f120m/nsh/setenv.sh
# #
# Copyright (C) 2011 Gregory Nutt. All rights reserved. # Copyright (C) 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
configs/twr-k64f120m/scripts/ld.script
+1 -1
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* configs/twr-k64f120m/scripts/ld.script * configs/twr-k64f120m/scripts/ld.script
* *
* Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
configs/twr-k64f120m/src/Makefile
+5 -5
View File
@@ -1,7 +1,7 @@
############################################################################ ############################################################################
# configs/twr-k64f120m/src/Makefile # configs/twr-k64f120m/src/Makefile
# #
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Copyright (C) 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,7 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
ASRCS = ASRCS =
#CSRCS = k60_boot.c k60_spi.c #CSRCS = k64_boot.c k64_spi.c
CSRCS = k64_boot.c CSRCS = k64_boot.c
ifeq ($(CONFIG_ARCH_LEDS),y) ifeq ($(CONFIG_ARCH_LEDS),y)
@@ -44,7 +44,7 @@ CSRCS += k64_leds.c
endif endif
ifeq ($(CONFIG_ARCH_BUTTONS),y) ifeq ($(CONFIG_ARCH_BUTTONS),y)
#CSRCS += k60_buttons.c #CSRCS += k64_buttons.c
endif endif
ifeq ($(CONFIG_LIB_BOARDCTL),y) ifeq ($(CONFIG_LIB_BOARDCTL),y)
@@ -59,11 +59,11 @@ endif
endif endif
ifeq ($(CONFIG_USBDEV),y) ifeq ($(CONFIG_USBDEV),y)
#CSRCS += k60_usbdev.c #CSRCS += k64_usbdev.c
endif endif
ifeq ($(CONFIG_USBMSC),y) ifeq ($(CONFIG_USBMSC),y)
#CSRCS += k60_usbmsc.c #CSRCS += k64_usbmsc.c
endif endif
include $(TOPDIR)/configs/Board.mk include $(TOPDIR)/configs/Board.mk
configs/twr-k64f120m/src/k64_appinit.c
+2 -22
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* config/twr-k64f120m/src/k64_appinit.c * config/twr-k64f120m/src/k64_appinit.c
* *
* Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -55,26 +55,6 @@
#include "kinetis.h" #include "kinetis.h"
#include "twrk64.h" #include "twrk64.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/* Configuration ************************************************************/
/****************************************************************************
* Private Types
****************************************************************************/
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Private Functions
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/
@@ -123,9 +103,9 @@ int board_app_initialize(uintptr_t arg)
} }
#endif #endif
#ifdef HAVE_MMCSD #ifdef HAVE_MMCSD
/* Initialize the MMC/SD driver and possible automount */ /* Initialize the MMC/SD driver and possible automount */
return k64_sdhc_initialize(); return k64_sdhc_initialize();
#endif #endif
return OK; return OK;
configs/twr-k64f120m/src/k64_automount.c
+2 -14
View File
@@ -1,7 +1,7 @@
/************************************************************************************ /************************************************************************************
* configs/twr-k64f120m/src/k64_automount.c * configs/twr-k64f120m/src/k64_automount.c
* *
* Copyright (C) 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -53,22 +53,10 @@
#ifdef HAVE_AUTOMOUNTER #ifdef HAVE_AUTOMOUNTER
/************************************************************************************
* Pre-processor Definitions
************************************************************************************/
#if 0
#ifndef NULL
# define NULL (FAR void *)0
#endif
#ifndef OK
# define OK 0
#endif
#endif
/************************************************************************************ /************************************************************************************
* Private Types * Private Types
************************************************************************************/ ************************************************************************************/
/* This structure represents the changeable state of the automounter */ /* This structure represents the changeable state of the automounter */
struct k64_automount_state_s struct k64_automount_state_s
configs/twr-k64f120m/src/k64_leds.c
+2 -1
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* configs/twr-k64f120m/src/k64_leds.c * configs/twr-k64f120m/src/k64_leds.c
* *
* Copyright (C) 2011, 2013, 2015 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -49,6 +49,7 @@
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* The TWR-K64F120M has four LEDs: /* The TWR-K64F120M has four LEDs:
* *
* 1. D5 / Green LED PTE6 * 1. D5 / Green LED PTE6
configs/twr-k64f120m/src/k64_sdhc.c
+2 -6
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* config/twr-k64f120m/src/k64_sdhc.c * config/twr-k64f120m/src/k64_sdhc.c
* *
* Copyright (C) 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -72,16 +72,12 @@
#include "twrk64.h" #include "twrk64.h"
#ifdef HAVE_MMCSD #ifdef HAVE_MMCSD
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Private Types * Private Types
****************************************************************************/ ****************************************************************************/
/* This structure holds static information unique to one SDHC peripheral */ /* This structure holds static information unique to one SDHC peripheral */
struct k64_sdhc_state_s struct k64_sdhc_state_s
configs/twr-k64f120m/src/twrk64.h
-4
View File
@@ -157,7 +157,6 @@
# undef HAVE_USBDEV # undef HAVE_USBDEV
#endif #endif
/* How many SPI modules does this chip support? The LM3S6918 supports 2 SPI /* How many SPI modules does this chip support? The LM3S6918 supports 2 SPI
* modules (others may support more -- in such case, the following must be * modules (others may support more -- in such case, the following must be
* expanded). * expanded).
@@ -170,7 +169,6 @@
# undef CONFIG_KINETIS_SPI2 # undef CONFIG_KINETIS_SPI2
#endif #endif
/* Button definitions ***************************************************************/ /* Button definitions ***************************************************************/
/* The TWR-K64F120M has 2 user buttons (plus a reset button): /* The TWR-K64F120M has 2 user buttons (plus a reset button):
* *
@@ -268,7 +266,6 @@ TODO See README
void weak_function k64_spidev_initialize(void); void weak_function k64_spidev_initialize(void);
/************************************************************************************ /************************************************************************************
* Name: k64_usbinitialize * Name: k64_usbinitialize
* *
@@ -387,6 +384,5 @@ void k64_automount_event(bool inserted);
int k64_pwm_setup(void); int k64_pwm_setup(void);
#endif #endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __CONFIGS_TWR_K64F120M_SRC_TWRK64_H */ #endif /* __CONFIGS_TWR_K64F120M_SRC_TWRK64_H */