From fe65d988275f509d3e7b71014c19c1d1aefac035 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Thu, 3 Oct 2013 12:24:03 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6352 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/boards/OLIMEX_LPC-P1227/board.c | 53 ------------------ os/hal/boards/OLIMEX_LPC-P1227/board.h | 98 --------------------------------- os/hal/boards/OLIMEX_LPC-P1227/board.mk | 5 -- os/hal/boards/OLIMEX_LPC_P1227/board.c | 53 ++++++++++++++++++ os/hal/boards/OLIMEX_LPC_P1227/board.h | 98 +++++++++++++++++++++++++++++++++ os/hal/boards/OLIMEX_LPC_P1227/board.mk | 5 ++ 6 files changed, 156 insertions(+), 156 deletions(-) delete mode 100644 os/hal/boards/OLIMEX_LPC-P1227/board.c delete mode 100644 os/hal/boards/OLIMEX_LPC-P1227/board.h delete mode 100644 os/hal/boards/OLIMEX_LPC-P1227/board.mk create mode 100644 os/hal/boards/OLIMEX_LPC_P1227/board.c create mode 100644 os/hal/boards/OLIMEX_LPC_P1227/board.h create mode 100644 os/hal/boards/OLIMEX_LPC_P1227/board.mk (limited to 'os') diff --git a/os/hal/boards/OLIMEX_LPC-P1227/board.c b/os/hal/boards/OLIMEX_LPC-P1227/board.c deleted file mode 100644 index 226d696c4..000000000 --- a/os/hal/boards/OLIMEX_LPC-P1227/board.c +++ /dev/null @@ -1,53 +0,0 @@ -/* - ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -#include "hal.h" - -/** - * @brief PAL setup. - * @details Digital I/O ports static configuration as defined in @p board.h. - * This variable is used by the HAL when initializing the PAL driver. - */ -#if HAL_USE_PAL || defined(__DOXYGEN__) -const PALConfig pal_default_config = { - {VAL_GPIO0DATA, VAL_GPIO0DIR}, - {VAL_GPIO1DATA, VAL_GPIO1DIR}, - {VAL_GPIO2DATA, VAL_GPIO2DIR}, -}; -#endif - -/* - * Early initialization code. - * This initialization must be performed just after stack setup and before - * any other initialization. - */ -void __early_init(void) { - - lpc122x_clock_init(); -} - -/* - * Board-specific initialization code. - */ -void boardInit(void) { - - /* - * Extra, board-specific, initializations. - */ - LPC_IOCON->PIO1_4 = 0x80; /* Disables pull-up on LED2 output. */ - LPC_IOCON->PIO1_5 = 0x80; /* Disables pull-up on LED1 output */ - LPC_IOCON->PIO1_6 = 0x80; /* Disables pull-up on Buzzer output */ -} diff --git a/os/hal/boards/OLIMEX_LPC-P1227/board.h b/os/hal/boards/OLIMEX_LPC-P1227/board.h deleted file mode 100644 index ae2e879a7..000000000 --- a/os/hal/boards/OLIMEX_LPC-P1227/board.h +++ /dev/null @@ -1,98 +0,0 @@ -/* - ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010, - 2011,2012,2013 Giovanni Di Sirio. - - This file is part of ChibiOS/RT. - - ChibiOS/RT is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - ChibiOS/RT is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -#ifndef _BOARD_H_ -#define _BOARD_H_ - -/* - * Setup for Olimex LPC-P1227 board. - * - */ - -/* - * Board identifiers. - */ -#define OLIMEX_LPC_P1227 -#define BOARD_NAME "Olimex LPC-P1227" - -/* - * Board frequencies. - */ -#define SYSOSCCLK 12000000 - - -/* - * GPIO 0 initial setup. - */ -#define VAL_GPIO0DIR 0x00000000 -#define VAL_GPIO0DATA 0x00000000 - -/* - * GPIO 1 initial setup. - */ -#define VAL_GPIO1DIR PAL_PORT_BIT(GPIO1_LED1) | \ - PAL_PORT_BIT(GPIO1_LED2) | \ - PAL_PORT_BIT(GPIO1_BUZZER) - -#define VAL_GPIO1DATA PAL_PORT_BIT(GPIO1_LED1) - - -/* - * GPIO 2 initial setup. - */ -#define VAL_GPIO2DIR PAL_PORT_BIT(GPIO2_LCD_DC) | \ - PAL_PORT_BIT(GPIO2_LCD_SS) | \ - PAL_PORT_BIT(GPIO2_LCD_RES) -#define VAL_GPIO2DATA PAL_PORT_BIT(GPIO2_LCD_SS) - - -/* - * Pin definitions. - */ - -#define GPIO1_LED1 5 -#define GPIO1_LED2 4 -#define GPIO1_SW_WAKEUP 3 -#define GPIO1_BUZZER 6 - -#define GPIO2_SW_USER1 12 -#define GPIO2_SW_USER2 11 -#define GPIO2_SW_USER3 10 -#define GPIO2_LCD_DC 15 -#define GPIO2_LCD_SS 14 -#define GPIO2_LCD_RES 13 - -/* LCD3310 pins */ -#define LCD3310_RES_PIN GPIO2_LCD_RES -#define LCD3310_RES_PORT GPIO2 -#define LCD3310_DC_PIN GPIO2_LCD_DC -#define LCD3310_DC_PORT GPIO2 - -#if !defined(_FROM_ASM_) -#ifdef __cplusplus -extern "C" { -#endif - void boardInit(void); -#ifdef __cplusplus -} -#endif -#endif /* _FROM_ASM_ */ - -#endif /* _BOARD_H_ */ diff --git a/os/hal/boards/OLIMEX_LPC-P1227/board.mk b/os/hal/boards/OLIMEX_LPC-P1227/board.mk deleted file mode 100644 index 6d4078802..000000000 --- a/os/hal/boards/OLIMEX_LPC-P1227/board.mk +++ /dev/null @@ -1,5 +0,0 @@ -# List of all the board related files. -BOARDSRC = ${CHIBIOS}/os/hal/boards/OLIMEX_LPC-P1227/board.c - -# Required include directories -BOARDINC = ${CHIBIOS}/os/hal/boards/OLIMEX_LPC-P1227 diff --git a/os/hal/boards/OLIMEX_LPC_P1227/board.c b/os/hal/boards/OLIMEX_LPC_P1227/board.c new file mode 100644 index 000000000..226d696c4 --- /dev/null +++ b/os/hal/boards/OLIMEX_LPC_P1227/board.c @@ -0,0 +1,53 @@ +/* + ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +#include "hal.h" + +/** + * @brief PAL setup. + * @details Digital I/O ports static configuration as defined in @p board.h. + * This variable is used by the HAL when initializing the PAL driver. + */ +#if HAL_USE_PAL || defined(__DOXYGEN__) +const PALConfig pal_default_config = { + {VAL_GPIO0DATA, VAL_GPIO0DIR}, + {VAL_GPIO1DATA, VAL_GPIO1DIR}, + {VAL_GPIO2DATA, VAL_GPIO2DIR}, +}; +#endif + +/* + * Early initialization code. + * This initialization must be performed just after stack setup and before + * any other initialization. + */ +void __early_init(void) { + + lpc122x_clock_init(); +} + +/* + * Board-specific initialization code. + */ +void boardInit(void) { + + /* + * Extra, board-specific, initializations. + */ + LPC_IOCON->PIO1_4 = 0x80; /* Disables pull-up on LED2 output. */ + LPC_IOCON->PIO1_5 = 0x80; /* Disables pull-up on LED1 output */ + LPC_IOCON->PIO1_6 = 0x80; /* Disables pull-up on Buzzer output */ +} diff --git a/os/hal/boards/OLIMEX_LPC_P1227/board.h b/os/hal/boards/OLIMEX_LPC_P1227/board.h new file mode 100644 index 000000000..ae2e879a7 --- /dev/null +++ b/os/hal/boards/OLIMEX_LPC_P1227/board.h @@ -0,0 +1,98 @@ +/* + ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010, + 2011,2012,2013 Giovanni Di Sirio. + + This file is part of ChibiOS/RT. + + ChibiOS/RT is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + ChibiOS/RT is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifndef _BOARD_H_ +#define _BOARD_H_ + +/* + * Setup for Olimex LPC-P1227 board. + * + */ + +/* + * Board identifiers. + */ +#define OLIMEX_LPC_P1227 +#define BOARD_NAME "Olimex LPC-P1227" + +/* + * Board frequencies. + */ +#define SYSOSCCLK 12000000 + + +/* + * GPIO 0 initial setup. + */ +#define VAL_GPIO0DIR 0x00000000 +#define VAL_GPIO0DATA 0x00000000 + +/* + * GPIO 1 initial setup. + */ +#define VAL_GPIO1DIR PAL_PORT_BIT(GPIO1_LED1) | \ + PAL_PORT_BIT(GPIO1_LED2) | \ + PAL_PORT_BIT(GPIO1_BUZZER) + +#define VAL_GPIO1DATA PAL_PORT_BIT(GPIO1_LED1) + + +/* + * GPIO 2 initial setup. + */ +#define VAL_GPIO2DIR PAL_PORT_BIT(GPIO2_LCD_DC) | \ + PAL_PORT_BIT(GPIO2_LCD_SS) | \ + PAL_PORT_BIT(GPIO2_LCD_RES) +#define VAL_GPIO2DATA PAL_PORT_BIT(GPIO2_LCD_SS) + + +/* + * Pin definitions. + */ + +#define GPIO1_LED1 5 +#define GPIO1_LED2 4 +#define GPIO1_SW_WAKEUP 3 +#define GPIO1_BUZZER 6 + +#define GPIO2_SW_USER1 12 +#define GPIO2_SW_USER2 11 +#define GPIO2_SW_USER3 10 +#define GPIO2_LCD_DC 15 +#define GPIO2_LCD_SS 14 +#define GPIO2_LCD_RES 13 + +/* LCD3310 pins */ +#define LCD3310_RES_PIN GPIO2_LCD_RES +#define LCD3310_RES_PORT GPIO2 +#define LCD3310_DC_PIN GPIO2_LCD_DC +#define LCD3310_DC_PORT GPIO2 + +#if !defined(_FROM_ASM_) +#ifdef __cplusplus +extern "C" { +#endif + void boardInit(void); +#ifdef __cplusplus +} +#endif +#endif /* _FROM_ASM_ */ + +#endif /* _BOARD_H_ */ diff --git a/os/hal/boards/OLIMEX_LPC_P1227/board.mk b/os/hal/boards/OLIMEX_LPC_P1227/board.mk new file mode 100644 index 000000000..6d4078802 --- /dev/null +++ b/os/hal/boards/OLIMEX_LPC_P1227/board.mk @@ -0,0 +1,5 @@ +# List of all the board related files. +BOARDSRC = ${CHIBIOS}/os/hal/boards/OLIMEX_LPC-P1227/board.c + +# Required include directories +BOARDINC = ${CHIBIOS}/os/hal/boards/OLIMEX_LPC-P1227 -- cgit v1.2.3