From ee7cf6c63c67222dcf9af6f40098428c577ee775 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Thu, 26 Nov 2009 00:51:09 +0000 Subject: Remove unused card_detect(), and make card_detect_target() static inline in each sd driver. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23757 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/arm/ata-sd-pp.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'firmware/target/arm/ata-sd-pp.c') diff --git a/firmware/target/arm/ata-sd-pp.c b/firmware/target/arm/ata-sd-pp.c index f2efd02e9d..fafc5f20d9 100644 --- a/firmware/target/arm/ata-sd-pp.c +++ b/firmware/target/arm/ata-sd-pp.c @@ -340,6 +340,21 @@ static int sd_wait_for_state(unsigned int state, int id) } } + +static inline bool card_detect_target(void) +{ +#ifdef HAVE_HOTSWAP +#ifdef SANSA_E200 + return (GPIOA_INPUT_VAL & 0x80) == 0; /* low active */ +#elif defined SANSA_C200 + return (GPIOL_INPUT_VAL & 0x08) != 0; /* high active */ +#endif +#else + return false; +#endif +} + + static inline void copy_read_sectors_fast(unsigned char **buf) { /* Copy one chunk of 16 words using best method for start alignment */ @@ -1278,20 +1293,6 @@ tCardInfo *card_get_info_target(int card_no) { return &card_info[card_no]; } - -bool card_detect_target(void) -{ -#ifdef HAVE_HOTSWAP -#ifdef SANSA_E200 - return (GPIOA_INPUT_VAL & 0x80) == 0; /* low active */ -#elif defined SANSA_C200 - return (GPIOL_INPUT_VAL & 0x08) != 0; /* high active */ -#endif -#else - return false; -#endif -} - #ifdef HAVE_HOTSWAP static int sd1_oneshot_callback(struct timeout *tmo) { -- cgit v1.2.3