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@5750 35acf78f-673a-0410-8e92-d51de3d6d3f4

This commit is contained in:
gdisirio 2013-05-23 15:20:39 +00:00
parent ec80f9b8a4
commit 141f14c79a
3 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
os/hal/platforms/SPC5xx/DSPI_v1/spi_lld.c
View File

@ -283,7 +283,7 @@ static void spi_start_dma_tx8(SPIDriver *spip,
spip->dspi->PUSHR.R = spip->tx_intbuf | (uint32_t)*txbuf++; spip->dspi->PUSHR.R = spip->tx_intbuf | (uint32_t)*txbuf++;
/* Setting up TX1 DMA TCD parameters for 8 bits transfers.*/ /* Setting up TX1 DMA TCD parameters for 8 bits transfers.*/
edmaChannelSetupLinkedOnMinor( edmaChannelSetupLinked(
spip->tx1_channel, /* channel. */ spip->tx1_channel, /* channel. */
spip->tx2_channel, /* linkch. */ spip->tx2_channel, /* linkch. */
txbuf, /* src. */ txbuf, /* src. */
@ -293,7 +293,7 @@ static void spi_start_dma_tx8(SPIDriver *spip,
0, /* ssize, 8 bits transfers. */ 0, /* ssize, 8 bits transfers. */
0, /* dsize, 8 bits transfers. */ 0, /* dsize, 8 bits transfers. */
1, /* nbytes, always one. */ 1, /* nbytes, always one. */
n/* - 1*/, /* iter. */ n - 1, /* iter. */
0, /* slast, no source adjust. */ 0, /* slast, no source adjust. */
0, /* dlast, no dest.adjust. */ 0, /* dlast, no dest.adjust. */
EDMA_TCD_MODE_DREQ); /* mode. */ EDMA_TCD_MODE_DREQ); /* mode. */
@ -691,6 +691,11 @@ void spi_lld_exchange(SPIDriver *spip, size_t n,
the whole transmitted data is pushed here and the TX DMA is not the whole transmitted data is pushed here and the TX DMA is not
activated.*/ activated.*/
spi_tx_prefill8(spip, n, txbuf); spi_tx_prefill8(spip, n, txbuf);
/* uint8_t *p = rxbuf;
*p++ = spip->dspi->POPR.R;
*p++ = spip->dspi->POPR.R;
*p++ = spip->dspi->POPR.R;
*p++ = spip->dspi->POPR.R;*/
} }
else { else {
spi_start_dma_tx8(spip, n, txbuf); spi_start_dma_tx8(spip, n, txbuf);

25
os/hal/platforms/SPC5xx/EDMA_v1/spc5_edma.h
View File

@ -743,7 +743,7 @@ typedef struct {
/** /**
* @brief Sets the word 5 fields into a TCD. * @brief Sets the word 5 fields into a TCD.
* @note Transfers are limited to 511 operations using this modality * @note Transfers are limited to 512 operations using this modality
* (citer parameter). * (citer parameter).
* *
* @param[in] tcdp pointer to an @p edma_tcd_t structure * @param[in] tcdp pointer to an @p edma_tcd_t structure
@ -753,7 +753,7 @@ typedef struct {
* *
* @api * @api
*/ */
#define edmaTCDSetWord5LinkedOnMinor(tcdp, linkch, citer, doff) \ #define edmaTCDSetWord5Linked(tcdp, linkch, citer, doff) \
((tcdp)->word[5] = (((uint32_t)0x80000000) | \ ((tcdp)->word[5] = (((uint32_t)0x80000000) | \
((uint32_t)(linkch) << 25) | \ ((uint32_t)(linkch) << 25) | \
((uint32_t)(citer) << 16) | \ ((uint32_t)(citer) << 16) | \
@ -785,7 +785,7 @@ typedef struct {
/** /**
* @brief Sets the word 7 fields into a TCD. * @brief Sets the word 7 fields into a TCD.
* @note Transfers are limited to 511 operations using this modality * @note Transfers are limited to 512 operations using this modality
* (biter parameter). * (biter parameter).
* *
* @param[in] tcdp pointer to an @p edma_tcd_t structure * @param[in] tcdp pointer to an @p edma_tcd_t structure
@ -795,7 +795,7 @@ typedef struct {
* *
* @api * @api
*/ */
#define edmaTCDSetWord7LinkedOnMinor(tcdp, linkch, biter, mode) \ #define edmaTCDSetWord7Linked(tcdp, linkch, biter, mode) \
((tcdp)->word[7] = (((uint32_t)0x80000000) | \ ((tcdp)->word[7] = (((uint32_t)0x80000000) | \
((uint32_t)(linkch) << 25) | \ ((uint32_t)(linkch) << 25) | \
((uint32_t)(biter) << 16) | \ ((uint32_t)(biter) << 16) | \
@ -854,8 +854,9 @@ typedef struct {
} }
/** /**
* @brief EDMA channel setup with linked channel on minor loop counter. * @brief EDMA channel setup with linked channel on both minor and major
* @note Transfers are limited to 511 operations using this modality * loop counters.
* @note Transfers are limited to 512 operations using this modality
* (iter parameter). * (iter parameter).
* *
* @param[in] channel eDMA channel number * @param[in] channel eDMA channel number
@ -874,18 +875,20 @@ typedef struct {
* *
* @api * @api
*/ */
#define edmaChannelSetupLinkedOnMinor(channel, linkch, src, dst, soff, \ #define edmaChannelSetupLinked(channel, linkch, src, dst, soff, \
doff, ssize, dsize, nbytes, iter, \ doff, ssize, dsize, nbytes, iter, \
slast, dlast, mode) { \ slast, dlast, mode) { \
edma_tcd_t *tcdp = edmaGetTCD(channel); \ edma_tcd_t *tcdp = edmaGetTCD(channel); \
edmaTCDSetWord0(tcdp, src); \ edmaTCDSetWord0(tcdp, src); \
edmaTCDSetWord1(tcdp, ssize, dsize, soff); \ edmaTCDSetWord1(tcdp, ssize, dsize, soff); \
edmaTCDSetWord2(tcdp, nbytes); \ edmaTCDSetWord2(tcdp, nbytes); \
edmaTCDSetWord3(tcdp, slast); \ edmaTCDSetWord3(tcdp, slast); \
edmaTCDSetWord4(tcdp, dst); \ edmaTCDSetWord4(tcdp, dst); \
edmaTCDSetWord5LinkedOnMinor(tcdp, linkch, iter, doff); \ edmaTCDSetWord5Linked(tcdp, linkch, iter, doff); \
edmaTCDSetWord6(tcdp, dlast); \ edmaTCDSetWord6(tcdp, dlast); \
edmaTCDSetWord7LinkedOnMinor(tcdp, linkch, iter, mode); \ edmaTCDSetWord7Linked(tcdp, linkch, iter, (mode) | \
EDMA_TCD_MODE_MELINK | \
EDMA_TCD_MODE_MLINKCH(linkch)); \
} }
/*===========================================================================*/ /*===========================================================================*/

5
testhal/SPC563Mxx/SPI/main.c
View File

@ -116,6 +116,11 @@ int main(void) {
txbuf[i] = (uint8_t)i; txbuf[i] = (uint8_t)i;
spiStart(&SPID2, &hs_spicfg); spiStart(&SPID2, &hs_spicfg);
SIU.PCR[102].R = PAL_MODE_OUTPUT_ALTERNATE(1); /* SCK */
SIU.PCR[103].R = PAL_MODE_OUTPUT_ALTERNATE(1); /* SIN */
SIU.PCR[104].R = PAL_MODE_OUTPUT_ALTERNATE(1); /* SOUT */
SIU.PCR[105].R = PAL_MODE_OUTPUT_ALTERNATE(1); /* PCS[0] */
spiExchange(&SPID2, 4, txbuf, rxbuf); spiExchange(&SPID2, 4, txbuf, rxbuf);
spiExchange(&SPID2, 4, txbuf, rxbuf); spiExchange(&SPID2, 4, txbuf, rxbuf);
spiExchange(&SPID2, 4, txbuf, rxbuf); spiExchange(&SPID2, 4, txbuf, rxbuf);