From 1db9b7a610623a2d1a844314930beab92caf99bc Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Fri, 28 Aug 2015 16:34:12 +0200 Subject: [PATCH] Rename .spi to .reg This makes the code more understandable. --- rpp/include/drv/spi_tms570.h | 2 +- rpp/src/drv/_tms570_rpp/spi_def.c | 8 ++++---- rpp/src/drv/spi_tms570.c | 26 +++++++++++++------------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/rpp/include/drv/spi_tms570.h b/rpp/include/drv/spi_tms570.h index 4919452..0db3090 100644 --- a/rpp/include/drv/spi_tms570.h +++ b/rpp/include/drv/spi_tms570.h @@ -195,7 +195,7 @@ typedef struct spi_dev { /* SPI interface */ typedef struct spi_tms570_drv { spi_drv_t spi_drv; - spiBASE_compat_t *spi; /* Base Reg. for SPI device register array */ + spiBASE_compat_t *reg; /* Base Reg. for SPI device register array */ unsigned txcnt; /* No. of transfered bytes for msg_act */ unsigned rxcnt; /* No. of received bytes for msg_act */ spi_dev_t *spi_devs; /* Pointer to table holding information about SPI devices bound to the interface */ diff --git a/rpp/src/drv/_tms570_rpp/spi_def.c b/rpp/src/drv/_tms570_rpp/spi_def.c index 0aef333..6de4f70 100644 --- a/rpp/src/drv/_tms570_rpp/spi_def.c +++ b/rpp/src/drv/_tms570_rpp/spi_def.c @@ -93,19 +93,19 @@ static spi_dev_t spi_ifc4_devs[] = { Index to this array is "SPI Interface ID -1" */ spi_tms570_drv_t spi_ifcs[4] = { [0] = { - .spi = mibspi_compat_REG1, + .reg = mibspi_compat_REG1, .spi_devs = spi_ifc1_devs, }, [1] = { - .spi = spi_compat_REG2, + .reg = spi_compat_REG2, .spi_devs = spi_ifc2_devs, }, [2] = { - .spi = mibspi_compat_REG3, + .reg = mibspi_compat_REG3, .spi_devs = spi_ifc3_devs, }, [3] = { - .spi = spi_compat_REG4, + .reg = spi_compat_REG4, .spi_devs = spi_ifc4_devs, }, }; diff --git a/rpp/src/drv/spi_tms570.c b/rpp/src/drv/spi_tms570.c index f2565b0..5c3431f 100644 --- a/rpp/src/drv/spi_tms570.c +++ b/rpp/src/drv/spi_tms570.c @@ -220,7 +220,7 @@ int spi_tms570_init(spi_tms570_drv_t *ifcs, int count) int i; for (i = 0; i < count; i++) { - spiInit(ifcs[i].spi); + spiInit(ifcs[i].reg); ifcs[i].spi_drv.ctrl_fnc = spi_tms570_ctrl_fnc; spi_rq_queue_init_head(&(ifcs[i].spi_drv)); ifcs[i].spi_drv.msg_act = NULL; @@ -246,7 +246,7 @@ static int spi_tms570_ctrl_fnc(spi_drv_t *ifc, int ctrl, void *p) if (spi_rq_queue_is_empty(ifc)) return 0; - tms570_drv->spi->INT0 = SPI_INT0_TXINTENA_m; + tms570_drv->reg->INT0 = SPI_INT0_TXINTENA_m; // Enable TXINT (Causes an interrupt // to be generated every time data is written to the shift // register, so that the next word can be written to TXBUF. @@ -294,9 +294,9 @@ void spi_tms570_isr(int spi_ifc, uint32_t flags) if (!msg) { /* Nothing to process */ volatile unsigned int dummy_read; /* Disable TXEMPTY IRQ */ - spi_tms570_drv->spi->INT0 = 0x00; - spi_tms570_drv->spi->FLG = 0x00; - dummy_read = spi_tms570_drv->spi->BUF; + spi_tms570_drv->reg->INT0 = 0x00; + spi_tms570_drv->reg->FLG = 0x00; + dummy_read = spi_tms570_drv->reg->BUF; // FIXME "INT |= " with disabled IRQ ?? return; } @@ -335,8 +335,8 @@ void spi_tms570_isr(int spi_ifc, uint32_t flags) /* RX/TX transfers */ do { /* Receive all the incoming data */ - while (spi_tms570_drv->spi->FLG & SPI_FLG_RXINT_m) { - rx_data = spi_tms570_drv->spi->BUF; + while (spi_tms570_drv->reg->FLG & SPI_FLG_RXINT_m) { + rx_data = spi_tms570_drv->reg->BUF; if (msg->rx_buf && (rxcnt < rq_len)) msg->rx_buf[rxcnt++] = rx_data & 0xFF; @@ -349,7 +349,7 @@ void spi_tms570_isr(int spi_ifc, uint32_t flags) while (1) { /* Tx buffer full or nothing to send */ stop_fl = ((txcnt >= rq_len) || - (!(spi_tms570_drv->spi->FLG & SPI_FLG_TXINT_m))); + (!(spi_tms570_drv->reg->FLG & SPI_FLG_TXINT_m))); if (stop_fl) break; @@ -365,11 +365,11 @@ void spi_tms570_isr(int spi_ifc, uint32_t flags) if (txcnt == rq_len) /* Disable CS for the last byte of the transfer */ spi_tms570_drv->transfer_ctrl &= ~SPI_DAT1_CSHOLD_m; - spi_tms570_drv->spi->DAT1 = + spi_tms570_drv->reg->DAT1 = (uint32_t)(spi_tms570_drv->transfer_ctrl | val_to_wr); /* We just received something */ - if (spi_tms570_drv->spi->FLG & SPI_FLG_RXINT_m) + if (spi_tms570_drv->reg->FLG & SPI_FLG_RXINT_m) break; } } while (!stop_fl); @@ -378,7 +378,7 @@ void spi_tms570_isr(int spi_ifc, uint32_t flags) if ((rxcnt >= rq_len) || (!msg->rx_buf && (txcnt >= rq_len) && - !(spi_tms570_drv->spi->FLG & SPI_FLG_RXINT_m))) { // FIXME + !(spi_tms570_drv->reg->FLG & SPI_FLG_RXINT_m))) { // FIXME /* Sending of the message successfully finished */ spi_isr_lock(saveif); @@ -393,9 +393,9 @@ void spi_tms570_isr(int spi_ifc, uint32_t flags) continue; } if (txcnt < rq_len) - spi_tms570_drv->spi->INT0 = SPI_INT0_TXINTENA_m; + spi_tms570_drv->reg->INT0 = SPI_INT0_TXINTENA_m; else - spi_tms570_drv->spi->INT0 = SPI_INT0_RXINTENA_m; + spi_tms570_drv->reg->INT0 = SPI_INT0_RXINTENA_m; } while (1); } -- 2.39.2