diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/SOURCES | 2 | ||||
-rw-r--r-- | firmware/common/disk.c | 2 | ||||
-rw-r--r-- | firmware/drivers/ata_mmc.c | 2 | ||||
-rw-r--r-- | firmware/drivers/sd.c | 2 | ||||
-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.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/as3525/sd-as3525v2.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/ata-sd-pp.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/s3c2440/sd-s3c2440.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/tcc780x/sd-tcc780x.c | 2 | ||||
-rw-r--r-- | firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c | 2 | ||||
-rw-r--r-- | firmware/target/mips/ingenic_jz47xx/onda_vx767/ata-sd-target.h | 2 | ||||
-rw-r--r-- | firmware/usbstack/usb_storage.c | 1 |
14 files changed, 14 insertions, 15 deletions
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 | |||
179 | storage.c | 179 | storage.c |
180 | drivers/fat.c | 180 | drivers/fat.c |
181 | #if (CONFIG_STORAGE & STORAGE_MMC) || (CONFIG_STORAGE & STORAGE_SD) | 181 | #if (CONFIG_STORAGE & STORAGE_MMC) || (CONFIG_STORAGE & STORAGE_SD) |
182 | hotswap.c | 182 | sdmmc.c |
183 | #endif | 183 | #endif |
184 | #endif /* SIMULATOR */ | 184 | #endif /* SIMULATOR */ |
185 | 185 | ||
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 @@ | |||
23 | #include "debug.h" | 23 | #include "debug.h" |
24 | #include "fat.h" | 24 | #include "fat.h" |
25 | #ifdef HAVE_HOTSWAP | 25 | #ifdef HAVE_HOTSWAP |
26 | #include "hotswap.h" | 26 | #include "sdmmc.h" /* for card_enable_monitoring() */ |
27 | #include "dir.h" /* for release_dirs() */ | 27 | #include "dir.h" /* for release_dirs() */ |
28 | #include "file.h" /* for release_files() */ | 28 | #include "file.h" /* for release_files() */ |
29 | #endif | 29 | #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 @@ | |||
21 | #include <stdbool.h> | 21 | #include <stdbool.h> |
22 | #include "mmc.h" | 22 | #include "mmc.h" |
23 | #include "ata_mmc.h" | 23 | #include "ata_mmc.h" |
24 | #include "hotswap.h" | 24 | #include "sdmmc.h" |
25 | #include "ata_idle_notify.h" | 25 | #include "ata_idle_notify.h" |
26 | #include "kernel.h" | 26 | #include "kernel.h" |
27 | #include "thread.h" | 27 | #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 @@ | |||
21 | 21 | ||
22 | #include "config.h" | 22 | #include "config.h" |
23 | #include "logf.h" | 23 | #include "logf.h" |
24 | #include "hotswap.h" | 24 | #include "sdmmc.h" |
25 | #include "storage.h" | 25 | #include "storage.h" |
26 | 26 | ||
27 | static const unsigned char sd_mantissa[] = { /* *10 */ | 27 | 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 @@ | |||
18 | * KIND, either express or implied. | 18 | * KIND, either express or implied. |
19 | * | 19 | * |
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | #ifndef __HOTSWAP_H__ | 21 | #ifndef __SDMMC_H__ |
22 | #define __HOTSWAP_H__ | 22 | #define __SDMMC_H__ |
23 | 23 | ||
24 | #include <stdbool.h> | 24 | #include <stdbool.h> |
25 | 25 | ||
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 @@ | |||
23 | #if (CONFIG_STORAGE & STORAGE_MMC) | 23 | #if (CONFIG_STORAGE & STORAGE_MMC) |
24 | #include "ata_mmc.h" | 24 | #include "ata_mmc.h" |
25 | #else | 25 | #else |
26 | #include "hotswap.h" | 26 | #include "sdmmc.h" |
27 | #endif | 27 | #endif |
28 | 28 | ||
29 | /* helper function to extract n (<=32) bits from an arbitrary position. | 29 | /* 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 @@ | |||
26 | #include "fat.h" | 26 | #include "fat.h" |
27 | #include "thread.h" | 27 | #include "thread.h" |
28 | #include "led.h" | 28 | #include "led.h" |
29 | #include "hotswap.h" | 29 | #include "sdmmc.h" |
30 | #include "system.h" | 30 | #include "system.h" |
31 | #include "cpu.h" | 31 | #include "cpu.h" |
32 | #include <stdio.h> | 32 | #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 @@ | |||
24 | #include "fat.h" | 24 | #include "fat.h" |
25 | #include "thread.h" | 25 | #include "thread.h" |
26 | #include "led.h" | 26 | #include "led.h" |
27 | #include "hotswap.h" | 27 | #include "sdmmc.h" |
28 | #include "system.h" | 28 | #include "system.h" |
29 | #include "kernel.h" | 29 | #include "kernel.h" |
30 | #include "cpu.h" | 30 | #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 @@ | |||
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | #include "config.h" /* for HAVE_MULTIDRIVE */ | 21 | #include "config.h" /* for HAVE_MULTIDRIVE */ |
22 | #include "fat.h" | 22 | #include "fat.h" |
23 | #include "hotswap.h" | 23 | #include "sdmmc.h" |
24 | #ifdef HAVE_HOTSWAP | 24 | #ifdef HAVE_HOTSWAP |
25 | #include "sd-pp-target.h" | 25 | #include "sd-pp-target.h" |
26 | #endif | 26 | #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 @@ | |||
31 | #include "uart-s3c2440.h" | 31 | #include "uart-s3c2440.h" |
32 | #endif | 32 | #endif |
33 | #ifdef HAVE_HOTSWAP | 33 | #ifdef HAVE_HOTSWAP |
34 | #include "hotswap.h" | 34 | #include "sdmmc.h" |
35 | #include "disk.h" | 35 | #include "disk.h" |
36 | #include "fat.h" | 36 | #include "fat.h" |
37 | #endif | 37 | #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 @@ | |||
22 | #include "sd.h" | 22 | #include "sd.h" |
23 | #include "system.h" | 23 | #include "system.h" |
24 | #include <string.h> | 24 | #include <string.h> |
25 | #include "hotswap.h" | 25 | #include "sdmmc.h" |
26 | #include "storage.h" | 26 | #include "storage.h" |
27 | #include "led.h" | 27 | #include "led.h" |
28 | #include "thread.h" | 28 | #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 @@ | |||
27 | #include "disk.h" | 27 | #include "disk.h" |
28 | #include "fat.h" | 28 | #include "fat.h" |
29 | #include "led.h" | 29 | #include "led.h" |
30 | #include "hotswap.h" | 30 | #include "sdmmc.h" |
31 | #include "logf.h" | 31 | #include "logf.h" |
32 | #include "sd.h" | 32 | #include "sd.h" |
33 | #include "system.h" | 33 | #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 @@ | |||
23 | #define ATA_SD_TARGET_H | 23 | #define ATA_SD_TARGET_H |
24 | 24 | ||
25 | #include "inttypes.h" | 25 | #include "inttypes.h" |
26 | #include "hotswap.h" | 26 | #include "sdmmc.h" |
27 | #include "jz4740.h" | 27 | #include "jz4740.h" |
28 | 28 | ||
29 | int _sd_read_sectors(unsigned long start, int count, void* buf); | 29 | 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 @@ | |||
26 | /*#define LOGF_ENABLE*/ | 26 | /*#define LOGF_ENABLE*/ |
27 | #include "logf.h" | 27 | #include "logf.h" |
28 | #include "storage.h" | 28 | #include "storage.h" |
29 | #include "hotswap.h" | ||
30 | #include "disk.h" | 29 | #include "disk.h" |
31 | /* Needed to get at the audio buffer */ | 30 | /* Needed to get at the audio buffer */ |
32 | #include "audio.h" | 31 | #include "audio.h" |