Skip to content

cypress target: fix iar warnings #12097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 17, 2019
Merged

cypress target: fix iar warnings #12097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7817a22
fix 'statement is unreachable' IAR warning
ShuopengDeng Dec 11, 2019
6f3852d
fix 'enumerated type mixed with another type' IAR warnings
ShuopengDeng Dec 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions targets/TARGET_Cypress/TARGET_PSOC6/cy_port_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ void port_init(port_t *obj, PortName port, int mask, PinDirection dir)

void port_mode(port_t *obj, PinMode mode)
{
gpio_t gpio = {.pin = 0, .direction = obj->direction, .drive_mode = obj->drive_mode};
gpio_t gpio = {.direction = obj->direction, .drive_mode = obj->drive_mode};
for (uint8_t pin = 0; pin < 8; pin++) {
if ((1 << pin) & obj->mask) {
gpio.pin = port_pin(obj->port, pin);
Expand All @@ -52,7 +52,7 @@ void port_mode(port_t *obj, PinMode mode)

void port_dir(port_t *obj, PinDirection dir)
{
gpio_t gpio = {.pin = 0, .direction = obj->direction, .drive_mode = obj->drive_mode};
gpio_t gpio = {.direction = obj->direction, .drive_mode = obj->drive_mode};
for (uint8_t pin = 0; pin < 8; pin++) {
if ((1 << pin) & obj->mask) {
gpio.pin = port_pin(obj->port, pin);
Expand Down
7 changes: 3 additions & 4 deletions targets/TARGET_Cypress/TARGET_PSOC6/cy_serial_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b
break;
default:
MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_DRIVER_SERIAL, MBED_ERROR_CODE_UNSUPPORTED), "Unsupported parity");
return;
}
cyhal_uart_cfg_t cfg = {
.data_bits = data_bits,
Expand All @@ -152,11 +151,11 @@ void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable)
static const cyhal_uart_event_t interrupt_mask = (cyhal_uart_event_t)
(CYHAL_UART_IRQ_RX_DONE | CYHAL_UART_IRQ_RX_ERROR | CYHAL_UART_IRQ_RX_NOT_EMPTY);
ser->rx_event_mask = enable
? (ser->rx_event_mask | interrupt_mask)
: (ser->rx_event_mask & ~interrupt_mask);
? (cyhal_uart_event_t)(ser->rx_event_mask | interrupt_mask)
: (cyhal_uart_event_t)(ser->rx_event_mask & ~interrupt_mask);
cyhal_uart_enable_event(&(ser->hal_obj), interrupt_mask, CYHAL_ISR_PRIORITY_DEFAULT, (bool)enable);
} else if (irq == TxIrq) {
static const cyhal_uart_event_t interrupt_mask = CYHAL_UART_IRQ_TX_DONE | CYHAL_UART_IRQ_TX_ERROR | CYHAL_UART_IRQ_TX_EMPTY;
static const cyhal_uart_event_t interrupt_mask = (cyhal_uart_event_t)(CYHAL_UART_IRQ_TX_DONE | CYHAL_UART_IRQ_TX_ERROR | CYHAL_UART_IRQ_TX_EMPTY);
ser->tx_event_mask = enable
? (cyhal_uart_event_t)(ser->tx_event_mask | interrupt_mask)
: (cyhal_uart_event_t)(ser->tx_event_mask & ~interrupt_mask);
Expand Down
1 change: 0 additions & 1 deletion targets/TARGET_Cypress/TARGET_PSOC6/cy_spi_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ SPIName spi_get_peripheral_name(PinName mosi, PinName miso, PinName mclk)
return (SPIName)CYHAL_SCB_BASE_ADDRESSES[map->inst->block_num];
}
MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_DRIVER_SPI, MBED_ERROR_CODE_FAILED_OPERATION), "SPI not found");
return (SPIName)0;
}

static void cy_spi_irq_handler_internal(void *handler_arg, cyhal_spi_event_t event)
Expand Down