From 356e0f5fff2a9f1f633df8eb63c17f65fc280163 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Fri, 13 Apr 2018 09:02:27 +0000 Subject: [PATCH] Fixed bug #937. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11919 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- os/hal/include/hal_spi.h | 12 ++++++------ readme.txt | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/os/hal/include/hal_spi.h b/os/hal/include/hal_spi.h index 3649c7508..a94f5dee7 100644 --- a/os/hal/include/hal_spi.h +++ b/os/hal/include/hal_spi.h @@ -157,34 +157,34 @@ do { \ #elif SPI_SELECT_MODE == SPI_SELECT_MODE_LINE #define spiSelectI(spip) \ do { \ - palClearLine(spip->config->ssline); \ + palClearLine((spip)->config->ssline); \ } while (false) #define spiUnselectI(spip) \ do { \ - palSetLine(spip->config->ssline); \ + palSetLine((spip)->config->ssline); \ } while (false) #elif SPI_SELECT_MODE == SPI_SELECT_MODE_PORT #define spiSelectI(spip) \ do { \ - palClearPort(spip->config->ssport, spip->config->ssmask); \ + palClearPort((spip)->config->ssport, (spip)->config->ssmask); \ } while (false) #define spiUnselectI(spip) \ do { \ - palSetPort(spip->config->ssport, spip->config->ssmask); \ + palSetPort((spip)->config->ssport, (spip)->config->ssmask); \ } while (false) #elif SPI_SELECT_MODE == SPI_SELECT_MODE_PAD #define spiSelectI(spip) \ do { \ - palClearPad(spip->config->ssport, spip->config->sspad); \ + palClearPad((spip)->config->ssport, (spip)->config->sspad); \ } while (false) #define spiUnselectI(spip) \ do { \ - palSetPad(spip->config->ssport, spip->config->sspad); \ + palSetPad((spip)->config->ssport, (spip)->config->sspad); \ } while (false) #elif SPI_SELECT_MODE == SPI_SELECT_MODE_NONE diff --git a/readme.txt b/readme.txt index e1466ce74..df9800e90 100644 --- a/readme.txt +++ b/readme.txt @@ -111,6 +111,8 @@ - EX: Updated LIS302DL to 1.1.0 (backported to 18.2.1). - EX: Updated LPS25H to 1.1.0 (backported to 18.2.1). - EX: Updated LSM303DLHC to 1.1.0 (backported to 18.2.1). +- HAL: Fixed macro expansion problem in SPI high level driver (bug #937) + (backported to 18.2.1). - HAL: Fixed missing CAN2 macros from STM32L4xx stm32_rcc.h file (bug #936) (backported to 18.2.1). - OTH: Fixed inclusion order problem in STM32L4 cmparams.h file (bug #935)