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

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1251 35acf78f-673a-0410-8e92-d51de3d6d3f4

This commit is contained in:
gdisirio 2009-10-24 10:09:28 +00:00
parent 09194e6f22
commit fb68f0d517
8 changed files with 82 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/ARMCM3-STM32F103-GCC/Makefile
View File

@ -68,8 +68,10 @@ CSRC = ${PORTSRC} \
${TESTSRC} \
${CHIBIOS}/os/io/pal.c \
${CHIBIOS}/os/io/serial.c \
${CHIBIOS}/os/io/spi.c \
${CHIBIOS}/os/io/platforms/STM32/pal_lld.c \
${CHIBIOS}/os/io/platforms/STM32/serial_lld.c \
${CHIBIOS}/os/io/platforms/STM32/spi_lld.c \
${CHIBIOS}/os/various/evtimer.c \
board.c main.c

2
demos/ARMCM3-STM32F103-GCC/board.h
View File

@ -24,13 +24,11 @@
* Tricks required to make the TRUE/FALSE declaration inside the library
* compatible.
*/
#ifndef __STM32F10x_H
#undef FALSE
#undef TRUE
#include <stm32f10x.h>
#define FALSE 0
#define TRUE (!FALSE)
#endif
/*
* Uncomment this if you want a 48MHz system clock, else it will be 72MHz.

6
os/io/platforms/STM32/pal_lld.h
View File

@ -27,17 +27,11 @@
#ifndef _PAL_LLD_H_
#define _PAL_LLD_H_
/*
* Tricks required to make the TRUE/FALSE declaration inside the library
* compatible.
*/
#ifndef __STM32F10x_H
#undef FALSE
#undef TRUE
#include <stm32f10x.h>
#define FALSE 0
#define TRUE (!FALSE)
#endif
/*===========================================================================*/
/* I/O Ports Types and constants. */

6
os/io/platforms/STM32/serial_lld.h
View File

@ -27,17 +27,11 @@
#ifndef _SERIAL_LLD_H_
#define _SERIAL_LLD_H_
/*
* Tricks required to make the TRUE/FALSE declaration inside the library
* compatible.
*/
#ifndef __STM32F10x_H
#undef FALSE
#undef TRUE
#include <stm32f10x.h>
#define FALSE 0
#define TRUE (!FALSE)
#endif
/*===========================================================================*/
/* Driver pre-compile time settings. */

30
os/io/platforms/STM32/spi_lld.c
View File

