From a0557b23f0c984576fd5a72657593211df148ca4 Mon Sep 17 00:00:00 2001 From: Frank Gevaerts Date: Sat, 5 Jun 2010 21:12:16 +0000 Subject: 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 --- apps/debug_menu.c | 2 +- apps/root_menu.c | 1 - firmware/SOURCES | 2 +- firmware/common/disk.c | 2 +- firmware/drivers/ata_mmc.c | 2 +- firmware/drivers/sd.c | 2 +- firmware/export/hotswap.h | 80 ---------------------- firmware/export/sdmmc.h | 80 ++++++++++++++++++++++ firmware/hotswap.c | 53 -------------- firmware/sdmmc.c | 53 ++++++++++++++ firmware/target/arm/as3525/sd-as3525.c | 2 +- firmware/target/arm/as3525/sd-as3525v2.c | 2 +- firmware/target/arm/ata-sd-pp.c | 2 +- firmware/target/arm/s3c2440/sd-s3c2440.c | 2 +- firmware/target/arm/tcc780x/sd-tcc780x.c | 2 +- .../target/mips/ingenic_jz47xx/ata-sd-jz4740.c | 2 +- .../mips/ingenic_jz47xx/onda_vx767/ata-sd-target.h | 2 +- firmware/usbstack/usb_storage.c | 1 - 18 files changed, 145 insertions(+), 147 deletions(-) delete mode 100644 firmware/export/hotswap.h create mode 100644 firmware/export/sdmmc.h delete mode 100644 firmware/hotswap.c create mode 100644 firmware/sdmmc.c 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 #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/hotswap.h deleted file mode 100644 index 643048976b..0000000000 --- a/firmware/export/hotswap.h +++ /dev/null @@ -1,80 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2004 by Jens Arnold - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ -#ifndef __HOTSWAP_H__ -#define __HOTSWAP_H__ - -#include - -typedef struct -{ - bool initialized; - - unsigned long read_timeout; /* n * 8 clock cycles */ - unsigned long write_timeout; /* n * 8 clock cycles */ - - unsigned long ocr; /* OCR register */ - unsigned long csd[4]; /* CSD register, 16 bytes */ - unsigned long cid[4]; /* CID register, 16 bytes */ - unsigned long speed; /* bit/s */ - unsigned int nsac; /* clock cycles */ - unsigned long taac; /* n * 0.1 ns */ - unsigned int r2w_factor; - unsigned long numblocks; /* size in flash blocks */ - unsigned int blocksize; /* block size in bytes */ - -#if (CONFIG_STORAGE & STORAGE_MMC) - unsigned char bitrate_register; -#endif - -#if (CONFIG_STORAGE & STORAGE_SD) - unsigned long rca; /* RCA register */ - unsigned int current_bank; -#endif -} tCardInfo; - -#if (CONFIG_STORAGE & STORAGE_SD) - -#include "sd.h" -#define card_get_info card_get_info_target -tCardInfo *card_get_info_target(int card_no); -void sd_parse_csd(tCardInfo *card); - -#ifdef HAVE_HOTSWAP -#define card_enable_monitoring card_enable_monitoring_target -#endif - -#else /* STORAGE_MMC */ - -#include "ata_mmc.h" -#define card_get_info mmc_card_info -tCardInfo *mmc_card_info(int card_no); -#define card_touched mmc_touched -#define card_enable_monitoring mmc_enable_monitoring - -#endif - -/* helper function to extract n (<=32) bits from an arbitrary position. - counting from MSB to LSB */ -unsigned long card_extract_bits( - const unsigned long *p, /* the start of the bitfield array */ - unsigned int start, /* bit no. to start reading */ - unsigned int size); /* how many bits to read */ -#endif diff --git a/firmware/export/sdmmc.h b/firmware/export/sdmmc.h new file mode 100644 index 0000000000..6ac3bd2af5 --- /dev/null +++ b/firmware/export/sdmmc.h @@ -0,0 +1,80 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2004 by Jens Arnold + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ +#ifndef __SDMMC_H__ +#define __SDMMC_H__ + +#include + +typedef struct +{ + bool initialized; + + unsigned long read_timeout; /* n * 8 clock cycles */ + unsigned long write_timeout; /* n * 8 clock cycles */ + + unsigned long ocr; /* OCR register */ + unsigned long csd[4]; /* CSD register, 16 bytes */ + unsigned long cid[4]; /* CID register, 16 bytes */ + unsigned long speed; /* bit/s */ + unsigned int nsac; /* clock cycles */ + unsigned long taac; /* n * 0.1 ns */ + unsigned int r2w_factor; + unsigned long numblocks; /* size in flash blocks */ + unsigned int blocksize; /* block size in bytes */ + +#if (CONFIG_STORAGE & STORAGE_MMC) + unsigned char bitrate_register; +#endif + +#if (CONFIG_STORAGE & STORAGE_SD) + unsigned long rca; /* RCA register */ + unsigned int current_bank; +#endif +} tCardInfo; + +#if (CONFIG_STORAGE & STORAGE_SD) + +#include "sd.h" +#define card_get_info card_get_info_target +tCardInfo *card_get_info_target(int card_no); +void sd_parse_csd(tCardInfo *card); + +#ifdef HAVE_HOTSWAP +#define card_enable_monitoring card_enable_monitoring_target +#endif + +#else /* STORAGE_MMC */ + +#include "ata_mmc.h" +#define card_get_info mmc_card_info +tCardInfo *mmc_card_info(int card_no); +#define card_touched mmc_touched +#define card_enable_monitoring mmc_enable_monitoring + +#endif + +/* helper function to extract n (<=32) bits from an arbitrary position. + counting from MSB to LSB */ +unsigned long card_extract_bits( + const unsigned long *p, /* the start of the bitfield array */ + unsigned int start, /* bit no. to start reading */ + unsigned int size); /* how many bits to read */ +#endif diff --git a/firmware/hotswap.c b/firmware/hotswap.c deleted file mode 100644 index 79595e4591..0000000000 --- a/firmware/hotswap.c +++ /dev/null @@ -1,53 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2004 by Jens Arnold - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ -#include -#include "config.h" -#if (CONFIG_STORAGE & STORAGE_MMC) -#include "ata_mmc.h" -#else -#include "hotswap.h" -#endif - -/* helper function to extract n (<=32) bits from an arbitrary position. - counting from MSB to LSB */ -unsigned long card_extract_bits( - const unsigned long *p, /* the start of the bitfield array */ - unsigned int start, /* bit no. to start reading */ - unsigned int size) /* how many bits to read */ -{ - unsigned int long_index, bit_index; - unsigned long result; - - /* we assume words of CSD/CID are stored most significant word first */ - start = 127 - start; - - long_index = start / 32; - bit_index = start % 32; - - result = p[long_index] << bit_index; - - if (bit_index + size > 32) /* crossing longword boundary */ - result |= p[long_index+1] >> (32 - bit_index); - - result >>= 32 - size; - - return result; -} diff --git a/firmware/sdmmc.c b/firmware/sdmmc.c new file mode 100644 index 0000000000..f499ffae08 --- /dev/null +++ b/firmware/sdmmc.c @@ -0,0 +1,53 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2004 by Jens Arnold + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ +#include +#include "config.h" +#if (CONFIG_STORAGE & STORAGE_MMC) +#include "ata_mmc.h" +#else +#include "sdmmc.h" +#endif + +/* helper function to extract n (<=32) bits from an arbitrary position. + counting from MSB to LSB */ +unsigned long card_extract_bits( + const unsigned long *p, /* the start of the bitfield array */ + unsigned int start, /* bit no. to start reading */ + unsigned int size) /* how many bits to read */ +{ + unsigned int long_index, bit_index; + unsigned long result; + + /* we assume words of CSD/CID are stored most significant word first */ + start = 127 - start; + + long_index = start / 32; + bit_index = start % 32; + + result = p[long_index] << bit_index; + + if (bit_index + size > 32) /* crossing longword boundary */ + result |= p[long_index+1] >> (32 - bit_index); + + result >>= 32 - size; + + return result; +} 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 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 -#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" -- cgit v1.2.3