summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2010-06-05 21:12:16 +0000
committerFrank Gevaerts <frank@gevaerts.be>2010-06-05 21:12:16 +0000
commita0557b23f0c984576fd5a72657593211df148ca4 (patch)
treedb0d1f7a3826bc6fb74965b100d25fb0870e553b
parent8bd527eaa00a9b256f2e371d79677445d34658fb (diff)
downloadrockbox-a0557b23f0c984576fd5a72657593211df148ca4.tar.gz
rockbox-a0557b23f0c984576fd5a72657593211df148ca4.tar.bz2
rockbox-a0557b23f0c984576fd5a72657593211df148ca4.zip
remane hotswap.* to sdmmc.*. The contents have nothing at all to do with hotswapping things
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26598 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/debug_menu.c2
-rw-r--r--apps/root_menu.c1
-rw-r--r--firmware/SOURCES2
-rw-r--r--firmware/common/disk.c2
-rw-r--r--firmware/drivers/ata_mmc.c2
-rw-r--r--firmware/drivers/sd.c2
-rw-r--r--firmware/export/sdmmc.h (renamed from firmware/export/hotswap.h)4
-rw-r--r--firmware/sdmmc.c (renamed from firmware/hotswap.c)2
-rw-r--r--firmware/target/arm/as3525/sd-as3525.c2
-rw-r--r--firmware/target/arm/as3525/sd-as3525v2.c2
-rw-r--r--firmware/target/arm/ata-sd-pp.c2
-rw-r--r--firmware/target/arm/s3c2440/sd-s3c2440.c2
-rw-r--r--firmware/target/arm/tcc780x/sd-tcc780x.c2
-rw-r--r--firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c2
-rw-r--r--firmware/target/mips/ingenic_jz47xx/onda_vx767/ata-sd-target.h2
-rw-r--r--firmware/usbstack/usb_storage.c1
16 files changed, 15 insertions, 17 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index f14b7cdcdf..1814bfbb7c 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -64,7 +64,7 @@
#include "mas.h"
#include "eeprom_24cxx.h"
#if (CONFIG_STORAGE & STORAGE_MMC) || (CONFIG_STORAGE & STORAGE_SD)
-#include "hotswap.h"
+#include "sdmmc.h"
#endif
#if (CONFIG_STORAGE & STORAGE_ATA)
#include "ata.h"
diff --git a/apps/root_menu.c b/apps/root_menu.c
index e533c8ccc7..dab70f52c7 100644
--- a/apps/root_menu.c
+++ b/apps/root_menu.c
@@ -40,7 +40,6 @@
#ifdef HAVE_HOTSWAP
#include "storage.h"
-#include "hotswap.h"
#include "dir.h"
#endif
/* gui api */
diff --git a/firmware/SOURCES b/firmware/SOURCES
index cfc14a7274..292210d1c1 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -179,7 +179,7 @@ drivers/ramdisk.c
storage.c
drivers/fat.c
#if (CONFIG_STORAGE & STORAGE_MMC) || (CONFIG_STORAGE & STORAGE_SD)
-hotswap.c
+sdmmc.c
#endif
#endif /* SIMULATOR */
diff --git a/firmware/common/disk.c b/firmware/common/disk.c
index 5ef41bc296..8d93f3b8cd 100644
--- a/firmware/common/disk.c
+++ b/firmware/common/disk.c
@@ -23,7 +23,7 @@
#include "debug.h"
#include "fat.h"
#ifdef HAVE_HOTSWAP
-#include "hotswap.h"
+#include "sdmmc.h" /* for card_enable_monitoring() */
#include "dir.h" /* for release_dirs() */
#include "file.h" /* for release_files() */
#endif
diff --git a/firmware/drivers/ata_mmc.c b/firmware/drivers/ata_mmc.c
index 16d06584c5..5da0b44292 100644
--- a/firmware/drivers/ata_mmc.c
+++ b/firmware/drivers/ata_mmc.c
@@ -21,7 +21,7 @@
#include <stdbool.h>
#include "mmc.h"
#include "ata_mmc.h"
-#include "hotswap.h"
+#include "sdmmc.h"
#include "ata_idle_notify.h"
#include "kernel.h"
#include "thread.h"
diff --git a/firmware/drivers/sd.c b/firmware/drivers/sd.c
index 94b7c0a7f4..3c4543fbc9 100644
--- a/firmware/drivers/sd.c
+++ b/firmware/drivers/sd.c
@@ -21,7 +21,7 @@
#include "config.h"
#include "logf.h"
-#include "hotswap.h"
+#include "sdmmc.h"
#include "storage.h"
static const unsigned char sd_mantissa[] = { /* *10 */
diff --git a/firmware/export/hotswap.h b/firmware/export/sdmmc.h
index 643048976b..6ac3bd2af5 100644
--- a/firmware/export/hotswap.h
+++ b/firmware/export/sdmmc.h
@@ -18,8 +18,8 @@
* KIND, either express or implied.
*
****************************************************************************/
-#ifndef __HOTSWAP_H__
-#define __HOTSWAP_H__
+#ifndef __SDMMC_H__
+#define __SDMMC_H__
#include <stdbool.h>
diff --git a/firmware/hotswap.c b/firmware/sdmmc.c
index 79595e4591..f499ffae08 100644
--- a/firmware/hotswap.c
+++ b/firmware/sdmmc.c
@@ -23,7 +23,7 @@
#if (CONFIG_STORAGE & STORAGE_MMC)
#include "ata_mmc.h"
#else
-#include "hotswap.h"
+#include "sdmmc.h"
#endif
/* helper function to extract n (<=32) bits from an arbitrary position.
diff --git a/firmware/target/arm/as3525/sd-as3525.c b/firmware/target/arm/as3525/sd-as3525.c
index ec6065630b..9c0b4124ac 100644
--- a/firmware/target/arm/as3525/sd-as3525.c
+++ b/firmware/target/arm/as3525/sd-as3525.c
@@ -26,7 +26,7 @@
#include "fat.h"
#include "thread.h"
#include "led.h"
-#include "hotswap.h"
+#include "sdmmc.h"
#include "system.h"
#include "cpu.h"
#include <stdio.h>
diff --git a/firmware/target/arm/as3525/sd-as3525v2.c b/firmware/target/arm/as3525/sd-as3525v2.c
index 2d796c63cb..ccc88be25d 100644
--- a/firmware/target/arm/as3525/sd-as3525v2.c
+++ b/firmware/target/arm/as3525/sd-as3525v2.c
@@ -24,7 +24,7 @@
#include "fat.h"
#include "thread.h"
#include "led.h"
-#include "hotswap.h"
+#include "sdmmc.h"
#include "system.h"
#include "kernel.h"
#include "cpu.h"
diff --git a/firmware/target/arm/ata-sd-pp.c b/firmware/target/arm/ata-sd-pp.c
index 7929449a23..f7b4a992e4 100644
--- a/firmware/target/arm/ata-sd-pp.c
+++ b/firmware/target/arm/ata-sd-pp.c
@@ -20,7 +20,7 @@
****************************************************************************/
#include "config.h" /* for HAVE_MULTIDRIVE */
#include "fat.h"
-#include "hotswap.h"
+#include "sdmmc.h"
#ifdef HAVE_HOTSWAP
#include "sd-pp-target.h"
#endif
diff --git a/firmware/target/arm/s3c2440/sd-s3c2440.c b/firmware/target/arm/s3c2440/sd-s3c2440.c
index 56aeacd83d..33b995213e 100644
--- a/firmware/target/arm/s3c2440/sd-s3c2440.c
+++ b/firmware/target/arm/s3c2440/sd-s3c2440.c
@@ -31,7 +31,7 @@
#include "uart-s3c2440.h"
#endif
#ifdef HAVE_HOTSWAP
-#include "hotswap.h"
+#include "sdmmc.h"
#include "disk.h"
#include "fat.h"
#endif
diff --git a/firmware/target/arm/tcc780x/sd-tcc780x.c b/firmware/target/arm/tcc780x/sd-tcc780x.c
index 25876aa7ba..bfab9fdddd 100644
--- a/firmware/target/arm/tcc780x/sd-tcc780x.c
+++ b/firmware/target/arm/tcc780x/sd-tcc780x.c
@@ -22,7 +22,7 @@
#include "sd.h"
#include "system.h"
#include <string.h>
-#include "hotswap.h"
+#include "sdmmc.h"
#include "storage.h"
#include "led.h"
#include "thread.h"
diff --git a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
index 13fe1d69a9..be534bf24e 100644
--- a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
@@ -27,7 +27,7 @@
#include "disk.h"
#include "fat.h"
#include "led.h"
-#include "hotswap.h"
+#include "sdmmc.h"
#include "logf.h"
#include "sd.h"
#include "system.h"
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx767/ata-sd-target.h b/firmware/target/mips/ingenic_jz47xx/onda_vx767/ata-sd-target.h
index aa7d29e4c5..d31022612d 100644
--- a/firmware/target/mips/ingenic_jz47xx/onda_vx767/ata-sd-target.h
+++ b/firmware/target/mips/ingenic_jz47xx/onda_vx767/ata-sd-target.h
@@ -23,7 +23,7 @@
#define ATA_SD_TARGET_H
#include "inttypes.h"
-#include "hotswap.h"
+#include "sdmmc.h"
#include "jz4740.h"
int _sd_read_sectors(unsigned long start, int count, void* buf);
diff --git a/firmware/usbstack/usb_storage.c b/firmware/usbstack/usb_storage.c
index 3373bf41f3..1d47772362 100644
--- a/firmware/usbstack/usb_storage.c
+++ b/firmware/usbstack/usb_storage.c
@@ -26,7 +26,6 @@
/*#define LOGF_ENABLE*/
#include "logf.h"
#include "storage.h"
-#include "hotswap.h"
#include "disk.h"
/* Needed to get at the audio buffer */
#include "audio.h"