jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

lpc43xx/ssp: Fix duplicate function definition from merge

Browse Source
This commit is contained in:
Ben Gamari 2013-07-02 07:35:02 -04:00 committed by Piotr Esden-Tempski
parent 994e679fb8
commit 8201703e64
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libopencm3/lpc43xx/ssp.h
View File

@ -194,8 +194,6 @@ void ssp_init(ssp_num_t ssp_num,
ssp_master_slave_t master_slave, ssp_master_slave_t master_slave,
ssp_slave_option_t slave_option); ssp_slave_option_t slave_option);
u16 ssp_transfer(ssp_num_t ssp_num, u16 data);
uint16_t ssp_transfer(ssp_num_t ssp_num, uint16_t data); uint16_t ssp_transfer(ssp_num_t ssp_num, uint16_t data);
END_DECLS END_DECLS

5
lib/lpc43xx/ssp.c
View File

@ -135,11 +135,6 @@ uint16_t ssp_transfer(ssp_num_t ssp_num, uint16_t data)
return SSP_DR(ssp_port); return SSP_DR(ssp_port);
} }
uint16_t ssp_transfer(ssp_num_t ssp_num, uint16_t data)
{
ssp_write(ssp_num, data);
return ssp_read(ssp_num);
}
/**@}*/ /**@}*/