Merge pull request #1 from sigvef/master

tkuyucu-nordicsemi · tkuyucu-nordicsemi · commit 1243bb3c3245 · 2014-07-15T16:20:52.000+02:00
Fix erroneous boolean expression conversions
diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c
@@ -69,7 +69,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel
         obj->spi = (NRF_SPI_Type*)NC;
         obj->spis = (NRF_SPIS_Type*)spi;
     }
-    MBED_ASSERT((int)obj->spi != NC && (int)obj->spis != NC);
+    MBED_ASSERT((int)obj->spi != NC || (int)obj->spis != NC);
 
       // pin out the spi pins
     if (ssel != NC) {//slave
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/i2c_api.c
@@ -41,7 +41,7 @@ static inline void i2c_interface_enable(i2c_t *obj) {
 }
 
 void i2c_init(i2c_t *obj, PinName sda, PinName scl) {
-    MBED_ASSERT((sda == P0_23) || (scl == P0_22));
+    MBED_ASSERT((sda == P0_23) && (scl == P0_22));
     
     // Enables clock for I2C0
     LPC_SYSCON->SYSAHBCLKCTRL1 |= (1 << 13);

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel`
`69`	`69`	`obj->spi = (NRF_SPI_Type*)NC;`
`70`	`70`	`obj->spis = (NRF_SPIS_Type*)spi;`
`71`	`71`	`}`
`72`		`- MBED_ASSERT((int)obj->spi != NC && (int)obj->spis != NC);`
	`72`	`+ MBED_ASSERT((int)obj->spi != NC \|\| (int)obj->spis != NC);`
`73`	`73`
`74`	`74`	`// pin out the spi pins`
`75`	`75`	`if (ssel != NC) {//slave`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ static inline void i2c_interface_enable(i2c_t *obj) {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`void i2c_init(i2c_t *obj, PinName sda, PinName scl) {`
`44`		`- MBED_ASSERT((sda == P0_23) \|\| (scl == P0_22));`
	`44`	`+ MBED_ASSERT((sda == P0_23) && (scl == P0_22));`
`45`	`45`
`46`	`46`	`// Enables clock for I2C0`
`47`	`47`	`LPC_SYSCON->SYSAHBCLKCTRL1 \|= (1 << 13);`