Skip to content

Commit de715ae

Browse files
committed
Merge pull request #27 from ytsuboi/master
Fixed some problem around LPC1114 porting
2 parents e85d048 + 9f2a930 commit de715ae

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX/gpio_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ void gpio_init(gpio_t *obj, PinName pin, PinDirection direction) {
3737
obj->pin = pin;
3838
LPC_GPIO_TypeDef *port_reg = ((LPC_GPIO_TypeDef *) (LPC_GPIO0_BASE + (((pin & 0xF000) >> PORT_SHIFT) * 0x10000)));
3939

40-
obj->reg_mask_read = &port_reg->MASKED_ACCESS[gpio_set(pin) + 1];
40+
obj->reg_mask_read = &port_reg->MASKED_ACCESS[1 << gpio_set(pin)];
4141
obj->reg_dir = &port_reg->DIR;
4242
obj->reg_write = &port_reg->DATA;
4343

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX/i2c_api.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,5 +383,7 @@ void i2c_slave_address(i2c_t *obj, int idx, uint32_t address, uint32_t mask) {
383383
if ((idx >= 0) && (idx <= 3)) {
384384
addr = ((uint32_t)obj->i2c) + I2C_addr_offset[0][idx];
385385
*((uint32_t *) addr) = address & 0xFF;
386+
addr = ((uint32_t)obj->i2c) + I2C_addr_offset[1][idx];
387+
*((uint32_t *) addr) = mask & 0xFE;
386388
}
387389
}

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX/serial_api.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -249,12 +249,6 @@ int serial_getc(serial_t *obj) {
249249
void serial_putc(serial_t *obj, int c) {
250250
while (!serial_writable(obj));
251251
obj->uart->THR = c;
252-
253-
#warning TODO(@toyowata): need to fix a full-duplex bug? https://mbed.org/forum/bugs-suggestions/topic/4473/
254-
uint32_t lsr = obj->uart->LSR;
255-
lsr = lsr;
256-
uint32_t thr = obj->uart->THR;
257-
thr = thr;
258252
}
259253

260254
int serial_readable(serial_t *obj) {

0 commit comments

Comments
 (0)