Updates from review of last pull request

This commit is contained in:
Gregory Nutt
2015-07-29 14:12:15 -06:00
parent 1ad79547a3
commit 504691ae6a
8 changed files with 35 additions and 21 deletions
+1
View File
@@ -1125,6 +1125,7 @@ config ARCH_BOARD_MOXA
depends on ARCH_CHIP_MOXART depends on ARCH_CHIP_MOXART
---help--- ---help---
Moxa Moxa
endchoice endchoice
if ARCH_BOARD_CUSTOM if ARCH_BOARD_CUSTOM
+3
View File
@@ -349,6 +349,9 @@ configs/moteino-mega
on the Atmel AVR ATMega1284P MCU. There is not much there yet and what is on the Atmel AVR ATMega1284P MCU. There is not much there yet and what is
there is untested due to tool-related issues. there is untested due to tool-related issues.
configs/moxa
Moxa NP51x0 series of 2-port advanced RS-232/422/485 serial device servers.
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 Freescale i.MX1 processor. The i.MX1 is an ARM920T.
+9 -11
View File
@@ -1,7 +1,7 @@
/************************************************************************************ /************************************************************************************
* configs/arduino-due/include/board.h * configs/arduino-due/include/board.h
* *
* Copyright (C) 2013 Gregory Nutt. All rights reserved. * Copyright (C) 2015 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
@@ -33,8 +33,8 @@
* *
************************************************************************************/ ************************************************************************************/
#ifndef __CONFIGS_ARDUINO_DUE_INCLUDE_BOARD_H #ifndef __CONFIGS_MOXA_INCLUDE_BOARD_H
#define __CONFIGS_ARDUINO_DUE_INCLUDE_BOARD_H #define __CONFIGS_MOXA_INCLUDE_BOARD_H
/************************************************************************************ /************************************************************************************
* Included Files * Included Files
@@ -45,9 +45,6 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
# include <stdint.h> # include <stdint.h>
# include <stdbool.h> # include <stdbool.h>
# ifdef CONFIG_SAM34_GPIO_IRQ
# include <arch/irq.h>
# endif
#endif #endif
/************************************************************************************ /************************************************************************************
@@ -55,7 +52,7 @@
************************************************************************************/ ************************************************************************************/
/* Clocking *************************************************************************/ /* Clocking *************************************************************************/
/* After power-on reset, the SAM3X device is running on a 4MHz internal RC. These /* After power-on reset, the device is running on a 4MHz internal RC. These
* definitions will configure clocking * definitions will configure clocking
* *
* MAINOSC: Frequency = 12MHz (crysta) * MAINOSC: Frequency = 12MHz (crysta)
@@ -144,7 +141,7 @@
#define BOARD_FWS 4 #define BOARD_FWS 4
/* LED definitions ******************************************************************/ /* LED definitions ******************************************************************/
/* There are three user-controllable LEDs on board the Arduino Due board: /* There are three user-controllable LEDs on board the Moxa board:
* *
* LED GPIO * LED GPIO
* ---------------- ----- * ---------------- -----
@@ -198,7 +195,7 @@
*/ */
/* Button definitions ***************************************************************/ /* Button definitions ***************************************************************/
/* There are no buttons on the Arduino Due board. */ /* There are no buttons on the Moxa board. */
/* GPIO pin configurations **********************************************************/ /* GPIO pin configurations **********************************************************/
@@ -211,7 +208,8 @@
#undef EXTERN #undef EXTERN
#if defined(__cplusplus) #if defined(__cplusplus)
#define EXTERN extern "C" #define EXTERN extern "C"
extern "C" { extern "C"
{
#else #else
#define EXTERN extern #define EXTERN extern
#endif #endif
@@ -226,4 +224,4 @@ extern "C" {
#endif #endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __CONFIGS_ARDUINO_DUE_INCLUDE_BOARD_H */ #endif /* __CONFIGS_MOXA_INCLUDE_BOARD_H */
+2 -2
View File
@@ -1,7 +1,7 @@
############################################################################ ############################################################################
# configs/arduino-due/nsh/Make.defs # configs/moxa/nsh/Make.defs
# #
# Copyright (C) 2013 Gregory Nutt. All rights reserved. # Copyright (C) 2015 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
+7 -2
View File
@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# configs/arduino-due/nsh/setenv.sh # configs/moxa/nsh/setenv.sh
# #
# Copyright (C) 2013 Gregory Nutt. All rights reserved. # Copyright (C) 2015 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
@@ -56,6 +56,11 @@ fi
# toolchain under windows. You will also have to edit this if you install # toolchain under windows. You will also have to edit this if you install
# the CodeSourcery toolchain in any other location # the CodeSourcery toolchain in any other location
#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin"
#export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
# This is the location where I installed the ARM "GNU Tools for ARM Embedded Processors"
# You can this free toolchain here https://launchpad.net/gcc-arm-embedded
#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/GNU Tools ARM Embedded/4.9 2014q4/bin"
# These are the Cygwin paths to the locations where I installed the Atollic # These are the Cygwin paths to the locations where I installed the Atollic
# toolchain under windows. You will also have to edit this if you install # toolchain under windows. You will also have to edit this if you install
+2 -2
View File
@@ -1,7 +1,7 @@
############################################################################ ############################################################################
# configs/arduino-due/src/Makefile # configs/moxa/src/Makefile
# #
# Copyright (C) 2013 Gregory Nutt. All rights reserved. # Copyright (C) 2015 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
+6 -2
View File
@@ -1,8 +1,8 @@
/**************************************************************************** /****************************************************************************
* config/moxart/src/moxart_boot.c * config/moxart/src/moxart_boot.c
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Anton D. Kachalov <mouse@mayc.ru>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@@ -66,12 +66,16 @@
* may be used, for example, to initialize board-specific device drivers. * may be used, for example, to initialize board-specific device drivers.
* *
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_BOARD_INITIALIZE #ifdef CONFIG_BOARD_INITIALIZE
extern int ftmac100_initialize(int intf); extern int ftmac100_initialize(int intf);
void board_initialize(void) void board_initialize(void)
{ {
#ifdef CONFIG_NET_FTMAC100
/* Perform board-specific initialization */ /* Perform board-specific initialization */
ftmac100_initialize(0); ftmac100_initialize(0);
#endif
} }
#endif #endif
+5 -2
View File
@@ -1,8 +1,8 @@
/**************************************************************************** /****************************************************************************
* config/moxart/src/moxart_nsh.c * config/moxart/src/moxart_nsh.c
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Anton D. Kachalov <mouse@mayc.ru>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@@ -72,8 +72,11 @@
int board_app_initialize(void) int board_app_initialize(void)
{ {
#ifndef CONFIG_BOARD_INITIALIZE #ifndef CONFIG_BOARD_INITIALIZE
#ifdef CONFIG_NET_FTMAC100
/* Perform board-specific initialization */ /* Perform board-specific initialization */
ftmac100_initialize(0); ftmac100_initialize(0);
#endif
#endif #endif
return OK; return OK;
} }