@ -27,11 +27,41 @@
#include <ch.h>
#include <spi.h>
#include "nvic.h"
#include "board.h"
#if USE_STM32_SPI1 || defined(__DOXYGEN__)
/** @brief SPI1 driver identifier.*/
SPIDriver SPID1;
#endif
#if USE_STM32_SPI2 || defined(__DOXYGEN__)
/** @brief SPI2 driver identifier.*/
SPIDriver SPID2;
#endif
/**
* @brief Low level SPI driver initialization.
*/
void spi_lld_init(void) {
#if USE_STM32_SPI1
spiObjectInit(&SPID1);
SPID1.spd_spi = SPI1;
SPID1.spd_dmarx = DMA1_Channel2;
SPID1.spd_dmatx = DMA1_Channel3;
RCC->APB2ENR |= RCC_APB2ENR_SPI1EN;
GPIOA->CRH = (GPIOA->CRH & 0x000FFFFF) | 0xB4B00000;
#endif
#if USE_STM32_SPI2
spiObjectInit(&SPID2);
SPID2.spd_spi = SPI2;
SPID2.spd_dmarx = DMA1_Channel4;
SPID2.spd_dmatx = DMA1_Channel5;
RCC->APB1ENR |= RCC_APB1ENR_SPI2EN;
GPIOB->CRL = (GPIOB->CRL & 0x000FFFFF) | 0xB4B00000;
#endif
}
/**

44
os/io/platforms/STM32/spi_lld.h
View File

@ -27,19 +27,32 @@
#ifndef _SPI_LLD_H_
#define _SPI_LLD_H_
#undef FALSE
#undef TRUE
#include <stm32f10x.h>
#define FALSE 0
#define TRUE (!FALSE)
/*===========================================================================*/
/* Driver pre-compile time settings. */
/*===========================================================================*/
/**
* @brief Enables the mutual exclusion APIs on the SPI bus.
* @brief SPI1 driver enable switch.
* @details If set to @p TRUE the support for SPI is included.
* @note The default is @p TRUE.
*/
#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
#define SPI_USE_MUTUAL_EXCLUSION TRUE
#if !defined(USE_STM32_SPI1) || defined(__DOXYGEN__)
#define USE_STM32_SPI1 TRUE
#endif
#if SPI_USE_MUTUAL_EXCLUSION && !CH_USE_MUTEXES && !CH_USE_SEMAPHORES
#error "SPI_USE_MUTUAL_EXCLUSION requires CH_USE_MUTEXES and/or CH_USE_SEMAPHORES"
/**
* @brief SPI1 driver enable switch.
* @details If set to @p TRUE the support for SPI is included.
* @note The default is @p TRUE.
*/
#if !defined(USE_STM32_SPI2) || defined(__DOXYGEN__)
#define USE_STM32_SPI2 TRUE
#endif
/*===========================================================================*/
@ -50,9 +63,9 @@
* @brief Driver state machine possible states.
*/
typedef enum {
SPI_UNINIT = 0,//!< SPI_UNINIT
SPI_IDLE = 1, //!< SPI_IDLE
SPI_ACTIVE = 2 //!< SPI_ACTIVE
SPI_UNINIT = 0,
SPI_IDLE = 1,
SPI_ACTIVE = 2
} spistate_t;
/**
@ -85,16 +98,28 @@ typedef struct {
#endif
#endif /* SPI_USE_MUTUAL_EXCLUSION */
/**
* Current configuration data.
* @brief Current configuration data.
*/
const SPIConfig *spd_config;
/* End of the mandatory fields.*/
SPI_TypeDef *spd_spi;
DMA_Channel_TypeDef *spd_dmarx;
DMA_Channel_TypeDef *spd_dmatx;
} SPIDriver;
/*===========================================================================*/
/* External declarations. */
/*===========================================================================*/
/** @cond never*/
#if USE_STM32_SPI1
extern SPIDriver SPID1;
#endif
#if USE_STM32_SPI2
extern SPIDriver SPID2;
#endif
#ifdef __cplusplus
extern "C" {
#endif
@ -106,6 +131,7 @@ extern "C" {
#ifdef __cplusplus
}
#endif
/** @endcond*/
#endif /* _SPI_LLD_H_ */

11
os/io/spi.h
View File

@ -27,6 +27,17 @@
#ifndef _SPI_H_
#define _SPI_H_
/**
* @brief Enables the mutual exclusion APIs on the SPI bus.
*/
#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
#define SPI_USE_MUTUAL_EXCLUSION TRUE
#endif
#if SPI_USE_MUTUAL_EXCLUSION && !CH_USE_MUTEXES && !CH_USE_SEMAPHORES
#error "SPI_USE_MUTUAL_EXCLUSION requires CH_USE_MUTEXES and/or CH_USE_SEMAPHORES"
#endif
#include "spi_lld.h"
#ifdef __cplusplus

8
os/io/templates/spi_lld.h
View File

@ -50,9 +50,9 @@
* @brief Driver state machine possible states.
*/
typedef enum {
SPI_UNINIT = 0,//!< SPI_UNINIT
SPI_IDLE = 1, //!< SPI_IDLE
SPI_ACTIVE = 2 //!< SPI_ACTIVE
SPI_UNINIT = 0,
SPI_IDLE = 1,
SPI_ACTIVE = 2
} spistate_t;
/**
@ -85,7 +85,7 @@ typedef struct {
#endif
#endif /* SPI_USE_MUTUAL_EXCLUSION */
/**
* Current configuration data.
* @brief Current configuration data.
*/
const SPIConfig *spd_config;
/* End of the mandatory fields.*/