Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 06:42:32 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix a couple of compile problems introduced in recent commits

Browse Source
This commit is contained in:
Gregory Nutt
2016-06-15 14:10:59 -06:00
parent 027490924e
commit 5b26219a81
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/lpc11xx/lpc11_ssp.c
+6 -6
View File
@@ -454,7 +454,7 @@ static uint32_t ssp_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
priv->frequency = frequency; priv->frequency = frequency;
priv->actual = actual; priv->actual = actual;
ssperr("Frequency %d->%d\n", frequency, actual); spiinfo("Frequency %d->%d\n", frequency, actual);
return actual; return actual;
} }
@@ -505,7 +505,7 @@ static void ssp_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode)
break; break;
default: default:
ssperr("Bad mode: %d\n", mode); spierr("ERROR: Bad mode: %d\n", mode);
DEBUGASSERT(FALSE); DEBUGASSERT(FALSE);
return; return;
} }
@@ -593,7 +593,7 @@ static uint16_t ssp_send(FAR struct spi_dev_s *dev, uint16_t wd)
/* Get the value from the RX FIFO and return it */ /* Get the value from the RX FIFO and return it */
regval = ssp_getreg(priv, LPC11_SSP_DR_OFFSET); regval = ssp_getreg(priv, LPC11_SSP_DR_OFFSET);
ssperr("%04x->%04x\n", wd, regval); spiinfo("%04x->%04x\n", wd, regval);
return (uint16_t)regval; return (uint16_t)regval;
} }
@@ -631,7 +631,7 @@ static void ssp_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer,
/* Loop while thre are bytes remaining to be sent */ /* Loop while thre are bytes remaining to be sent */
ssperr("nwords: %d\n", nwords); spiinfo("nwords: %d\n", nwords);
u.pv = buffer; u.pv = buffer;
while (nwords > 0) while (nwords > 0)
{ {
@@ -659,7 +659,7 @@ static void ssp_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer,
/* Then discard all card responses until the RX & TX FIFOs are emptied. */ /* Then discard all card responses until the RX & TX FIFOs are emptied. */
ssperr("discarding\n"); spiinfo("discarding\n");
do do
{ {
/* Is there anything in the RX fifo? */ /* Is there anything in the RX fifo? */
@@ -724,7 +724,7 @@ static void ssp_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer,
* occurred). * occurred).
*/ */
ssperr("nwords: %d\n", nwords); spiinfo("nwords: %d\n", nwords);
u.pv = buffer; u.pv = buffer;
while (nwords || rxpending) while (nwords || rxpending)
{ {
arch/arm/src/lpc17xx/lpc17_ssp.c
+6 -6
View File
@@ -450,7 +450,7 @@ static uint32_t ssp_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
priv->frequency = frequency; priv->frequency = frequency;
priv->actual = actual; priv->actual = actual;
ssperr("Frequency %d->%d\n", frequency, actual); spiinfo("Frequency %d->%d\n", frequency, actual);
return actual; return actual;
} }
@@ -501,7 +501,7 @@ static void ssp_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode)
break; break;
default: default:
ssperr("Bad mode: %d\n", mode); spierr("ERROR: Bad mode: %d\n", mode);
DEBUGASSERT(FALSE); DEBUGASSERT(FALSE);
return; return;
} }
@@ -589,7 +589,7 @@ static uint16_t ssp_send(FAR struct spi_dev_s *dev, uint16_t wd)
/* Get the value from the RX FIFO and return it */ /* Get the value from the RX FIFO and return it */
regval = ssp_getreg(priv, LPC17_SSP_DR_OFFSET); regval = ssp_getreg(priv, LPC17_SSP_DR_OFFSET);
ssperr("%04x->%04x\n", wd, regval); spiinfo("%04x->%04x\n", wd, regval);
return (uint16_t)regval; return (uint16_t)regval;
} }
@@ -626,7 +626,7 @@ static void ssp_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size
/* Loop while thre are bytes remaining to be sent */ /* Loop while thre are bytes remaining to be sent */
ssperr("nwords: %d\n", nwords); spiinfo("nwords: %d\n", nwords);
u.pv = buffer; u.pv = buffer;
while (nwords > 0) while (nwords > 0)
{ {
@@ -654,7 +654,7 @@ static void ssp_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size
/* Then discard all card responses until the RX & TX FIFOs are emptied. */ /* Then discard all card responses until the RX & TX FIFOs are emptied. */
ssperr("discarding\n"); spiinfo("discarding\n");
do do
{ {
/* Is there anything in the RX fifo? */ /* Is there anything in the RX fifo? */
@@ -715,7 +715,7 @@ static void ssp_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw
/* While there is remaining to be sent (and no synchronization error has occurred) */ /* While there is remaining to be sent (and no synchronization error has occurred) */
ssperr("nwords: %d\n", nwords); spiinfo("nwords: %d\n", nwords);
u.pv = buffer; u.pv = buffer;
while (nwords || rxpending) while (nwords || rxpending)
{ {
arch/arm/src/tiva/Make.defs
+1
View File
@@ -81,6 +81,7 @@ CHIP_CSRCS += tiva_gpioirq.c tiva_lowputc.c tiva_serial.c tiva_ssi.c
ifeq ($(CONFIG_DEBUG_GPIO_INFO),y) ifeq ($(CONFIG_DEBUG_GPIO_INFO),y)
CHIP_CSRCS += tiva_dumpgpio.c CHIP_CSRCS += tiva_dumpgpio.c
endif
ifeq ($(CONFIG_ARCH_CHIP_TM4C129),y) ifeq ($(CONFIG_ARCH_CHIP_TM4C129),y)
CHIP_CSRCS += tm4c129_syscontrol.c CHIP_CSRCS += tm4c129_syscontrol.c