From 8201703e64212744851278f3760ff5129b41a5b9 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Tue, 2 Jul 2013 07:35:02 -0400 Subject: [PATCH] lpc43xx/ssp: Fix duplicate function definition from merge --- include/libopencm3/lpc43xx/ssp.h | 2 -- lib/lpc43xx/ssp.c | 5 ----- 2 files changed, 7 deletions(-) diff --git a/include/libopencm3/lpc43xx/ssp.h b/include/libopencm3/lpc43xx/ssp.h index b03c9176..dbda6917 100644 --- a/include/libopencm3/lpc43xx/ssp.h +++ b/include/libopencm3/lpc43xx/ssp.h @@ -194,8 +194,6 @@ void ssp_init(ssp_num_t ssp_num, ssp_master_slave_t master_slave, 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); END_DECLS diff --git a/lib/lpc43xx/ssp.c b/lib/lpc43xx/ssp.c index edf547b6..e0f3e9b3 100644 --- a/lib/lpc43xx/ssp.c +++ b/lib/lpc43xx/ssp.c @@ -135,11 +135,6 @@ uint16_t ssp_transfer(ssp_num_t ssp_num, uint16_t data) 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); -} /**@}*/