summaryrefslogtreecommitdiff
path: root/firmware/target/mips/ingenic_jz47xx
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target/mips/ingenic_jz47xx')
-rw-r--r--firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c12
-rw-r--r--firmware/target/mips/ingenic_jz47xx/onda_vx767/ata-sd-target.h8
2 files changed, 4 insertions, 16 deletions
diff --git a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
index fd4a96f230..0ec1791928 100644
--- a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
@@ -1672,10 +1672,6 @@ tCardInfo* card_get_info_target(int card_no)
1672 (void)card_no; 1672 (void)card_no;
1673 int i, temp; 1673 int i, temp;
1674 static tCardInfo card; 1674 static tCardInfo card;
1675 static const char mantissa[] = { /* *10 */
1676 0, 10, 12, 13, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 70, 80 };
1677 static const int exponent[] = { /* use varies */
1678 1,10,100,1000,10000,100000,1000000,10000000,100000000,1000000000 };
1679 1675
1680 card.initialized = true; 1676 card.initialized = true;
1681 card.ocr = 0; 1677 card.ocr = 0;
@@ -1684,12 +1680,12 @@ tCardInfo* card_get_info_target(int card_no)
1684 for(i=0; i<4; i++) 1680 for(i=0; i<4; i++)
1685 card.cid[i] = (*((unsigned long*)&mmcinfo.cid+4*i)); 1681 card.cid[i] = (*((unsigned long*)&mmcinfo.cid+4*i));
1686 temp = card_extract_bits(card.csd, 29, 3); 1682 temp = card_extract_bits(card.csd, 29, 3);
1687 card.speed = mantissa[card_extract_bits(card.csd, 25, 4)] 1683 card.speed = sd_mantissa[card_extract_bits(card.csd, 25, 4)]
1688 * exponent[temp > 2 ? 7 : temp + 4]; 1684 * sd_exponent[temp > 2 ? 7 : temp + 4];
1689 card.nsac = 100 * card_extract_bits(card.csd, 16, 8); 1685 card.nsac = 100 * card_extract_bits(card.csd, 16, 8);
1690 temp = card_extract_bits(card.csd, 13, 3); 1686 temp = card_extract_bits(card.csd, 13, 3);
1691 card.tsac = mantissa[card_extract_bits(card.csd, 9, 4)] 1687 card.taac = sd_mantissa[card_extract_bits(card.csd, 9, 4)]
1692 * exponent[temp] / 10; 1688 * sd_exponent[temp] / 10;
1693 card.numblocks = mmcinfo.block_num; 1689 card.numblocks = mmcinfo.block_num;
1694 card.blocksize = mmcinfo.block_len; 1690 card.blocksize = mmcinfo.block_len;
1695 1691
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 cc6bd8a773..5cc9e4b203 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
@@ -26,14 +26,6 @@
26#include "hotswap.h" 26#include "hotswap.h"
27#include "jz4740.h" 27#include "jz4740.h"
28 28
29tCardInfo *card_get_info_target(int card_no);
30bool card_detect_target(void);
31
32#ifdef HAVE_HOTSWAP
33void card_enable_monitoring_target(bool on);
34void microsd_int(void); /* ??? */
35#endif
36
37int _sd_read_sectors(unsigned long start, int count, void* buf); 29int _sd_read_sectors(unsigned long start, int count, void* buf);
38int _sd_write_sectors(unsigned long start, int count, const void* buf); 30int _sd_write_sectors(unsigned long start, int count, const void* buf);
39int _sd_init(void); 31int _sd_init(void);