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

New AT91SAM7 SPI driver. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2271 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2010-10-23 16:24:16 +00:00
parent 66f21d9c87
commit 341a89dfd5
4 changed files with 47 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/ARM7-AT91SAM7X-FATFS-GCC/Makefile
View File

@ -5,7 +5,7 @@
# Compiler options here. # Compiler options here.
ifeq ($(USE_OPT),) ifeq ($(USE_OPT),)
USE_OPT = -O2 -ggdb -fomit-frame-pointer -mabi=apcs-gnu USE_OPT = -O0 -ggdb -fomit-frame-pointer -mabi=apcs-gnu
endif endif
# C++ specific options here (added to USE_OPT). # C++ specific options here (added to USE_OPT).

80
os/hal/platforms/AT91SAM7/spi_lld.c
View File

@ -58,6 +58,22 @@ SPIDriver SPID2;
* @p spiExchange are not affected. * @p spiExchange are not affected.
*/ */
static const uint16_t idle_buf[] = { static const uint16_t idle_buf[] = {
0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
@ -81,36 +97,20 @@ static const uint16_t idle_buf[] = {
/*===========================================================================*/ /*===========================================================================*/
/** /**
* @brief Synchronous SPI transfer. * @brief Initializes a SPI device.
*
* @param[in] n number of bytes to be exchanged
*
* @param[in] txbuf the pointer to the transmit buffer or @p NULL
* @param[out] rxbuf the pointer to the receive buffer or @p NULL
*/ */
#if 0 static void spi_init(AT91PS_SPI spi) {
void rw8(size_t n, const uint8_t *txbuf, uint8_t *rxbuf) {
size_t ntx = n;
while (n > 0) { /* Software reset must be written twice (errata for revision B parts).*/
uint32_t sr = AT91C_BASE_SPI->SPI_SR; spi->SPI_CR = AT91C_SPI_SWRST;
if (sr & AT91C_SPI_RDRF) { spi->SPI_CR = AT91C_SPI_SWRST;
uint8_t w = AT91C_BASE_SPI->SPI_RDR; spi->SPI_RCR = 0;
if (rxbuf != NULL) spi->SPI_RNCR = 0;
*rxbuf++ = w; spi->SPI_TCR = 0;
n--; spi->SPI_TNCR = 0;
continue; /* Priority over transmission. */ spi->SPI_PTCR = AT91C_PDC_RXTDIS | AT91C_PDC_TXTDIS;
} spi->SPI_MR = AT91C_SPI_MSTR | AT91C_SPI_MODFDIS;
if ((ntx > 0) && (sr & AT91C_SPI_TDRE)) {
if (txbuf != NULL)
AT91C_BASE_SPI->SPI_TDR = *txbuf++;
else
AT91C_BASE_SPI->SPI_TDR = 0xFF;
ntx--;
}
}
} }
#endif
#if defined(__GNUC__) #if defined(__GNUC__)
__attribute__((noinline)) __attribute__((noinline))
@ -125,6 +125,8 @@ static void spi_lld_serve_interrupt(SPIDriver *spip) {
if ((sr & AT91C_SPI_ENDRX) != 0) { if ((sr & AT91C_SPI_ENDRX) != 0) {
(void)spip->spd_spi->SPI_RDR; /* Clears eventual overflow.*/ (void)spip->spd_spi->SPI_RDR; /* Clears eventual overflow.*/
spip->spd_spi->SPI_PTCR = AT91C_PDC_RXTDIS |
AT91C_PDC_TXTDIS; /* PDC disabled. */
spip->spd_spi->SPI_IDR = AT91C_SPI_ENDRX; /* Interrupt disabled. */ spip->spd_spi->SPI_IDR = AT91C_SPI_ENDRX; /* Interrupt disabled. */
spip->spd_spi->SPI_CR = AT91C_SPI_SPIDIS; /* SPI disabled. */ spip->spd_spi->SPI_CR = AT91C_SPI_SPIDIS; /* SPI disabled. */
/* Portable SPI ISR code defined in the high level driver, note, it is /* Portable SPI ISR code defined in the high level driver, note, it is
@ -180,15 +182,11 @@ void spi_lld_init(void) {
#if AT91SAM7_SPI_USE_SPI0 #if AT91SAM7_SPI_USE_SPI0
spiObjectInit(&SPID1); spiObjectInit(&SPID1);
/* Software reset must be written twice (errata for revision B parts).*/ SPID1.spd_spi = AT91C_BASE_SPI0;
AT91C_BASE_SPI0->SPI_CR = AT91C_SPI_SWRST; spi_init(AT91C_BASE_SPI0);
AT91C_BASE_SPI0->SPI_CR = AT91C_SPI_SWRST;
AT91C_BASE_SPI0->SPI_MR = AT91C_SPI_MSTR | AT91C_SPI_MODFDIS;
AT91C_BASE_SPI0->SPI_PTCR = AT91C_PDC_RXTEN | AT91C_PDC_TXTEN;
AT91C_BASE_PIOA->PIO_PDR = SPI0_MISO | SPI0_MOSI | SPI0_SCK; AT91C_BASE_PIOA->PIO_PDR = SPI0_MISO | SPI0_MOSI | SPI0_SCK;
AT91C_BASE_PIOA->PIO_ASR = SPI0_MISO | SPI0_MOSI | SPI0_SCK; AT91C_BASE_PIOA->PIO_ASR = SPI0_MISO | SPI0_MOSI | SPI0_SCK;
AT91C_BASE_PIOA->PIO_PPUDR = SPI0_MISO | SPI0_MOSI | SPI0_SCK; AT91C_BASE_PIOA->PIO_PPUDR = SPI0_MISO | SPI0_MOSI | SPI0_SCK;
SPID1.spd_spi = AT91C_BASE_SPI0;
AIC_ConfigureIT(AT91C_ID_SPI0, AIC_ConfigureIT(AT91C_ID_SPI0,
AT91C_AIC_SRCTYPE_HIGH_LEVEL | AT91SAM7_SPI0_PRIORITY, AT91C_AIC_SRCTYPE_HIGH_LEVEL | AT91SAM7_SPI0_PRIORITY,
SPI0IrqHandler); SPI0IrqHandler);
@ -196,15 +194,11 @@ void spi_lld_init(void) {
#if AT91SAM7_SPI_USE_SPI1 #if AT91SAM7_SPI_USE_SPI1
spiObjectInit(&SPID2); spiObjectInit(&SPID2);
/* Software reset must be written twice (errata for revision B parts).*/ SPID2.spd_spi = AT91C_BASE_SPI1;
AT91C_BASE_SPI1->SPI_CR = AT91C_SPI_SWRST; spi_init(AT91C_BASE_SPI1);
AT91C_BASE_SPI1->SPI_CR = AT91C_SPI_SWRST;
AT91C_BASE_SPI1->SPI_MR = AT91C_SPI_MSTR | AT91C_SPI_MODFDIS;
AT91C_BASE_SPI1->SPI_PTCR = AT91C_PDC_RXTEN | AT91C_PDC_TXTEN;
AT91C_BASE_PIOA->PIO_PDR = SPI1_MISO | SPI1_MOSI | SPI1_SCK; AT91C_BASE_PIOA->PIO_PDR = SPI1_MISO | SPI1_MOSI | SPI1_SCK;
AT91C_BASE_PIOA->PIO_BSR = SPI1_MISO | SPI1_MOSI | SPI1_SCK; AT91C_BASE_PIOA->PIO_BSR = SPI1_MISO | SPI1_MOSI | SPI1_SCK;
AT91C_BASE_PIOA->PIO_PPUDR = SPI1_MISO | SPI1_MOSI | SPI1_SCK; AT91C_BASE_PIOA->PIO_PPUDR = SPI1_MISO | SPI1_MOSI | SPI1_SCK;
SPID2.spd_spi = AT91C_BASE_SPI1;
AIC_ConfigureIT(AT91C_ID_SPI1, AIC_ConfigureIT(AT91C_ID_SPI1,
AT91C_AIC_SRCTYPE_HIGH_LEVEL | AT91SAM7_SPI1_PRIORITY, AT91C_AIC_SRCTYPE_HIGH_LEVEL | AT91SAM7_SPI1_PRIORITY,
SPI1IrqHandler); SPI1IrqHandler);
@ -238,8 +232,6 @@ void spi_lld_start(SPIDriver *spip) {
} }
#endif #endif
} }
else
spip->spd_spi->SPI_CR = AT91C_SPI_SPIDIS;
/* Configuration.*/ /* Configuration.*/
spip->spd_spi->SPI_CSR[0] = spip->spd_config->spc_csr; spip->spd_spi->SPI_CSR[0] = spip->spd_config->spc_csr;
} }
@ -256,14 +248,12 @@ void spi_lld_stop(SPIDriver *spip) {
if (spip->spd_state != SPI_STOP) { if (spip->spd_state != SPI_STOP) {
#if AT91SAM7_SPI_USE_SPI0 #if AT91SAM7_SPI_USE_SPI0
if (&SPID1 == spip) { if (&SPID1 == spip) {
spip->spd_spi->SPI_CR = AT91C_SPI_SPIDIS;
AT91C_BASE_PMC->PMC_PCDR = (1 << AT91C_ID_SPI0); AT91C_BASE_PMC->PMC_PCDR = (1 << AT91C_ID_SPI0);
AIC_DisableIT(AT91C_ID_SPI0); AIC_DisableIT(AT91C_ID_SPI0);
} }
#endif #endif
#if AT91SAM7_SPI_USE_SPI1 #if AT91SAM7_SPI_USE_SPI1
if (&SPID1 == spip) { if (&SPID1 == spip) {
spip->spd_spi->SPI_CR = AT91C_SPI_SPIDIS;
AT91C_BASE_PMC->PMC_PCDR = (1 << AT91C_ID_SPI1); AT91C_BASE_PMC->PMC_PCDR = (1 << AT91C_ID_SPI1);
AIC_DisableIT(AT91C_ID_SPI0); AIC_DisableIT(AT91C_ID_SPI0);
} }
@ -315,6 +305,7 @@ void spi_lld_ignore(SPIDriver *spip, size_t n) {
spip->spd_spi->SPI_RPR = (AT91_REG)idle_buf; spip->spd_spi->SPI_RPR = (AT91_REG)idle_buf;
spip->spd_spi->SPI_IER = AT91C_SPI_ENDRX; spip->spd_spi->SPI_IER = AT91C_SPI_ENDRX;
spip->spd_spi->SPI_CR = AT91C_SPI_SPIEN; spip->spd_spi->SPI_CR = AT91C_SPI_SPIEN;
spip->spd_spi->SPI_PTCR = AT91C_PDC_RXTEN | AT91C_PDC_TXTEN;
} }
/** /**
@ -338,6 +329,7 @@ void spi_lld_exchange(SPIDriver *spip, size_t n,
spip->spd_spi->SPI_RPR = (AT91_REG)rxbuf; spip->spd_spi->SPI_RPR = (AT91_REG)rxbuf;
spip->spd_spi->SPI_IER = AT91C_SPI_ENDRX; spip->spd_spi->SPI_IER = AT91C_SPI_ENDRX;
spip->spd_spi->SPI_CR = AT91C_SPI_SPIEN; spip->spd_spi->SPI_CR = AT91C_SPI_SPIEN;
spip->spd_spi->SPI_PTCR = AT91C_PDC_RXTEN | AT91C_PDC_TXTEN;
} }
/** /**
@ -358,6 +350,7 @@ void spi_lld_send(SPIDriver *spip, size_t n, const void *txbuf) {
spip->spd_spi->SPI_RPR = (AT91_REG)idle_buf; spip->spd_spi->SPI_RPR = (AT91_REG)idle_buf;
spip->spd_spi->SPI_IER = AT91C_SPI_ENDRX; spip->spd_spi->SPI_IER = AT91C_SPI_ENDRX;
spip->spd_spi->SPI_CR = AT91C_SPI_SPIEN; spip->spd_spi->SPI_CR = AT91C_SPI_SPIEN;
spip->spd_spi->SPI_PTCR = AT91C_PDC_RXTEN | AT91C_PDC_TXTEN;
} }
/** /**
@ -378,6 +371,7 @@ void spi_lld_receive(SPIDriver *spip, size_t n, void *rxbuf) {
spip->spd_spi->SPI_RPR = (AT91_REG)rxbuf; spip->spd_spi->SPI_RPR = (AT91_REG)rxbuf;
spip->spd_spi->SPI_IER = AT91C_SPI_ENDRX; spip->spd_spi->SPI_IER = AT91C_SPI_ENDRX;
spip->spd_spi->SPI_CR = AT91C_SPI_SPIEN; spip->spd_spi->SPI_CR = AT91C_SPI_SPIEN;
spip->spd_spi->SPI_PTCR = AT91C_PDC_RXTEN | AT91C_PDC_TXTEN;
} }
#endif /* CH_HAL_USE_SPI */ #endif /* CH_HAL_USE_SPI */

4
readme.txt
View File

@ -115,8 +115,10 @@
- NEW: Added to the UART driver the capability to return the number of - NEW: Added to the UART driver the capability to return the number of
not yet transferred frames when stopping an operation. not yet transferred frames when stopping an operation.
- NEW: Added more compile-time checks to the various STM32 device drivers. - NEW: Added more compile-time checks to the various STM32 device drivers.
- NEW: Improved LPC214x SPI driver, now it uses IRQs and implements the - NEW: Improved LPC214x SPI driver, now it uses IRQs, it implements the
new SPI device driver model. new SPI device driver model.
- NEW: Improved AT91SAM7 SPI driver, now it uses IRQs and DMAs, it implements
the new SPI device driver model.
- NEW: Added a simple STM32 ADC demo under ./testhal/STM32/ADC. - NEW: Added a simple STM32 ADC demo under ./testhal/STM32/ADC.
- NEW: Added a simple STM32 CAN demo under ./testhal/STM32/CAN. - NEW: Added a simple STM32 CAN demo under ./testhal/STM32/CAN.
- NEW: Added a simple STM32 PWM demo under ./testhal/STM32/PWM. - NEW: Added a simple STM32 PWM demo under ./testhal/STM32/PWM.

8
todo.txt
View File

@ -23,10 +23,10 @@ Within 2.1.x
* Make the ADC driver have the same synchronous/asynchronous API of the * Make the ADC driver have the same synchronous/asynchronous API of the
new SPI driver model. new SPI driver model.
* General HAL improvements. * General HAL improvements.
- Update the AT91SAM7 SPI driver (DMA and/or ISR). * Update the AT91SAM7 SPI driver (DMA and/or ISR).
- Verify the FatFs demo on both the AT91SAM7X and AT91SAM7S. * Verify the FatFs demo on both the AT91SAM7X and AT91SAM7S.
- Update the LPC214x SPI driver (ISR). * Update the LPC214x SPI driver (ISR).
- Verify the LPC214x FatFs demo. * Verify the LPC214x FatFs demo.
- Write a new SPI driver for LPC1xxx (ISR)(it should be very close to the - Write a new SPI driver for LPC1xxx (ISR)(it should be very close to the
LPC214x one). LPC214x one).
- Evaluate if to add a synchronous API to the UART driver, eventually do so. - Evaluate if to add a synchronous API to the UART driver, eventually do so.