diff options
author | Frank Gevaerts <frank@gevaerts.be> | 2008-12-21 16:32:13 +0000 |
---|---|---|
committer | Frank Gevaerts <frank@gevaerts.be> | 2008-12-21 16:32:13 +0000 |
commit | af805be6cbace62fdde6b0bf3ae129a395b6ed8a (patch) | |
tree | 92f9d4dea4d70a9757a4291b4aaa1ed31d43f7ce | |
parent | c88cd20ab2a675a3135fbf588225b257cd651084 (diff) | |
download | rockbox-af805be6cbace62fdde6b0bf3ae129a395b6ed8a.tar.gz rockbox-af805be6cbace62fdde6b0bf3ae129a395b6ed8a.zip |
revert accidental commit of unrelated files
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19539 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugins/SOURCES | 5 | ||||
-rw-r--r-- | firmware/export/config-clip.h | 6 | ||||
-rw-r--r-- | firmware/export/config-cowond2.h | 2 | ||||
-rw-r--r-- | firmware/target/arm/as3525/ata_sd_as3525.c | 4 |
4 files changed, 6 insertions, 11 deletions
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES index e47f149618..5577d632ea 100644 --- a/apps/plugins/SOURCES +++ b/apps/plugins/SOURCES | |||
@@ -1,4 +1,3 @@ | |||
1 | test_codec.c | ||
2 | /* plugins common to all models */ | 1 | /* plugins common to all models */ |
3 | battery_bench.c | 2 | battery_bench.c |
4 | chessclock.c | 3 | chessclock.c |
@@ -153,7 +152,3 @@ superdom.c | |||
153 | #endif /* m:robe 500 */ | 152 | #endif /* m:robe 500 */ |
154 | 153 | ||
155 | md5sum.c | 154 | md5sum.c |
156 | |||
157 | #ifdef GIGABEAT_F | ||
158 | gigabeat_flash.c | ||
159 | #endif | ||
diff --git a/firmware/export/config-clip.h b/firmware/export/config-clip.h index 40630bb75a..0a6164fbb6 100644 --- a/firmware/export/config-clip.h +++ b/firmware/export/config-clip.h | |||
@@ -34,13 +34,13 @@ | |||
34 | #define HAVE_BUTTON_LIGHT | 34 | #define HAVE_BUTTON_LIGHT |
35 | 35 | ||
36 | /* define this if you have access to the quickscreen */ | 36 | /* define this if you have access to the quickscreen */ |
37 | //#define HAVE_QUICKSCREEN | 37 | #define HAVE_QUICKSCREEN |
38 | 38 | ||
39 | /* define this if you have access to the pitchscreen */ | 39 | /* define this if you have access to the pitchscreen */ |
40 | //#define HAVE_PITCHSCREEN | 40 | #define HAVE_PITCHSCREEN |
41 | 41 | ||
42 | /* define this if you would like tagcache to build on this target */ | 42 | /* define this if you would like tagcache to build on this target */ |
43 | //#define HAVE_TAGCACHE | 43 | #define HAVE_TAGCACHE |
44 | 44 | ||
45 | /* LCD dimensions */ | 45 | /* LCD dimensions */ |
46 | #define LCD_WIDTH 128 | 46 | #define LCD_WIDTH 128 |
diff --git a/firmware/export/config-cowond2.h b/firmware/export/config-cowond2.h index 9f825bb77b..edeb834ef7 100644 --- a/firmware/export/config-cowond2.h +++ b/firmware/export/config-cowond2.h | |||
@@ -8,7 +8,7 @@ | |||
8 | 8 | ||
9 | #define MODEL_NAME "Cowon D2" | 9 | #define MODEL_NAME "Cowon D2" |
10 | 10 | ||
11 | #if 1 | 11 | #if 0 |
12 | #define HAVE_USBSTACK | 12 | #define HAVE_USBSTACK |
13 | #define USE_ROCKBOX_USB | 13 | #define USE_ROCKBOX_USB |
14 | #define USB_VENDOR_ID 0x0e21 | 14 | #define USB_VENDOR_ID 0x0e21 |
diff --git a/firmware/target/arm/as3525/ata_sd_as3525.c b/firmware/target/arm/as3525/ata_sd_as3525.c index 1152448f97..f71de7fdc0 100644 --- a/firmware/target/arm/as3525/ata_sd_as3525.c +++ b/firmware/target/arm/as3525/ata_sd_as3525.c | |||
@@ -601,10 +601,10 @@ static int sd_transfer_sectors(IF_MV2(int drive,) unsigned long start, | |||
601 | 601 | ||
602 | if (card_info[drive].initialized <= 0) | 602 | if (card_info[drive].initialized <= 0) |
603 | { | 603 | { |
604 | int ret = sd_init_card(drive); | 604 | sd_init_card(drive); |
605 | if (!(card_info[drive].initialized)) | 605 | if (!(card_info[drive].initialized)) |
606 | { | 606 | { |
607 | panicf("card not initialised %d",ret); | 607 | panicf("card not initialised"); |
608 | goto sd_transfer_error; | 608 | goto sd_transfer_error; |
609 | } | 609 | } |
610 | } | 610 | } |