Skip to content

S
Simple PCIe FMC carrier SPEC
Commit 1ebee0ad authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

sw:drv:spi: wrap push/pop operations in functions 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent 2f7d70a6
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 3 deletions
software/kernel/spi-ocores.c
View file @ 1ebee0ad
...@@ -264,6 +264,11 @@ static void spi_ocores_hw_xfer_tx_push128(struct spi_ocores *sp) ...@@ -264,6 +264,11 @@ static void spi_ocores_hw_xfer_tx_push128(struct spi_ocores *sp)
} }
} }
static void spi_ocores_hw_xfer_tx_push(struct spi_ocores *sp)
{
sp->cur_tx_push(sp);
}
static void spi_ocores_hw_xfer_rx_pop8(struct spi_ocores *sp) static void spi_ocores_hw_xfer_rx_pop8(struct spi_ocores *sp)
{ {
uint32_t data; uint32_t data;
...@@ -332,6 +337,11 @@ static void spi_ocores_hw_xfer_rx_pop128(struct spi_ocores *sp) ...@@ -332,6 +337,11 @@ static void spi_ocores_hw_xfer_rx_pop128(struct spi_ocores *sp)
} }
} }
static void spi_ocores_hw_xfer_rx_pop(struct spi_ocores *sp)
{
sp->cur_rx_pop(sp);
}
static void spi_ocores_hw_xfer_start(struct spi_ocores *sp) static void spi_ocores_hw_xfer_start(struct spi_ocores *sp)
{ {
unsigned int cs = sp->master->cur_msg->spi->chip_select; unsigned int cs = sp->master->cur_msg->spi->chip_select;
...@@ -501,7 +511,7 @@ static int spi_ocores_sw_xfer_next_start(struct spi_ocores *sp) ...@@ -501,7 +511,7 @@ static int spi_ocores_sw_xfer_next_start(struct spi_ocores *sp)
err = spi_ocores_sw_xfer_next_init(sp); err = spi_ocores_sw_xfer_next_init(sp);
if (err) if (err)
return err; return err;
sp->cur_tx_push(sp); spi_ocores_hw_xfer_tx_push(sp);
spi_ocores_hw_xfer_start(sp); spi_ocores_hw_xfer_start(sp);
return 0; return 0;
...@@ -546,7 +556,7 @@ static int spi_ocores_process(struct spi_ocores *sp) ...@@ -546,7 +556,7 @@ static int spi_ocores_process(struct spi_ocores *sp)
if (ctrl & SPI_OCORES_CTRL_BUSY) if (ctrl & SPI_OCORES_CTRL_BUSY)
return -ENODATA; return -ENODATA;
sp->cur_rx_pop(sp); spi_ocores_hw_xfer_rx_pop(sp);
/* /*
* When we read is because a complete HW transfer is over, so we * When we read is because a complete HW transfer is over, so we
* can safely decrease the counter of pending bytes * can safely decrease the counter of pending bytes
...@@ -555,7 +565,7 @@ static int spi_ocores_process(struct spi_ocores *sp) ...@@ -555,7 +565,7 @@ static int spi_ocores_process(struct spi_ocores *sp)
sp->cur_len -= (nbits / 8); /* FIXME not working for !pow2 */ sp->cur_len -= (nbits / 8); /* FIXME not working for !pow2 */
if (spi_ocores_sw_xfer_pending(sp)) { if (spi_ocores_sw_xfer_pending(sp)) {
sp->cur_tx_push(sp); spi_ocores_hw_xfer_tx_push(sp);
spi_ocores_hw_xfer_start(sp); spi_ocores_hw_xfer_start(sp);
} else { } else {
int err; int err;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment