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.zip rockbox-af805be6cbace62fdde6b0bf3ae129a395b6ed8a.tar.gz rockbox-af805be6cbace62fdde6b0bf3ae129a395b6ed8a.tar.bz2 rockbox-af805be6cbace62fdde6b0bf3ae129a395b6ed8a.tar.xz | |
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 e47f149..5577d63 100644 --- a/apps/plugins/SOURCES +++ b/apps/plugins/SOURCES @@ -1,4 +1,3 @@ -test_codec.c /* plugins common to all models */ battery_bench.c chessclock.c @@ -153,7 +152,3 @@ superdom.c #endif /* m:robe 500 */ md5sum.c - -#ifdef GIGABEAT_F -gigabeat_flash.c -#endif diff --git a/firmware/export/config-clip.h b/firmware/export/config-clip.h index 40630bb..0a6164f 100644 --- a/firmware/export/config-clip.h +++ b/firmware/export/config-clip.h @@ -34,13 +34,13 @@ #define HAVE_BUTTON_LIGHT /* define this if you have access to the quickscreen */ -//#define HAVE_QUICKSCREEN +#define HAVE_QUICKSCREEN /* define this if you have access to the pitchscreen */ -//#define HAVE_PITCHSCREEN +#define HAVE_PITCHSCREEN /* define this if you would like tagcache to build on this target */ -//#define HAVE_TAGCACHE +#define HAVE_TAGCACHE /* LCD dimensions */ #define LCD_WIDTH 128 diff --git a/firmware/export/config-cowond2.h b/firmware/export/config-cowond2.h index 9f825bb..edeb834 100644 --- a/firmware/export/config-cowond2.h +++ b/firmware/export/config-cowond2.h @@ -8,7 +8,7 @@ #define MODEL_NAME "Cowon D2" -#if 1 +#if 0 #define HAVE_USBSTACK #define USE_ROCKBOX_USB #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 1152448..f71de7f 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, if (card_info[drive].initialized <= 0) { - int ret = sd_init_card(drive); + sd_init_card(drive); if (!(card_info[drive].initialized)) { - panicf("card not initialised %d",ret); + panicf("card not initialised"); goto sd_transfer_error; } } |