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

Refactor all lpc17xx header files (more like STM32 header file structure now)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5534 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2013-01-18 19:16:44 +00:00
parent e612b388f2
commit d9b952834f
22 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configs/lincoln60/src/up_boot.c
View File

@ -47,7 +47,6 @@
#include "up_arch.h"
#include "up_internal.h"
#include "lpc17_internal.h"
#include "lincoln60_internal.h"
/************************************************************************************

4
configs/lincoln60/src/up_buttons.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* configs/lincoln60/src/up_buttons.c
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -47,7 +47,7 @@
#include <arch/board/board.h>
#include "lpc17_internal.h"
#include "lpc17_gpio.h"
#include "lincoln60_internal.h"
#ifdef CONFIG_ARCH_BUTTONS

4
configs/lincoln60/src/up_leds.c
View File

@ -2,7 +2,7 @@
* configs/lincoln60/src/up_leds.c
* arch/arm/src/board/up_leds.c
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -50,7 +50,7 @@
#include "up_arch.h"
#include "up_internal.h"
#include "lpc17_internal.h"
#include "lpc17_gpio.h"
#include "lincoln60_internal.h"

4
configs/lpcxpresso-lpc1768/src/lpcxpresso_internal.h
View File

@ -141,8 +141,8 @@
* SD Signal Pin Pin
* --- ----------- ----- --------
* CS PIO1_11* 55 P2.2 (See LPCXPRESSO_SD_CS)
* DIN PIO0_9-MOSI 5 P0.9 MOSI1 (See GPIO_SSP1_MOSI in lpc17_internal.h)
* DOUT PIO0_8-MISO 6 P0.8 MISO1 (See GPIO_SSP1_MISO in lpc17_internal.h)
* DIN PIO0_9-MOSI 5 P0.9 MOSI1 (See GPIO_SSP1_MOSI in chip/lpc17_ssp.h)
* DOUT PIO0_8-MISO 6 P0.8 MISO1 (See GPIO_SSP1_MISO in chip/lpc17_ssp.h)
* CLK PIO2_11-SCK 7 P0.9 SCK1 (See GPIO_SSP1_SCK in board.h)
* CD PIO2_10 52 P2.11 (See LPCXPRESSO_SD_CD)
*/

2
configs/lpcxpresso-lpc1768/src/up_boot.c
View File

