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

Fix big-time naming error -- what was I thinking?

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3059 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2010-10-30 00:46:27 +00:00
parent 2ddd9aa263
commit 87bc3b1d50
7 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/README.txt
View File

@ -805,7 +805,7 @@ Supported Boards
configs/avr32dev1
This is a port of NuttX to the Atmel AVR32DEV1 board. That board is
based on the Atmel AT91UC3B0256 MCU and uses a specially patched
based on the Atmel AT32UC3B0256 MCU and uses a specially patched
version of the GNU toolchain: The patches provide support for the
AVR32 family. That patched GNU toolchain is available only from the
Atmel website. STATUS: Under development.

12
configs/avr32dev1/README.txt
View File

@ -49,7 +49,7 @@ In configs/avr32dev/include/board.h:
#define PINMUX_USART1_RXD PINMUX_USART1_RXD_1
#define PINMUX_USART1_TXD PINMUX_USART1_TXD_1
In arch/avr/src/at91uc3/at91uc3b_pinmux.h:
In arch/avr/src/at32uc3/at32uc3b_pinmux.h:
#define PINMUX_USART1_RXD_1 (GPIO_PERIPH | GPIO_FUNCD | GPIO_PORTA | 17)
#define PINMUX_USART1_TXD_1 (GPIO_PERIPH | GPIO_FUNCA | GPIO_PORTA | 23)
@ -111,7 +111,7 @@ IDEs
2) Start the NuttX build at least one time from the Cygwin command line
before trying to create your project. This is necessary to create
certain auto-generated files and directories that will be needed.
3) Set up include pathes: You will need include/, arch/avr/src/at91uc3,
3) Set up include pathes: You will need include/, arch/avr/src/at32uc3,
arch/avr/src/common, arch/arm/src/avr, and sched/.
4) All assembly files need to have the definition option -D __ASSEMBLY__
on the command line.
@ -263,12 +263,12 @@ AVR32DEV1 Configuration Options
CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
CONFIG_ARCH_CHIP=at91uc3
CONFIG_ARCH_CHIP=at32uc3
CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
chip:
CONFIG_ARCH_CHIP_AT91UC3B0256
CONFIG_ARCH_CHIP_AT32UC3B0256
CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
hence, the board that supports the particular chip or SoC.
@ -297,7 +297,7 @@ AVR32DEV1 Configuration Options
CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE)
CONFIG_ARCH_IRQPRIO - The AT91UC3B0256 supports interrupt prioritization
CONFIG_ARCH_IRQPRIO - The AT32UC3B0256 supports interrupt prioritization
CONFIG_ARCH_IRQPRIO=y
@ -335,7 +335,7 @@ AVR32DEV1 Configuration Options
CONFIG_AVR32_USARTn_IRDA - Configure USARTn as an IRDA interface.
CONFIG_AVR32_USARTn_ISO786 - Configure USARTn as an ISO786 interface.
AT91UC3B0256 specific device driver settings
AT32UC3B0256 specific device driver settings
CONFIG_USARTn_SERIAL_CONSOLE - selects the USARTn for the
console and ttys0 (default is the USART0).

4
configs/avr32dev1/ostest/defconfig
View File

@ -75,8 +75,8 @@
CONFIG_ARCH=avr
CONFIG_ARCH_AVR=y
CONFIG_ARCH_AVR32=y
CONFIG_ARCH_CHIP=at91uc3
CONFIG_ARCH_CHIP_AT91UC3B0256=y
CONFIG_ARCH_CHIP=at32uc3
CONFIG_ARCH_CHIP_AT32UC3B0256=y
CONFIG_ARCH_BOARD=avr32dev1
CONFIG_ARCH_BOARD_AVR32DEV1=y
CONFIG_BOARD_LOOPSPERMSEC=7982

8
configs/avr32dev1/src/avr32dev1_internal.h
View File

