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

CM3DS: fix compiler warnings 

This commit changes the code to fix the compiler warnings on ARM,
GCC_ARM and IAR.

Change-Id: I92676d2cc85daacde9f43f1898377a2cea750c50
Signed-off-by: Hugues de Valon <hugues.devalon@arm.com>
pull/6696/head
Hugues de Valon 2018-04-20 16:37:26 +01:00
parent b68ef3981d
commit 17b3cb1cde
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
targets/TARGET_ARM_SSG/TARGET_CM3DS_MPS2/device/drivers/arm_uart_drv.c
View File

@ -263,21 +263,24 @@ enum arm_uart_irq_t arm_uart_get_interrupt_status(struct arm_uart_dev_t* dev)
{
struct _arm_uart_reg_map_t* p_uart =
(struct _arm_uart_reg_map_t*)dev->cfg->base;
enum arm_uart_irq_t intrstatus = ARM_UART_IRQ_NONE;
if(dev->data->state & ARM_UART_INITIALIZED) {
switch(p_uart->intr_reg.intrstatus) {
case ARM_UART_TX_INTR:
return ARM_UART_IRQ_TX;
intrstatus = ARM_UART_IRQ_TX;
break;
case ARM_UART_RX_INTR:
return ARM_UART_IRQ_RX;
intrstatus = ARM_UART_IRQ_RX;
break;
case ARM_UART_TX_INTR | ARM_UART_RX_INTR:
return ARM_UART_IRQ_COMBINED;
intrstatus = ARM_UART_IRQ_COMBINED;
break;
default:
break;
/* default: not defined to force all cases to be handled */
}
}
return ARM_UART_IRQ_NONE;
return intrstatus;
}

2
targets/TARGET_ARM_SSG/TARGET_CM3DS_MPS2/port_api.c
View File

@ -25,7 +25,7 @@ PinName port_pin(PortName port, int pin_n)
return NC;
}
return (PINS_PER_GPIO * port + pin_n);
return (PinName)(PINS_PER_GPIO * port + pin_n);
}
void port_init(port_t *obj, PortName port, int mask, PinDirection dir)

5
targets/TARGET_ARM_SSG/TARGET_CM3DS_MPS2/serial_api.c
View File

@ -76,8 +76,9 @@ static uint32_t fill_serial_object(struct serial_s *serial_obj, PinName tx,
return 1;
}
uart_peripheral = pinmap_merge(pinmap_peripheral(tx, PinMap_UART_TX),
pinmap_peripheral(rx, PinMap_UART_RX));
uart_peripheral = (UARTName)pinmap_merge(
pinmap_peripheral(tx, PinMap_UART_TX),
pinmap_peripheral(rx, PinMap_UART_RX));
switch (uart_peripheral) {
#ifdef ARM_UART0