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

Merge pull request #12342 from fkjagodzinski/fix-nxp-hal_fpga 

LPC55S69: Fix UART & GPIO HAL to pass FPGA CI test shield tests
pull/12417/head
Martin Kojtal 2020-02-11 11:03:22 +00:00 committed by GitHub
parent d3078a39b1 a0ff95bed5
commit a745525a54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC/serial_api.c
View File

@ -1,5 +1,5 @@
/* mbed Microcontroller Library /* mbed Microcontroller Library
* Copyright (c) 2006-2013 ARM Limited * Copyright (c) 2006-2020 ARM Limited
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -189,10 +189,10 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b
static inline void uart_irq(uint32_t transmit_empty, uint32_t receive_not_empty, uint32_t index) static inline void uart_irq(uint32_t transmit_empty, uint32_t receive_not_empty, uint32_t index)
{ {
if (serial_irq_ids[index] != 0) { if (serial_irq_ids[index] != 0) {
if (transmit_empty) if (transmit_empty && (uart_addrs[index]->FIFOINTENSET & kUSART_TxLevelInterruptEnable))
irq_handler(serial_irq_ids[index], TxIrq); irq_handler(serial_irq_ids[index], TxIrq);
if (receive_not_empty) if (receive_not_empty && (uart_addrs[index]->FIFOINTENSET & kUSART_RxLevelInterruptEnable))
irq_handler(serial_irq_ids[index], RxIrq); irq_handler(serial_irq_ids[index], RxIrq);
} }
} }

21
targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC55S69/TARGET_LPCXpresso/PeripheralPins.c
View File

@ -16,3 +16,24 @@
#include "PeripheralPins.h" #include "PeripheralPins.h"
#include "PeripheralPinMaps.h" #include "PeripheralPinMaps.h"
// List of GPIOs with limited functionality
const PinList *pinmap_gpio_restricted_pins()
{
static const PinName pins[] = {
A4, // fixed pull-up (for I2C)
A5, // fixed pull-up (for I2C)
D5, // fixed pull-up (for LED)
D3, // fixed pull-up (for LED)
D4, // fixed pull-up (for LED)
D7, // fixed pull-up
D15, // fixed pull-up (for I2C)
D14 // fixed pull-up (for I2C)
};
static const PinList pin_list = {
sizeof(pins) / sizeof(pins[0]),
pins
};
return &pin_list;
}