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

Include spi conflict fix 

Which I missed in the initial merge
pull/476/head
Sissors 2014-08-24 17:13:56 +02:00
parent ae822b969a
commit 8f90794eec
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c
View File

@ -125,13 +125,9 @@ int spi_slave_receive(spi_t *obj) {
} }
int spi_slave_read(spi_t *obj) { int spi_slave_read(spi_t *obj) {
<<<<<<< HEAD
dspi_hal_clear_status_flag(obj->instance, kDspiRxFifoDrainRequest); dspi_hal_clear_status_flag(obj->instance, kDspiRxFifoDrainRequest);
return dspi_hal_read_data(obj->instance);
=======
uint32_t spi_address[] = SPI_BASE_ADDRS; uint32_t spi_address[] = SPI_BASE_ADDRS;
return DSPI_HAL_ReadData(spi_address[obj->instance]); return DSPI_HAL_ReadData(spi_address[obj->instance]);
>>>>>>> martins/dev_ksdk_update
} }
void spi_slave_write(spi_t *obj, int value) { void spi_slave_write(spi_t *obj, int value) {