andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

STM32 port files modified to use the new ST header. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1063 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2009-07-18 11:52:08 +00:00
parent 6d390a7c46
commit dbb70634be
5 changed files with 7901 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
ports/ARMCM3-STM32F103/pal_lld.c
View File

@ -27,78 +27,72 @@
#include <ch.h> #include <ch.h>
#include <pal.h> #include <pal.h>
#if defined(STM32F10X_LD)
#define APB2_RST_MASK (RCC_APB2RSTR_IOPARST | RCC_APB2RSTR_IOPBRST | \
RCC_APB2RSTR_IOPCRST | RCC_APB2RSTR_IOPDRST | \
RCC_APB2RSTR_AFIORST)
#define APB2_EN_MASK (RCC_APB2ENR_IOPAEN | RCC_APB2ENR_IOPBEN | \
RCC_APB2ENR_IOPCEN | RCC_APB2ENR_IOPDEN | \
RCC_APB2ENR_AFIOEN)
#elif defined(STM32F10X_HD)
#define APB2_RST_MASK (RCC_APB2RSTR_IOPARST | RCC_APB2RSTR_IOPBRST | \
RCC_APB2RSTR_IOPCRST | RCC_APB2RSTR_IOPDRST | \
RCC_APB2RSTR_IOPERST | RCC_APB2RSTR_IOPFRST | \
RCC_APB2RSTR_IOPGRST | RCC_APB2RSTR_AFIORST);
#define APB2_EN_MASK (RCC_APB2ENR_IOPAEN | RCC_APB2ENR_IOPBEN | \
RCC_APB2ENR_IOPCEN | RCC_APB2ENR_IOPDEN | \
RCC_APB2ENR_IOPEEN | RCC_APB2ENR_IOPFEN | \
RCC_APB2ENR_IOPGEN | RCC_APB2ENR_AFIOEN)
#else
/* Defaults on Medium Density devices.*/
#define APB2_RST_MASK (RCC_APB2RSTR_IOPARST | RCC_APB2RSTR_IOPBRST | \
RCC_APB2RSTR_IOPCRST | RCC_APB2RSTR_IOPDRST | \
RCC_APB2RSTR_IOPERST | RCC_APB2RSTR_AFIORST);
#define APB2_EN_MASK (RCC_APB2ENR_IOPAEN | RCC_APB2ENR_IOPBEN | \
RCC_APB2ENR_IOPCEN | RCC_APB2ENR_IOPDEN | \
RCC_APB2ENR_IOPEEN | RCC_APB2ENR_AFIOEN)
#endif
/** /**
* @brief STM32 I/O ports configuration. * @brief STM32 I/O ports configuration.
* @details Ports A-D clocks enabled, AFIO clock enabled. * @details Ports A-D(E, F, G) clocks enabled, AFIO clock enabled.
* *
* @param[in] config the STM32 ports configuration * @param[in] config the STM32 ports configuration
*/ */
void _pal_lld_init(const STM32GPIOConfig *config) { void _pal_lld_init(const STM32GPIOConfig *config) {
uint32_t clocks = RCC_APB2ENR_AFIOEN;
#if defined(_GPIOA) /*
clocks |= RCC_APB2ENR_IOPAEN; * Enables the GPIO related clocks.
#endif */
#if defined(_GPIOB) RCC->APB2ENR |= APB2_EN_MASK;
clocks |= RCC_APB2ENR_IOPBEN;
#endif
#if defined(_GPIOC)
clocks |= RCC_APB2ENR_IOPCEN;
#endif
#if defined(_GPIOD)
clocks |= RCC_APB2ENR_IOPDEN;
#endif
#if defined(_GPIOE)
clocks |= RCC_APB2ENR_IOPEEN;
#endif
RCC->APB2ENR |= clocks;
/* /*
* Resets the GPIO ports and AFIO. * Resets the GPIO ports and AFIO.
*/ */
RCC->APB2RSTR = RCC_APB2RSTR_IOPARST | RCC_APB2RSTR_IOPBRST | RCC->APB2RSTR = APB2_RST_MASK;
RCC_APB2RSTR_IOPCRST | RCC_APB2RSTR_IOPDRST |
RCC_APB2RSTR_IOPERST | RCC_APB2RSTR_IOPFRST |
RCC_APB2RSTR_IOPGRST | RCC_APB2RSTR_AFIORST;
RCC->APB2RSTR = 0; RCC->APB2RSTR = 0;
#if defined(_GPIOA)
IOPORT_A->ODR = config->PAData.odr; IOPORT_A->ODR = config->PAData.odr;
IOPORT_A->CRH = config->PAData.crh; IOPORT_A->CRH = config->PAData.crh;
IOPORT_A->CRL = config->PAData.crl; IOPORT_A->CRL = config->PAData.crl;
#endif
#if defined(_GPIOB)
IOPORT_B->ODR = config->PBData.odr; IOPORT_B->ODR = config->PBData.odr;
IOPORT_B->CRH = config->PBData.crh; IOPORT_B->CRH = config->PBData.crh;
IOPORT_B->CRL = config->PBData.crl; IOPORT_B->CRL = config->PBData.crl;
#endif
#if defined(_GPIOC)
IOPORT_C->ODR = config->PCData.odr; IOPORT_C->ODR = config->PCData.odr;
IOPORT_C->CRH = config->PCData.crh; IOPORT_C->CRH = config->PCData.crh;
IOPORT_C->CRL = config->PCData.crl; IOPORT_C->CRL = config->PCData.crl;
#endif
#if defined(_GPIOD)
IOPORT_D->ODR = config->PDData.odr; IOPORT_D->ODR = config->PDData.odr;
IOPORT_D->CRH = config->PDData.crh; IOPORT_D->CRH = config->PDData.crh;
IOPORT_D->CRL = config->PDData.crl; IOPORT_D->CRL = config->PDData.crl;
#endif #if !defined(STM32F10X_LD) || defined(__DOXYGEN__)
#if defined(_GPIOE)
IOPORT_E->ODR = config->PEData.odr; IOPORT_E->ODR = config->PEData.odr;
IOPORT_E->CRH = config->PEData.crh; IOPORT_E->CRH = config->PEData.crh;
IOPORT_E->CRL = config->PEData.crl; IOPORT_E->CRL = config->PEData.crl;
#endif #endif
#if defined(STM32F10X_HD) || defined(__DOXYGEN__)
#if defined(_GPIOF)
IOPORT_F->ODR = config->PFData.odr; IOPORT_F->ODR = config->PFData.odr;
IOPORT_F->CRH = config->PFData.crh; IOPORT_F->CRH = config->PFData.crh;
IOPORT_F->CRL = config->PFData.crl; IOPORT_F->CRL = config->PFData.crl;
#endif
#if defined(_GPIOG)
IOPORT_G->ODR = config->PGData.odr; IOPORT_G->ODR = config->PGData.odr;
IOPORT_G->CRH = config->PGData.crh; IOPORT_G->CRH = config->PGData.crh;
IOPORT_G->CRL = config->PGData.crl; IOPORT_G->CRL = config->PGData.crl;

32
ports/ARMCM3-STM32F103/pal_lld.h
View File

@ -31,10 +31,10 @@
* Tricks required to make the TRUE/FALSE declaration inside the library * Tricks required to make the TRUE/FALSE declaration inside the library
* compatible. * compatible.
*/ */
#ifndef __STM32F10x_MAP_H #ifndef __STM32F10x_H
#undef FALSE #undef FALSE
#undef TRUE #undef TRUE
#include "stm32f10x_map.h" #include <stm32f10x.h>
#define FALSE 0 #define FALSE 0
#define TRUE (!FALSE) #define TRUE (!FALSE)
#endif #endif
@ -63,31 +63,21 @@ typedef struct {
* or whole ports can be reprogrammed at later time. * or whole ports can be reprogrammed at later time.
*/ */
typedef struct { typedef struct {
#if defined(_GPIOA) || defined(__DOXYGEN__)
/** @brief Port A setup data.*/ /** @brief Port A setup data.*/
stm32_gpio_setup_t PAData; stm32_gpio_setup_t PAData;
#endif
#if defined(_GPIOB) || defined(__DOXYGEN__)
/** @brief Port B setup data.*/ /** @brief Port B setup data.*/
stm32_gpio_setup_t PBData; stm32_gpio_setup_t PBData;
#endif
#if defined(_GPIOC) || defined(__DOXYGEN__)
/** @brief Port C setup data.*/ /** @brief Port C setup data.*/
stm32_gpio_setup_t PCData; stm32_gpio_setup_t PCData;
#endif
#if defined(_GPIOD) || defined(__DOXYGEN__)
/** @brief Port D setup data.*/ /** @brief Port D setup data.*/
stm32_gpio_setup_t PDData; stm32_gpio_setup_t PDData;
#endif #if !defined(STM32F10X_LD) || defined(__DOXYGEN__)
#if defined(_GPIOE) || defined(__DOXYGEN__)
/** @brief Port E setup data.*/ /** @brief Port E setup data.*/
stm32_gpio_setup_t PEData; stm32_gpio_setup_t PEData;
#endif #endif
#if defined(_GPIOF) || defined(__DOXYGEN__) #if defined(STM32F10X_HD) || defined(__DOXYGEN__)
/** @brief Port F setup data.*/ /** @brief Port F setup data.*/
stm32_gpio_setup_t PFData; stm32_gpio_setup_t PFData;
#endif
#if defined(_GPIOG) || defined(__DOXYGEN__)
/** @brief Port G setup data.*/ /** @brief Port G setup data.*/
stm32_gpio_setup_t PGData; stm32_gpio_setup_t PGData;
#endif #endif
@ -126,49 +116,39 @@ typedef GPIO_TypeDef * ioportid_t;
/** /**
* @brief GPIO port A identifier. * @brief GPIO port A identifier.
*/ */
#if defined(_GPIOA) || defined(__DOXYGEN__)
#define IOPORT_A GPIOA #define IOPORT_A GPIOA
#endif
/** /**
* @brief GPIO port B identifier. * @brief GPIO port B identifier.
*/ */
#if defined(_GPIOB) || defined(__DOXYGEN__)
#define IOPORT_B GPIOB #define IOPORT_B GPIOB
#endif
/** /**
* @brief GPIO port C identifier. * @brief GPIO port C identifier.
*/ */
#if defined(_GPIOC) || defined(__DOXYGEN__)
#define IOPORT_C GPIOC #define IOPORT_C GPIOC
#endif
/** /**
* @brief GPIO port D identifier. * @brief GPIO port D identifier.
*/ */
#if defined(_GPIOD) || defined(__DOXYGEN__)
#define IOPORT_D GPIOD #define IOPORT_D GPIOD
#endif
/** /**
* @brief GPIO port E identifier. * @brief GPIO port E identifier.
*/ */
#if defined(_GPIOE) || defined(__DOXYGEN__) #if !defined(STM32F10X_LD) || defined(__DOXYGEN__)
#define IOPORT_E GPIOE #define IOPORT_E GPIOE
#endif #endif
/** /**
* @brief GPIO port F identifier. * @brief GPIO port F identifier.
*/ */
#if defined(_GPIOF) || defined(__DOXYGEN__) #if defined(STM32F10X_HD) || defined(__DOXYGEN__)
#define IOPORT_F GPIOF #define IOPORT_F GPIOF
#endif
/** /**
* @brief GPIO port G identifier. * @brief GPIO port G identifier.
*/ */
#if defined(_GPIOG) || defined(__DOXYGEN__)
#define IOPORT_G GPIOG #define IOPORT_G GPIOG
#endif #endif

7
ports/ARMCM3-STM32F103/stm32_serial.c
View File

@ -29,7 +29,6 @@
#include "board.h" #include "board.h"
#include "nvic.h" #include "nvic.h"
#include "stm32_serial.h" #include "stm32_serial.h"
#include "stm32f10x_nvic.h"
#if USE_STM32_USART1 || defined(__DOXYGEN__) #if USE_STM32_USART1 || defined(__DOXYGEN__)
/** @brief USART1 serial driver identifier.*/ /** @brief USART1 serial driver identifier.*/
@ -198,7 +197,7 @@ void serial_init(uint32_t prio1, uint32_t prio2, uint32_t prio3) {
usart_setup(USART1, DEFAULT_USART_BITRATE, 0, usart_setup(USART1, DEFAULT_USART_BITRATE, 0,
USART_CR2_STOP1_BITS | USART_CR2_LINEN, 0); USART_CR2_STOP1_BITS | USART_CR2_LINEN, 0);
GPIOA->CRH = (GPIOA->CRH & 0xFFFFF00F) | 0x000004B0; GPIOA->CRH = (GPIOA->CRH & 0xFFFFF00F) | 0x000004B0;
NVICEnableVector(USART1_IRQChannel, prio1); NVICEnableVector(USART1_IRQn, prio1);
#endif #endif
#if USE_STM32_USART2 #if USE_STM32_USART2
@ -207,7 +206,7 @@ void serial_init(uint32_t prio1, uint32_t prio2, uint32_t prio3) {
usart_setup(USART2, DEFAULT_USART_BITRATE, 0, usart_setup(USART2, DEFAULT_USART_BITRATE, 0,
USART_CR2_STOP1_BITS | USART_CR2_LINEN, 0); USART_CR2_STOP1_BITS | USART_CR2_LINEN, 0);
GPIOA->CRL = (GPIOA->CRL & 0xFFFF00FF) | 0x00004B00; GPIOA->CRL = (GPIOA->CRL & 0xFFFF00FF) | 0x00004B00;
NVICEnableVector(USART2_IRQChannel, prio2); NVICEnableVector(USART2_IRQn, prio2);
#endif #endif
#if USE_STM32_USART3 #if USE_STM32_USART3
@ -216,7 +215,7 @@ void serial_init(uint32_t prio1, uint32_t prio2, uint32_t prio3) {
usart_setup(USART3, DEFAULT_USART_BITRATE, 0, usart_setup(USART3, DEFAULT_USART_BITRATE, 0,
USART_CR2_STOP1_BITS | USART_CR2_LINEN, 0); USART_CR2_STOP1_BITS | USART_CR2_LINEN, 0);
GPIOB->CRH = (GPIOB->CRH & 0xFFFF00FF) | 0x00004B00; GPIOB->CRH = (GPIOB->CRH & 0xFFFF00FF) | 0x00004B00;
NVICEnableVector(USART3_IRQChannel, prio3); NVICEnableVector(USART3_IRQn, prio3);
#endif #endif
} }

14
ports/ARMCM3-STM32F103/stm32_serial.h
View File

@ -31,13 +31,13 @@
* Tricks required to make the TRUE/FALSE declaration inside the library * Tricks required to make the TRUE/FALSE declaration inside the library
* compatible. * compatible.
*/ */
#ifndef __STM32F10x_MAP_H //#ifndef __STM32F10x_MAP_H
#undef FALSE //#undef FALSE
#undef TRUE //#undef TRUE
#include "stm32f10x_map.h" //#include "stm32f10x_map.h"
#define FALSE 0 //#define FALSE 0
#define TRUE (!FALSE) //#define TRUE (!FALSE)
#endif //#endif
/** /**
* @brief Serial buffers size. * @brief Serial buffers size.

7851
ports/ARMCM3-STM32F103/stm32f10x.h Normal file
View File

File diff suppressed because it is too large Load Diff