diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-12-05 11:38:27 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-12-05 11:38:27 +0000 |
| commit | 56ce4d958caf7f5850a14f31a6a23f7676f3d4a3 (patch) | |
| tree | 34901efc6edf9047ce5013b4c060ddbf1cd90692 | |
| parent | 064bb29a4c78b4c5f5aca745103dc4533ce77361 (diff) | |
| download | ChibiOS-56ce4d958caf7f5850a14f31a6a23f7676f3d4a3.tar.gz ChibiOS-56ce4d958caf7f5850a14f31a6a23f7676f3d4a3.tar.bz2 ChibiOS-56ce4d958caf7f5850a14f31a6a23f7676f3d4a3.zip | |
Fixed bug 3127926.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2458 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | os/hal/platforms/LPC13xx/spi_lld.h | 35 | ||||
| -rw-r--r-- | readme.txt | 2 |
2 files changed, 3 insertions, 34 deletions
diff --git a/os/hal/platforms/LPC13xx/spi_lld.h b/os/hal/platforms/LPC13xx/spi_lld.h index 63a233f18..5d4dcb334 100644 --- a/os/hal/platforms/LPC13xx/spi_lld.h +++ b/os/hal/platforms/LPC13xx/spi_lld.h @@ -119,15 +119,6 @@ #endif
/**
- * @brief SPI2 driver enable switch.
- * @details If set to @p TRUE the support for device SSP1 is included.
- * @note The default is @p TRUE.
- */
-#if !defined(LPC13xx_SPI_USE_SSP1) || defined(__DOXYGEN__)
-#define LPC13xx_SPI_USE_SSP1 TRUE
-#endif
-
-/**
* @brief SSP0 PCLK divider.
*/
#if !defined(LPC13xx_SPI_SSP0CLKDIV) || defined(__DOXYGEN__)
@@ -135,13 +126,6 @@ #endif
/**
- * @brief SSP1 PCLK divider.
- */
-#if !defined(LPC13xx_SPI_SSP1CLKDIV) || defined(__DOXYGEN__)
-#define LPC13xx_SPI_SSP1CLKDIV 1
-#endif
-
-/**
* @brief SPI0 interrupt priority level setting.
*/
#if !defined(LPC13xx_SPI_SSP0_IRQ_PRIORITY) || defined(__DOXYGEN__)
@@ -149,13 +133,6 @@ #endif
/**
- * @brief SPI1 interrupt priority level setting.
- */
-#if !defined(LPC13xx_SPI_SSP1_IRQ_PRIORITY) || defined(__DOXYGEN__)
-#define LPC13xx_SPI_SSP1_IRQ_PRIORITY 5
-#endif
-
-/**
* @brief Overflow error hook.
* @details The default action is to stop the system.
*/
@@ -182,7 +159,7 @@ #error "invalid LPC13xx_SPI_SSP1CLKDIV setting"
#endif
-#if !LPC13xx_SPI_USE_SSP0 && !LPC13xx_SPI_USE_SSP1
+#if !LPC13xx_SPI_USE_SSP0
#error "SPI driver activated but no SPI peripheral assigned"
#endif
@@ -198,12 +175,6 @@ #define LPC13xx_SERIAL_SSP0_PCLK \
(LPC13xx_MAINCLK / LPC13xx_SERIAL_SSP0CLKDIV)
-/**
- * @brief SSP1 clock.
- */
-#define LPC13xx_SERIAL_SSP1_PCLK \
- (LPC13xx_MAINCLK / LPC13xx_SERIAL_SSP1CLKDIV)
-
/*===========================================================================*/
/* Driver data structures and types. */
/*===========================================================================*/
@@ -314,10 +285,6 @@ struct SPIDriver { extern SPIDriver SPID1;
#endif
-#if LPC13xx_SPI_USE_SSP1 && !defined(__DOXYGEN__)
-extern SPIDriver SPID2;
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/readme.txt b/readme.txt index 678309e59..cca1636d1 100644 --- a/readme.txt +++ b/readme.txt @@ -65,6 +65,8 @@ *****************************************************************************
*** 2.1.5 ***
+- FIX: Fixed references to non-existing SSP1 device in LPC13xx SPI device
+ driver (bug 3127926).
- FIX: Fixed broken SPI synchronous API (bug 3127921).
- FIX: Fixed missing vector.c files in LPC11xx and LPC13xx ports (bug 3124849).
- FIX: Fixed pwmDisableChannel() now working in STM32 PWM driver (bug 3121246).
|