From 8f90794eecbee3ece09d9738927c17c5187cbfab Mon Sep 17 00:00:00 2001 From: Sissors Date: Sun, 24 Aug 2014 17:13:56 +0200 Subject: [PATCH] Include spi conflict fix Which I missed in the initial merge --- .../TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c index a9b91be39c..8670928f7f 100644 --- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c +++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c @@ -125,13 +125,9 @@ int spi_slave_receive(spi_t *obj) { } int spi_slave_read(spi_t *obj) { -<<<<<<< HEAD dspi_hal_clear_status_flag(obj->instance, kDspiRxFifoDrainRequest); - return dspi_hal_read_data(obj->instance); -======= uint32_t spi_address[] = SPI_BASE_ADDRS; return DSPI_HAL_ReadData(spi_address[obj->instance]); ->>>>>>> martins/dev_ksdk_update } void spi_slave_write(spi_t *obj, int value) {