andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug 3127926. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2458 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2010-12-05 11:38:27 +00:00
parent 064bb29a4c
commit 56ce4d958c
2 changed files with 3 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
os/hal/platforms/LPC13xx/spi_lld.h
View File

@ -118,15 +118,6 @@
#define LPC13xx_SPI_USE_SSP0 TRUE #define LPC13xx_SPI_USE_SSP0 TRUE
#endif #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. * @brief SSP0 PCLK divider.
*/ */
@ -134,13 +125,6 @@
#define LPC13xx_SPI_SSP0CLKDIV 1 #define LPC13xx_SPI_SSP0CLKDIV 1
#endif #endif
/**
* @brief SSP1 PCLK divider.
*/
#if !defined(LPC13xx_SPI_SSP1CLKDIV) || defined(__DOXYGEN__)
#define LPC13xx_SPI_SSP1CLKDIV 1
#endif
/** /**
* @brief SPI0 interrupt priority level setting. * @brief SPI0 interrupt priority level setting.
*/ */
@ -148,13 +132,6 @@
#define LPC13xx_SPI_SSP0_IRQ_PRIORITY 5 #define LPC13xx_SPI_SSP0_IRQ_PRIORITY 5
#endif #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. * @brief Overflow error hook.
* @details The default action is to stop the system. * @details The default action is to stop the system.
@ -182,7 +159,7 @@
#error "invalid LPC13xx_SPI_SSP1CLKDIV setting" #error "invalid LPC13xx_SPI_SSP1CLKDIV setting"
#endif #endif
#if !LPC13xx_SPI_USE_SSP0 && !LPC13xx_SPI_USE_SSP1 #if !LPC13xx_SPI_USE_SSP0
#error "SPI driver activated but no SPI peripheral assigned" #error "SPI driver activated but no SPI peripheral assigned"
#endif #endif
@ -198,12 +175,6 @@
#define LPC13xx_SERIAL_SSP0_PCLK \ #define LPC13xx_SERIAL_SSP0_PCLK \
(LPC13xx_MAINCLK / LPC13xx_SERIAL_SSP0CLKDIV) (LPC13xx_MAINCLK / LPC13xx_SERIAL_SSP0CLKDIV)
/**
* @brief SSP1 clock.
*/
#define LPC13xx_SERIAL_SSP1_PCLK \
(LPC13xx_MAINCLK / LPC13xx_SERIAL_SSP1CLKDIV)
/*===========================================================================*/ /*===========================================================================*/
/* Driver data structures and types. */ /* Driver data structures and types. */
/*===========================================================================*/ /*===========================================================================*/
@ -314,10 +285,6 @@ struct SPIDriver {
extern SPIDriver SPID1; extern SPIDriver SPID1;
#endif #endif
#if LPC13xx_SPI_USE_SSP1 && !defined(__DOXYGEN__)
extern SPIDriver SPID2;
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif

2
readme.txt
View File

@ -65,6 +65,8 @@
***************************************************************************** *****************************************************************************
*** 2.1.5 *** *** 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 broken SPI synchronous API (bug 3127921).
- FIX: Fixed missing vector.c files in LPC11xx and LPC13xx ports (bug 3124849). - FIX: Fixed missing vector.c files in LPC11xx and LPC13xx ports (bug 3124849).
- FIX: Fixed pwmDisableChannel() now working in STM32 PWM driver (bug 3121246). - FIX: Fixed pwmDisableChannel() now working in STM32 PWM driver (bug 3121246).