From 1a42a5f9e3552addc20bd647c4ded87bfb2ca775 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sun, 16 Dec 2012 21:59:55 +0000 Subject: [PATCH] Added board files for Olimex STM32-LCD. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4937 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- boards/OLIMEX_STM32_LCD/board.c | 92 ++++++++++++++ boards/OLIMEX_STM32_LCD/board.h | 200 +++++++++++++++++++++++++++++++ boards/OLIMEX_STM32_LCD/board.mk | 5 + docs/Doxyfile_chm | 2 +- docs/Doxyfile_html | 2 +- docs/rsc/header_chm.html | 2 +- docs/rsc/header_html.html | 2 +- os/kernel/include/ch.h | 4 +- readme.txt | 3 + 9 files changed, 306 insertions(+), 6 deletions(-) create mode 100644 boards/OLIMEX_STM32_LCD/board.c create mode 100644 boards/OLIMEX_STM32_LCD/board.h create mode 100644 boards/OLIMEX_STM32_LCD/board.mk diff --git a/boards/OLIMEX_STM32_LCD/board.c b/boards/OLIMEX_STM32_LCD/board.c new file mode 100644 index 000000000..c164dc818 --- /dev/null +++ b/boards/OLIMEX_STM32_LCD/board.c @@ -0,0 +1,92 @@ +/* + ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010, + 2011,2012 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 . +*/ + +#include "ch.h" +#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_GPIOAODR, VAL_GPIOACRL, VAL_GPIOACRH}, + {VAL_GPIOBODR, VAL_GPIOBCRL, VAL_GPIOBCRH}, + {VAL_GPIOCODR, VAL_GPIOCCRL, VAL_GPIOCCRH}, + {VAL_GPIODODR, VAL_GPIODCRL, VAL_GPIODCRH}, + {VAL_GPIOEODR, VAL_GPIOECRL, VAL_GPIOECRH}, + {VAL_GPIOFODR, VAL_GPIOFCRL, VAL_GPIOFCRH}, + {VAL_GPIOGODR, VAL_GPIOGCRL, VAL_GPIOGCRH}, +}; +#endif + +/* + * Early initialization code. + * This initialization must be performed just after stack setup and before + * any other initialization. + */ +void __early_init(void) { + stm32_clock_init(); +} + +#if HAL_USE_SDC || defined(__DOXYGEN__) +/** + * @brief SDC card detection. + */ +bool_t sdc_lld_is_card_inserted(SDCDriver *sdcp) { + (void)sdcp; + + return TRUE; +} + +/** + * @brief SDC card write protection detection. + */ +bool_t sdc_lld_is_write_protected(SDCDriver *sdcp) { + (void)sdcp; + + return FALSE; +} +#endif /* HAL_USE_SDC */ + +#if HAL_USE_MMC_SPI +/* Board-related functions related to the MMC_SPI driver.*/ +bool_t mmc_lld_is_card_inserted(MMCDriver *mmcp) { + (void)mmcp; + + return TRUE; +} + +bool_t mmc_lld_is_write_protected(MMCDriver *mmcp) { + (void)mmcp; + + return FALSE; +} +#endif + +/* + * Board-specific initialization code. + */ +void boardInit(void) { + +} + diff --git a/boards/OLIMEX_STM32_LCD/board.h b/boards/OLIMEX_STM32_LCD/board.h new file mode 100644 index 000000000..5dd03f851 --- /dev/null +++ b/boards/OLIMEX_STM32_LCD/board.h @@ -0,0 +1,200 @@ +/* + ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010, + 2011,2012 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 the Olimex STM32-LCD proto board. + */ + +/* + * Board identifier. + */ +#define BOARD_OLIMEX_STM32_LCD +#define BOARD_NAME "Olimex STM32-LCD" + +/* + * Board frequencies. + */ +#define STM32_LSECLK 32768 +#define STM32_HSECLK 8000000 + +/* + * MCU type, supported types are defined in ./os/hal/platforms/hal_lld.h. + */ +#define STM32F10X_HD + +/* + * IO pins assignments. + */ +#define GPIOA_SPI1NSS 4 + +#define GPIOB_SPI2NSS 12 + +#define GPIOA_USB_P 0 +#define GPIOD_USB_DISC 2 + +#define GPIOE_TFT_RST 2 +#define GPIOD_TFT_LIGHT 13 +#define GPIOC_TFT_YD 0 +#define GPIOC_TFT_YU 1 +#define GPIOC_TFT_XL 2 +#define GPIOC_TFT_XR 3 + +/* + * I/O ports initial setup, this configuration is established soon after reset + * in the initialization code. + * + * The digits have the following meaning: + * 0 - Analog input. + * 1 - Push Pull output 10MHz. + * 2 - Push Pull output 2MHz. + * 3 - Push Pull output 50MHz. + * 4 - Digital input. + * 5 - Open Drain output 10MHz. + * 6 - Open Drain output 2MHz. + * 7 - Open Drain output 50MHz. + * 8 - Digital input with PullUp or PullDown resistor depending on ODR. + * 9 - Alternate Push Pull output 10MHz. + * A - Alternate Push Pull output 2MHz. + * B - Alternate Push Pull output 50MHz. + * C - Reserved. + * D - Alternate Open Drain output 10MHz. + * E - Alternate Open Drain output 2MHz. + * F - Alternate Open Drain output 50MHz. + * Please refer to the STM32 Reference Manual for details. + */ + +/* + * Port A setup. + * Everything input with pull-up except: + * PA0 - Normal input (USB P). + * PA2 - Alternate output (USART2 TX). + * PA3 - Normal input (USART2 RX). + * PA11 - Normal input (USB DM). + * PA12 - Normal input (USB DP). + */ +#define VAL_GPIOACRL 0x88884B84 /* PA7...PA0 */ +#define VAL_GPIOACRH 0x88844888 /* PA15...PA8 */ +#define VAL_GPIOAODR 0xFFFFFFFF + +/* + * Port B setup. + * Everything input with pull-up except: + */ +#define VAL_GPIOBCRL 0x88888888 /* PB7...PB0 */ +#define VAL_GPIOBCRH 0x88888888 /* PB15...PB8 */ +#define VAL_GPIOBODR 0xFFFFFFFF + +/* + * Port C setup. + * Everything input with pull-up except: + * PC0 - Analog Input (TP_YD). + * PC1 - Analog Input (TP_YU). + * PC2 - Analog Input (TP_XL). + * PC3 - Analog Input (TP_XR). + * PC8 - Alternate PP 50M (SD_D0). + * PC9 - Alternate PP 50M (SD_D1). + * PC10 - Alternate PP 50M (SD_D2). + * PC11 - Alternate PP 50M (SD_D3). + * PC12 - Alternate PP 50M (SD_CLK). + * PC14 - Normal input (XTAL). + * PC15 - Normal input (XTAL). + */ +#define VAL_GPIOCCRL 0x88880000 /* PC7...PC0 */ +#define VAL_GPIOCCRH 0x448BBBBB /* PC15...PC8 */ +#define VAL_GPIOCODR 0xFFFFFFFF + +/* + * Port D setup. + * Everything input with pull-up except: + * PD2 - Alternate PP 50M (SD_CMD) + * PD0 - Alternate PP 50M (FSMC_D2) + * PD1 - Alternate PP 50M (FSMC_D3) + * PD4 - Alternate PP 50M (TFT_RD) + * PD5 - Alternate PP 50M (TFT_WR) + * PD7 - Alternate PP 50M (TFT_CS) + * PD8 - Alternate PP 50M (FSMC_D13) + * PD9 - Alternate PP 50M (FSMC_D14) + * PD10 - Alternate PP 50M (FSMC_D15) + * PD14 - Alternate PP 50M (FSMC_D0) + * PD15 - Alternate PP 50M (FSMC_D1) + */ +#define VAL_GPIODCRL 0xBBBB8BBB /* PD7...PD0 */ +#define VAL_GPIODCRH 0xBB388BBB /* PD15...PD8 */ +#define VAL_GPIODODR 0xFFFFFFFF + +/* + * Port E setup. + * Everything input with pull-up except: + * PE2 - Digital Output (TFT_RST) + * PE3 - Alternate PP 50M (TFT_RS) + * PE7 - Alternate PP 50M (FSMC_D4) + * PE8 - Alternate PP 50M (FSMC_D5) + * PE9 - Alternate PP 50M (FSMC_D6) + * PE10 - Alternate PP 50M (FSMC_D7) + * PE11 - Alternate PP 50M (FSMC_D8) + * PE12 - Alternate PP 50M (FSMC_D9) + * PE13 - Alternate PP 50M (FSMC_D10) + * PE14 - Alternate PP 50M (FSMC_D11) + * PE15 - Alternate PP 50M (FSMC_D12) + */ +#define VAL_GPIOECRL 0xB888B388 /* PE7...PE0 */ +#define VAL_GPIOECRH 0xBBBBBBBB /* PE15...PE8 */ +#define VAL_GPIOEODR 0xFFFFFFFF + +/* + * Port F setup. + * Everything input with pull-up expect: + */ +#define VAL_GPIOFCRL 0x88888888 /* PF7...PF0 */ +#define VAL_GPIOFCRH 0x88888888 /* PF15...PF8 */ +#define VAL_GPIOFODR 0xFFFFFFFF + +/* + * Port G setup. + * Everything input with pull-up expect: + */ +#define VAL_GPIOGCRL 0x88888888 /* PG7...PG0 */ +#define VAL_GPIOGCRH 0x88888888 /* PG15...PG8 */ +#define VAL_GPIOGODR 0xFFFFFFFF + +/* + * USB bus activation macro, required by the USB driver. + */ +#define usb_lld_connect_bus(usbp) palClearPad(GPIOD, GPIOD_USB_DISC) + +/* + * USB bus de-activation macro, required by the USB driver. + */ +#define usb_lld_disconnect_bus(usbp) palSetPad(GPIOD, GPIOD_USB_DISC) + +#if !defined(_FROM_ASM_) +#ifdef __cplusplus +extern "C" { +#endif + void boardInit(void); +#ifdef __cplusplus +} +#endif +#endif /* _FROM_ASM_ */ + +#endif /* _BOARD_H_ */ diff --git a/boards/OLIMEX_STM32_LCD/board.mk b/boards/OLIMEX_STM32_LCD/board.mk new file mode 100644 index 000000000..c1cc061de --- /dev/null +++ b/boards/OLIMEX_STM32_LCD/board.mk @@ -0,0 +1,5 @@ +# List of all the board related files. +BOARDSRC = ${CHIBIOS}/boards/OLIMEX_STM32_LCD/board.c + +# Required include directories +BOARDINC = ${CHIBIOS}/boards/OLIMEX_STM32_LCD diff --git a/docs/Doxyfile_chm b/docs/Doxyfile_chm index ddea27042..cb38f1ce9 100644 --- a/docs/Doxyfile_chm +++ b/docs/Doxyfile_chm @@ -31,7 +31,7 @@ PROJECT_NAME = ChibiOS/RT # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 2.5.1 +PROJECT_NUMBER = 2.5.2 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff --git a/docs/Doxyfile_html b/docs/Doxyfile_html index 6ff8aea50..8e7aa791b 100644 --- a/docs/Doxyfile_html +++ b/docs/Doxyfile_html @@ -31,7 +31,7 @@ PROJECT_NAME = ChibiOS/RT # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 2.5.1 +PROJECT_NUMBER = 2.5.2 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff --git a/docs/rsc/header_chm.html b/docs/rsc/header_chm.html index 65fe425b9..4d3d6a90f 100644 --- a/docs/rsc/header_chm.html +++ b/docs/rsc/header_chm.html @@ -13,7 +13,7 @@ -
ChibiOS/RT 2.5.1
+
ChibiOS/RT 2.5.2
diff --git a/docs/rsc/header_html.html b/docs/rsc/header_html.html index 007bb07ac..0b9cb62bf 100644 --- a/docs/rsc/header_html.html +++ b/docs/rsc/header_html.html @@ -20,7 +20,7 @@ $(document).ready(initResizable); -
ChibiOS/RT
2.5.1
+
ChibiOS/RT
2.5.2