@ -47,7 +47,7 @@
#include "up_arch.h"
#include "up_internal.h"
#include "lpc17_internal.h"
#include "lpc17_ssp.h"
#include "lpcxpresso_internal.h"
/************************************************************************************

4
configs/lpcxpresso-lpc1768/src/up_leds.c
View File

@ -2,7 +2,7 @@
* configs/lpcxpresso-lpc1768/src/up_leds.c
* arch/arm/src/board/up_leds.c
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -46,7 +46,7 @@
#include "up_arch.h"
#include "up_internal.h"
#include "lpc17_internal.h"
#include "lpc17_gpio.h"
#include "lpcxpresso_internal.h"
#ifdef CONFIG_ARCH_LEDS

5
configs/lpcxpresso-lpc1768/src/up_oled.c
View File

@ -2,7 +2,7 @@
* config/lpcxpresso-lpc1768/src/up_oled.c
* arch/arm/src/board/up_oled.c
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -48,7 +48,8 @@
#include <nuttx/lcd/lcd.h>
#include <nuttx/lcd/ug-9664hswag01.h>
#include "lpc17_internal.h"
#include "lpc17_gpio.h"
#include "lpc17_ssp.h"
#include "lpcxpresso_internal.h"
/****************************************************************************

13
configs/lpcxpresso-lpc1768/src/up_ssp.c
View File

@ -2,7 +2,7 @@
* configs/lpcxpresso-lpc1768/src/up_ssp.c
* arch/arm/src/board/up_ssp.c
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -49,7 +49,8 @@
#include "up_arch.h"
#include "chip.h"
#include "lpc17_internal.h"
#include "lpc17_gpio.h"
#include "lpc17_ssp.h"
#include "lpcxpresso_internal.h"
#if defined(CONFIG_LPC17_SSP0) || defined(CONFIG_LPC17_SSP1)
@ -155,11 +156,11 @@ void weak_function lpc17_sspinitialize(void)
void lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
{
sspdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
ssp_dumpgpio("lpc17_spi0select() Entry");
ssp_dumpgpio("lpc17_ssp0select() Entry");
#warning "Assert CS here (false)"
ssp_dumpgpio("lpc17_spi0select() Exit");
ssp_dumpgpio("lpc17_ssp0select() Exit");
}
uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@ -173,7 +174,7 @@ uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
void lpc17_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
{
sspdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
ssp_dumpgpio("lpc17_spi1select() Entry");
ssp_dumpgpio("lpc17_ssp1select() Entry");
if (devid == SPIDEV_MMCSD)
{
@ -189,7 +190,7 @@ void lpc17_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel
(void)lpc17_gpiowrite(LPCXPRESSO_OLED_CS, !selected);
}
#endif
ssp_dumpgpio("lpc17_spi1select() Exit");
ssp_dumpgpio("lpc17_ssp1select() Exit");
}
uint8_t lpc17_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)

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

@ -47,7 +47,6 @@
#include "up_arch.h"
#include "up_internal.h"
#include "lpc17_internal.h"
#include "mbed_internal.h"
/************************************************************************************
@ -80,3 +79,4 @@ void lpc17_boardinitialize(void)
up_ledinit();
#endif
}

4
configs/mbed/src/up_leds.c
View File

@ -2,7 +2,7 @@
* configs/mbed/src/up_leds.c
* arch/arm/src/board/up_leds.c
*
* Copyright (C) 2010 Gregory Nutt. All rights reserved.
* Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -50,7 +50,7 @@
#include "up_arch.h"
#include "up_internal.h"
#include "lpc17_internal.h"
#include "lpc17_gpio.h"
#include "mbed_internal.h"

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

@ -47,7 +47,7 @@
#include "up_arch.h"
#include "up_internal.h"
#include "lpc17_internal.h"
#include "lpc17_ssp.h"
#include "nucleus2g_internal.h"
/************************************************************************************

4
configs/nucleus2g/src/up_leds.c
View File

@ -2,7 +2,7 @@
* configs/nucleus2g/src/up_leds.c
* arch/arm/src/board/up_leds.c
*
* Copyright (C) 2010 Gregory Nutt. All rights reserved.
* Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -50,7 +50,7 @@
#include "up_arch.h"
#include "up_internal.h"
#include "lpc17_internal.h"
#include "lpc17_gpio.h"
#include "nucleus2g_internal.h"

4
configs/nucleus2g/src/up_outputs.c
View File

@ -7,7 +7,7 @@
*
* This file is part of NuttX:
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@ -54,7 +54,7 @@
#include "up_arch.h"
#include "up_internal.h"
#include "lpc17_internal.h"
#include "lpc17_gpio.h"
#include "nucleus2g_internal.h"

9
configs/nucleus2g/src/up_ssp.c
View File

@ -2,7 +2,7 @@
* configs/nucleus2g/src/up_ssp.c
* arch/arm/src/board/up_ssp.c
*
* Copyright (C) 2010 Gregory Nutt. All rights reserved.
* Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -49,7 +49,8 @@
#include "up_arch.h"
#include "chip.h"
#include "lpc17_internal.h"
#include "lpc17_gpio.h"
#include "lpc17_ssp.h"
#include "nucleus2g_internal.h"
#if defined(CONFIG_LPC17_SSP0) || defined(CONFIG_LPC17_SSP1)
@ -158,7 +159,7 @@ void weak_function lpc17_sspinitialize(void)
void lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
{
sspdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
ssp_dumpgpio("lpc17_spiselect() Entry");
ssp_dumpgpio("lpc17_ssp0select() Entry");
if (devid == SPIDEV_MMCSD)
{
@ -166,7 +167,7 @@ void lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel
lpc17_gpiowrite(NUCLEUS2G_MMCSD_CS, !selected);
}
ssp_dumpgpio("lpc17_spiselect() Exit");
ssp_dumpgpio("lpc17_ssp0select() Exit");
}
uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)

2
configs/olimex-lpc1766stk/src/up_boot.c
View File

@ -47,7 +47,7 @@
#include "up_arch.h"
#include "up_internal.h"
#include "lpc17_internal.h"
#include "lpc17_ssp.h"
#include "lpc1766stk_internal.h"
/************************************************************************************

2
configs/olimex-lpc1766stk/src/up_buttons.c
View File

@ -47,7 +47,7 @@
#include <arch/board/board.h>
#include "lpc17_internal.h"
#include "lpc17_gpio.h"
#include "lpc1766stk_internal.h"
#ifdef CONFIG_ARCH_BUTTONS

1
configs/olimex-lpc1766stk/src/up_can.c
View File

@ -49,7 +49,6 @@
#include "chip.h"
#include "up_arch.h"
#include "lpc17_internal.h"
#include "lpc17_can.h"
#include "lpc1766stk_internal.h"

2
configs/olimex-lpc1766stk/src/up_lcd.c
View File

@ -52,7 +52,7 @@
#include "up_arch.h"
#include "lpc17_syscon.h"
#include "lpc17_pwm.h"
#include "lpc17_internal.h"
#include "lpc17_gpio.h"
#include "lpc1766stk_internal.h"
#if defined(CONFIG_NX_LCDDRIVER) && defined(CONFIG_LCD_NOKIA6100) && defined(CONFIG_LPC17_SSP0)

2
configs/olimex-lpc1766stk/src/up_leds.c
View File

@ -50,7 +50,7 @@
#include "up_arch.h"
#include "up_internal.h"
#include "lpc17_internal.h"
#include "lpc17_gpio.h"
#include "lpc1766stk_internal.h"

4
configs/olimex-lpc1766stk/src/up_nsh.c
View File

@ -2,7 +2,7 @@
* config/olimex-lpc1766stk/src/up_nsh.c
* arch/arm/src/board/up_nsh.c
*
* Copyright (C) 2010 Gregory Nutt. All rights reserved.
* Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -49,7 +49,7 @@
#include <nuttx/mmcsd.h>
#include <nuttx/usb/usbhost.h>
#include "lpc17_internal.h"
#include "lpc17_gpio.h"
#include "lpc1766stk_internal.h"
/****************************************************************************

3
configs/olimex-lpc1766stk/src/up_ssp.c
View File

@ -53,7 +53,8 @@
#include "up_arch.h"
#include "chip.h"
#include "lpc17_internal.h"
#include "lpc17_gpio.h"
#include "lpc17_ssp.h"
#include "lpc1766stk_internal.h"
#if defined(CONFIG_LPC17_SSP0) || defined(CONFIG_LPC17_SSP1)

2
configs/olimex-lpc1766stk/src/up_usbmsc.c
View File

@ -48,7 +48,7 @@
#include <nuttx/spi.h>
#include <nuttx/mmcsd.h>
#include "lpc17_internal.h"
#include "lpc17_gpio.h"
#include "lpc1766stk_internal.h"
/****************************************************************************