ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

assert - logic corrections

pull/316/head
0xc0170 2014-05-20 16:55:59 +01:00
parent 60276a7cac
commit 906a6745a9
19 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/serial_api.c
View File

@ -204,7 +204,7 @@ void serial_baud(serial_t *obj, int baudrate) {
void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) {
assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits
assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits
assert((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits
assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) ||
(parity == ParityForced1) || (parity == ParityForced0));

2
libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c
View File

@ -69,7 +69,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel
SPIName spi_cntl = (SPIName)pinmap_merge(spi_sclk, spi_ssel);
obj->spi = (LPC_SSP0_Type*)pinmap_merge(spi_data, spi_cntl);
assert((int)obj->spi == NC);
assert((int)obj->spi != NC);
// enable power and clocking
switch ((int)obj->spi) {

2
libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/serial_api.c
View File

@ -186,7 +186,7 @@ void serial_baud(serial_t *obj, int baudrate) {
void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) {
assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits
assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits
assert((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits
assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) ||
(parity == ParityForced1) || (parity == ParityForced0));

2
libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/serial_api.c
View File

@ -182,7 +182,7 @@ void serial_baud(serial_t *obj, int baudrate) {
void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) {
assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits
assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits
assert((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits
assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) ||
(parity == ParityForced1) || (parity == ParityForced0));

2
libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/serial_api.c
View File

@ -185,7 +185,7 @@ void serial_baud(serial_t *obj, int baudrate) {
void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) {
assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits
assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits
assert((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits
assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) ||
(parity == ParityForced1) || (parity == ParityForced0));

2
libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c
View File

@ -197,7 +197,7 @@ void serial_baud(serial_t *obj, int baudrate) {
void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) {
assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits
assert((data_bits > 6) || (data_bits < 10)); // 0: 7 data bits ... 2: 9 data bits
assert((data_bits > 6) && (data_bits < 10)); // 0: 7 data bits ... 2: 9 data bits
assert((parity == ParityNone) || (parity == ParityEven) || (parity == ParityOdd));
stop_bits -= 1;

2
libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/spi_api.c
View File

@ -127,7 +127,7 @@ void spi_free(spi_t *obj) {}
void spi_format(spi_t *obj, int bits, int mode, int slave) {
spi_disable(obj);
assert((bits >= 1 && bits <= 16) || (mode >= 0 && mode <= 3));
assert((bits >= 1 && bits <= 16) && (mode >= 0 && mode <= 3));
int polarity = (mode & 0x2) ? 1 : 0;
int phase = (mode & 0x1) ? 1 : 0;

2
libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/serial_api.c
View File

@ -245,7 +245,7 @@ void serial_baud(serial_t *obj, int baudrate) {
void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) {
assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits
assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits
assert((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits
assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) ||
(parity == ParityForced1) || (parity == ParityForced0));

2
libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/spi_api.c
View File

@ -97,7 +97,7 @@ void spi_free(spi_t *obj) {}
void spi_format(spi_t *obj, int bits, int mode, int slave) {
ssp_disable(obj);
assert((bits >= 4 && bits <= 16) || (mode >= 0 && mode <= 3));
assert(((bits >= 4) && (bits <= 16)) && (mode >= 0 && mode <= 3));
int polarity = (mode & 0x2) ? 1 : 0;
int phase = (mode & 0x1) ? 1 : 0;

2
libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/serial_api.c
View File

@ -218,7 +218,7 @@ void serial_baud(serial_t *obj, int baudrate) {
void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) {
assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits
assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits
assert((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits
assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) ||
(parity == ParityForced1) || (parity == ParityForced0));

2
libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/spi_api.c
View File

@ -95,7 +95,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel
void spi_free(spi_t *obj) {}
void spi_format(spi_t *obj, int bits, int mode, int slave) {
assert((bits >= 4 && bits <= 16) || (mode >= 0 && mode <= 3));
assert(((bits >= 4) && (bits <= 16)) && (((mode >= 0) && (mode <= 3)));
ssp_disable(obj);
int polarity = (mode & 0x2) ? 1 : 0;

2
libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/serial_api.c
View File

@ -208,7 +208,7 @@ void serial_baud(serial_t *obj, int baudrate) {
void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) {
assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits
assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits
assert((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits
assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) ||
(parity == ParityForced1) || (parity == ParityForced0));

2
libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/spi_api.c
View File

@ -116,7 +116,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel
void spi_free(spi_t *obj) {}
void spi_format(spi_t *obj, int bits, int mode, int slave) {
assert((bits >= 4 && bits <= 16) || (mode >= 0 && mode <= 3));
assert(((bits >= 4) && (bits <= 16)) && ((mode >= 0) && (mode <= 3)));
ssp_disable(obj);
int polarity = (mode & 0x2) ? 1 : 0;

2
libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/serial_api.c
View File

@ -193,7 +193,7 @@ void serial_baud(serial_t *obj, int baudrate) {
void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) {
assert((stop_bits == 1) || (stop_bits == 2)); // 0: 1 stop bits, 1: 2 stop bits
assert((data_bits > 4) || (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits
assert((data_bits > 4) && (data_bits < 9)); // 0: 5 data bits ... 3: 8 data bits
assert((parity == ParityNone) || (parity == ParityOdd) || (parity == ParityEven) ||
(parity == ParityForced1) || (parity == ParityForced0));

2
libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/spi_api.c
View File

@ -85,7 +85,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel
void spi_free(spi_t *obj) {}
void spi_format(spi_t *obj, int bits, int mode, int slave) {
assert((bits >= 4 && bits <= 16) || (mode >= 0 && mode <= 3));
assert(((bits >= 4) && (bits <= 16)) || ((mode >= 0) && (mode <= 3)));
ssp_disable(obj);
int polarity = (mode & 0x2) ? 1 : 0;

3
libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/i2c_api.c
View File

@ -16,7 +16,6 @@
#include "i2c_api.h"
#include "cmsis.h"
#include "pinmap.h"
#include "error.h"
static const SWM_Map SWM_I2C_SDA[] = {
{7, 24},
@ -50,7 +49,7 @@ static inline void i2c_interface_enable(i2c_t *obj) {
}
static inline void i2c_power_enable(i2c_t *obj) {
LPC_SYSCON->SYSAHBCLKCTRL |= (1<<5);
LPC_SYSCON->SYSAHBCLKCTRL |= (1<<5);
LPC_SYSCON->PRESETCTRL &= ~(0x1<<6);
LPC_SYSCON->PRESETCTRL |= (0x1<<6);
}

23
libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/serial_api.c
View File

@ -14,6 +14,7 @@
* limitations under the License.
*/
// math.h required for floating point operations for baud rate calculation
#include <assert.h>
#include <math.h>
#include <string.h>
@ -180,15 +181,10 @@ void serial_baud(serial_t *obj, int baudrate) {
void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) {
// 0: 1 stop bits, 1: 2 stop bits
if (stop_bits != 1 && stop_bits != 2) {
error("Invalid stop bits specified");
}
assert((stop_bits == 1) || (stop_bits == 2));
assert((data_bits > 6) && (data_bits < 10)); // 0: 7 data bits ... 2: 9 data bits
assert((parity == ParityNone) || (parity == ParityEven) || (parity == ParityOdd));
stop_bits -= 1;
// 0: 7 data bits ... 2: 9 data bits
if (data_bits < 7 || data_bits > 9) {
error("Invalid number of bits (%d) in serial format, should be 7..9", data_bits);
}
data_bits -= 7;
int paritysel;
@ -197,8 +193,7 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b
case ParityEven: paritysel = 2; break;
case ParityOdd : paritysel = 3; break;
default:
error("Invalid serial parity setting");
return;
break;
}
obj->uart->CFG = (data_bits << 2)
@ -296,7 +291,7 @@ void serial_set_flow_control(serial_t *obj, FlowControl type, PinName rxflow, Pi
uint32_t regVal_rts, regVal_cts;
swm_rts = &SWM_UART_RTS[obj->index];
swm_cts = &SWM_UART_CTS[obj->index];
swm_cts = &SWM_UART_CTS[obj->index];
regVal_rts = LPC_SWM->PINASSIGN[swm_rts->n] & ~(0xFF << swm_rts->offset);
regVal_cts = LPC_SWM->PINASSIGN[swm_cts->n] & ~(0xFF << swm_cts->offset);
@ -310,15 +305,15 @@ void serial_set_flow_control(serial_t *obj, FlowControl type, PinName rxflow, Pi
LPC_SWM->PINASSIGN[swm_rts->n] = regVal_rts | (rxflow << swm_rts->offset);
if (FlowControlRTS == type) {
LPC_SWM->PINASSIGN[swm_cts->n] = regVal_cts | (0xFF << swm_cts->offset);
obj->uart->CFG &= ~CTSEN;
obj->uart->CFG &= ~CTSEN;
}
}
if ((FlowControlCTS == type || FlowControlRTSCTS == type) && (txflow != NC)) {
LPC_SWM->PINASSIGN[swm_cts->n] = regVal_cts | (txflow << swm_cts->offset);
obj->uart->CFG |= CTSEN;
if (FlowControlCTS == type) {
LPC_SWM->PINASSIGN[swm_rts->n] = regVal_rts | (0xFF << swm_rts->offset);
LPC_SWM->PINASSIGN[swm_rts->n] = regVal_rts | (0xFF << swm_rts->offset);
}
}
}
}

2
libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/spi_api.c
View File

@ -116,7 +116,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel
void spi_free(spi_t *obj) {}
void spi_format(spi_t *obj, int bits, int mode, int slave) {
assert((bits >= 1 && bits <= 16) || (mode >= 0 && mode <= 3));
assert(((bits >= 1) && (bits <= 16)) && ((mode >= 0) && (mode <= 3)));
ssp_disable(obj);
int polarity = (mode & 0x2) ? 1 : 0;

2
libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/spi_api.c
View File

@ -121,7 +121,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel
void spi_free(spi_t *obj) {}
void spi_format(spi_t *obj, int bits, int mode, int slave) {
assert((bits == 8 || bits == 16) || (mode >= 0 && mode <= 3));
assert(((bits == 8) || (bits == 16)) && ((mode >= 0) && (mode <= 3)));
ssp_disable(obj);
int polarity = (mode & 0x2) ? 1 : 0;