Skip to content

Commit 17b3cb1

Browse files
committed
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 <[email protected]>
1 parent b68ef39 commit 17b3cb1

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

targets/TARGET_ARM_SSG/TARGET_CM3DS_MPS2/device/drivers/arm_uart_drv.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -263,21 +263,24 @@ enum arm_uart_irq_t arm_uart_get_interrupt_status(struct arm_uart_dev_t* dev)
263263
{
264264
struct _arm_uart_reg_map_t* p_uart =
265265
(struct _arm_uart_reg_map_t*)dev->cfg->base;
266+
enum arm_uart_irq_t intrstatus = ARM_UART_IRQ_NONE;
266267

267268

268269
if(dev->data->state & ARM_UART_INITIALIZED) {
269270
switch(p_uart->intr_reg.intrstatus) {
270271
case ARM_UART_TX_INTR:
271-
return ARM_UART_IRQ_TX;
272+
intrstatus = ARM_UART_IRQ_TX;
272273
break;
273274
case ARM_UART_RX_INTR:
274-
return ARM_UART_IRQ_RX;
275+
intrstatus = ARM_UART_IRQ_RX;
275276
break;
276277
case ARM_UART_TX_INTR | ARM_UART_RX_INTR:
277-
return ARM_UART_IRQ_COMBINED;
278+
intrstatus = ARM_UART_IRQ_COMBINED;
279+
break;
280+
default:
278281
break;
279-
/* default: not defined to force all cases to be handled */
280282
}
281283
}
282-
return ARM_UART_IRQ_NONE;
284+
285+
return intrstatus;
283286
}

targets/TARGET_ARM_SSG/TARGET_CM3DS_MPS2/port_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ PinName port_pin(PortName port, int pin_n)
2525
return NC;
2626
}
2727

28-
return (PINS_PER_GPIO * port + pin_n);
28+
return (PinName)(PINS_PER_GPIO * port + pin_n);
2929
}
3030

3131
void port_init(port_t *obj, PortName port, int mask, PinDirection dir)

targets/TARGET_ARM_SSG/TARGET_CM3DS_MPS2/serial_api.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,9 @@ static uint32_t fill_serial_object(struct serial_s *serial_obj, PinName tx,
7676
return 1;
7777
}
7878

79-
uart_peripheral = pinmap_merge(pinmap_peripheral(tx, PinMap_UART_TX),
80-
pinmap_peripheral(rx, PinMap_UART_RX));
79+
uart_peripheral = (UARTName)pinmap_merge(
80+
pinmap_peripheral(tx, PinMap_UART_TX),
81+
pinmap_peripheral(rx, PinMap_UART_RX));
8182

8283
switch (uart_peripheral) {
8384
#ifdef ARM_UART0

0 commit comments

Comments
 (0)