@ -34,8 +34,8 @@
*
************************************************************************************/
#ifndef _CONFIGS_AT91DEV1_SRC_AT91DEV1_INTERNAL_H
#define _CONFIGS_AT91DEV1_SRC_AT91DEV1_INTERNAL_H
#ifndef _CONFIGS_AVR32DEV1_SRC_AVR32DEV1_INTERNAL_H
#define _CONFIGS_AVR32DEV1_SRC_AVR32DEV1_INTERNAL_H
/************************************************************************************
* Included Files
@ -43,7 +43,7 @@
#include <nuttx/config.h>
#include <nuttx/compiler.h>
#include "at91uc3_config.h"
#include "at32uc3_config.h"
/************************************************************************************
* Definitions
@ -123,5 +123,5 @@ extern void up_ledinitialize(void);
#endif
#endif /* __ASSEMBLY__ */
#endif /* _CONFIGS_AT91DEV1_SRC_AT91DEV1_INTERNAL_H */
#endif /* _CONFIGS_AVR32DEV1_SRC_AVR32DEV1_INTERNAL_H */

2
configs/avr32dev1/src/up_boot.c
View File

@ -47,7 +47,7 @@
#include "up_arch.h"
#include "up_internal.h"
#include "at91uc3_internal.h"
#include "at32uc3_internal.h"
#include "avr32dev1_internal.h"
/************************************************************************************

12
configs/avr32dev1/src/up_buttons.c
View File

@ -38,7 +38,7 @@
****************************************************************************/
#include <nuttx/config.h>
#include "at91uc3_config.h"
#include "at32uc3_config.h"
#include <sys/types.h>
#include <stdint.h>
@ -48,7 +48,7 @@
#include <arch/irq.h>
#include <arch/board/board.h>
#include "at91uc3_internal.h"
#include "at32uc3_internal.h"
#include "avr32dev1_internal.h"
#ifdef CONFIG_ARCH_BUTTONS
@ -75,8 +75,8 @@
void up_buttoninit(void)
{
(void)at91uc3_configgpio(PINMUX_GPIO_BUTTON1);
(void)at91uc3_configgpio(PINMUX_GPIO_BUTTON2);
(void)at32uc3_configgpio(PINMUX_GPIO_BUTTON1);
(void)at32uc3_configgpio(PINMUX_GPIO_BUTTON2);
}
/****************************************************************************
@ -87,8 +87,8 @@ uint8_t up_buttons(void)
{
uint8_t retval;
retval = at91uc3_gpioread(PINMUX_GPIO_BUTTON1) ? 0 : BUTTON1;
retval |= at91uc3_gpioread(PINMUX_GPIO_BUTTON2) ? 0 : BUTTON2;
retval = at32uc3_gpioread(PINMUX_GPIO_BUTTON1) ? 0 : BUTTON1;
retval |= at32uc3_gpioread(PINMUX_GPIO_BUTTON2) ? 0 : BUTTON2;
return retval;
}

14
configs/avr32dev1/src/up_leds.c
View File

@ -40,7 +40,7 @@
#include <nuttx/config.h>
#include "at91uc3_internal.h"
#include "at32uc3_internal.h"
#include "avr32dev1_internal.h"
#ifdef CONFIG_ARCH_LEDS
@ -67,8 +67,8 @@
void up_ledinitialize(void)
{
at91uc3_configgpio(PINMUX_GPIO_LED1);
at91uc3_configgpio(PINMUX_GPIO_LED2);
at32uc3_configgpio(PINMUX_GPIO_LED1);
at32uc3_configgpio(PINMUX_GPIO_LED2);
}
/****************************************************************************
@ -77,8 +77,8 @@ void up_ledinitialize(void)
void up_ledon(int led)
{
at91uc3_gpiowrite(PINMUX_GPIO_LED1, (led != 0));
at91uc3_gpiowrite(PINMUX_GPIO_LED2, (led == 2));
at32uc3_gpiowrite(PINMUX_GPIO_LED1, (led != 0));
at32uc3_gpiowrite(PINMUX_GPIO_LED2, (led == 2));
}
/****************************************************************************
@ -87,7 +87,7 @@ void up_ledon(int led)
void up_ledoff(int led)
{
at91uc3_gpiowrite(PINMUX_GPIO_LED1, (led == 2));
at91uc3_gpiowrite(PINMUX_GPIO_LED2, false);
at32uc3_gpiowrite(PINMUX_GPIO_LED1, (led == 2));
at32uc3_gpiowrite(PINMUX_GPIO_LED2, false);
}
#endif /* CONFIG_ARCH_LEDS */