From 293b499093baef544f7148a0fcfa18d28ed3d1ea Mon Sep 17 00:00:00 2001
From: Rafaël Carré <rafael.carre@gmail.com>
Date: Wed, 1 Jul 2009 23:39:57 +0000
Subject: Move sd_get_info() into common sd code

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21610 a1c6a512-1295-4272-9138-f99709370657
---
 firmware/drivers/sd.c                              | 23 ++++++++++++++++++++++
 firmware/target/arm/as3525/ata_sd_as3525.c         | 14 -------------
 firmware/target/arm/ata-sd-pp.c                    | 21 --------------------
 .../target/mips/ingenic_jz47xx/ata-sd-jz4740.c     | 18 -----------------
 4 files changed, 23 insertions(+), 53 deletions(-)

diff --git a/firmware/drivers/sd.c b/firmware/drivers/sd.c
index 3e05b05742..d566e614d2 100644
--- a/firmware/drivers/sd.c
+++ b/firmware/drivers/sd.c
@@ -21,6 +21,7 @@
 
 #include "config.h"
 #include "hotswap.h"
+#include "storage.h"
 
 static const unsigned char sd_mantissa[] = {  /* *10 */
     0,  10, 12, 13, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 70, 80 };
@@ -75,3 +76,25 @@ void sd_spindown(int seconds)
 {
     (void)seconds;
 }
+
+#ifdef STORAGE_GET_INFO
+void sd_get_info(IF_MV2(int drive,) struct storage_info *info)
+{
+#ifndef HAVE_MULTIVOLUME
+    const int drive=0;
+#endif
+
+    tCardInfo *card = card_get_info_target(drive);
+
+    info->sector_size=card->blocksize;
+    info->num_sectors=card->numblocks;
+    info->vendor="Rockbox";
+#if CONFIG_STORAGE == STORAGE_SD
+    info->product = (drive==0) ? "Internal Storage" : "SD Card Slot";
+#else   /* Internal storage is not SD */
+    info->product = "SD Card Slot";
+#endif
+    info->revision="0.00";
+}
+#endif
+
diff --git a/firmware/target/arm/as3525/ata_sd_as3525.c b/firmware/target/arm/as3525/ata_sd_as3525.c
index f32e527ff2..4ce14383f0 100644
--- a/firmware/target/arm/as3525/ata_sd_as3525.c
+++ b/firmware/target/arm/as3525/ata_sd_as3525.c
@@ -495,20 +495,6 @@ int sd_init(void)
     return 0;
 }
 
-#ifdef STORAGE_GET_INFO
-void sd_get_info(IF_MV2(int drive,) struct storage_info *info)
-{
-#ifndef HAVE_MULTIVOLUME
-    const int drive=0;
-#endif
-    info->sector_size=card_info[drive].blocksize;
-    info->num_sectors=card_info[drive].numblocks;
-    info->vendor="Rockbox";
-    info->product = (drive == 0) ?  "Internal Storage" : "SD Card Slot";
-    info->revision="0.00";
-}
-#endif
-
 #ifdef HAVE_HOTSWAP
 bool sd_removable(IF_MV_NONVOID(int drive))
 {
diff --git a/firmware/target/arm/ata-sd-pp.c b/firmware/target/arm/ata-sd-pp.c
index 9c89c78da8..e1e85b8a92 100644
--- a/firmware/target/arm/ata-sd-pp.c
+++ b/firmware/target/arm/ata-sd-pp.c
@@ -1334,27 +1334,6 @@ long sd_last_disk_activity(void)
     return last_disk_activity;
 }
 
-#ifdef STORAGE_GET_INFO
-void sd_get_info(IF_MV2(int drive,) struct storage_info *info)
-{
-#ifndef HAVE_MULTIVOLUME
-    const int drive=0;
-#endif
-    info->sector_size=card_info[drive].blocksize;
-    info->num_sectors=card_info[drive].numblocks;
-    info->vendor="Rockbox";
-    if(drive==0)
-    {
-        info->product="Internal Storage";
-    }
-    else
-    {
-        info->product="SD Card Slot";
-    }
-    info->revision="0.00";
-}
-#endif
-
 #ifdef HAVE_HOTSWAP
 bool sd_removable(IF_MV_NONVOID(int drive))
 {
diff --git a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
index 957db2af0e..c48ee0be73 100644
--- a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
@@ -1743,21 +1743,3 @@ bool sd_present(IF_MV_NONVOID(int drive))
 #endif
     return (sdinfo.block_num > 0 && card_detect_target());
 }
-
-#ifdef STORAGE_GET_INFO
-void sd_get_info(IF_MV2(int drive,) struct storage_info *info)
-{
-#ifdef HAVE_MULTIVOLUME
-    (void)drive;
-#endif
-    /* firmware version */
-    info->revision="0.00";
-
-    info->vendor="Rockbox";
-    info->product="SD Storage";
-
-    /* blocks count */
-    info->num_sectors = sdinfo.block_num;
-    info->sector_size = sdinfo.block_len;
-}
-#endif
-- 
cgit v1.2.3