summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2003-12-28 14:53:13 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2003-12-28 14:53:13 +0000
commit1c4ea83bba9ce7ec7ede6141c1ee66c12c20f1d6 (patch)
tree9c90c6e06cbe9a4da1129367f48bff6d8e0d0442
parent8941ad5c6aa2f1878ee72ba140b750ba9df38f33 (diff)
downloadrockbox-1c4ea83bba9ce7ec7ede6141c1ee66c12c20f1d6.tar.gz
rockbox-1c4ea83bba9ce7ec7ede6141c1ee66c12c20f1d6.zip
Fixed yellow and red builds
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4182 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/clock.c6
-rw-r--r--firmware/mpeg.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/apps/plugins/clock.c b/apps/plugins/clock.c
index 64cf8a56f1..fa910efee2 100644
--- a/apps/plugins/clock.c
+++ b/apps/plugins/clock.c
@@ -110,6 +110,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
110 110
111 struct tm* current_time; 111 struct tm* current_time;
112 112
113 bool exit = false;
114 bool used = false;
115
113 TEST_PLUGIN_API(api); 116 TEST_PLUGIN_API(api);
114 (void)parameter; 117 (void)parameter;
115 rb = api; 118 rb = api;
@@ -127,9 +130,6 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
127 130
128 /* start all the clock stuff */ 131 /* start all the clock stuff */
129 132
130 bool exit = false;
131 bool used = false;
132
133 /* Time info */ 133 /* Time info */
134 current_time = rb->get_time(); 134 current_time = rb->get_time();
135 hour = current_time->tm_hour; 135 hour = current_time->tm_hour;
diff --git a/firmware/mpeg.c b/firmware/mpeg.c
index b49c3b35b5..80e871597e 100644
--- a/firmware/mpeg.c
+++ b/firmware/mpeg.c
@@ -1267,6 +1267,7 @@ static const unsigned char empty_id3_header[] =
1267 0x00, 0x00, 0x1f, 0x76 /* Size is 4096 minus 10 bytes for the header */ 1267 0x00, 0x00, 0x1f, 0x76 /* Size is 4096 minus 10 bytes for the header */
1268}; 1268};
1269 1269
1270#ifdef HAVE_MAS3587F
1270static unsigned long get_last_recorded_header(void) 1271static unsigned long get_last_recorded_header(void)
1271{ 1272{
1272 unsigned long tmp[2]; 1273 unsigned long tmp[2];
@@ -1276,6 +1277,7 @@ static unsigned long get_last_recorded_header(void)
1276 mas_readmem(MAS_BANK_D0, 0xfd1, tmp, 2); 1277 mas_readmem(MAS_BANK_D0, 0xfd1, tmp, 2);
1277 return 0xffe00000 | ((tmp[0] & 0x7c00) << 6) | (tmp[1] & 0xffff); 1278 return 0xffe00000 | ((tmp[0] & 0x7c00) << 6) | (tmp[1] & 0xffff);
1278} 1279}
1280#endif
1279 1281
1280static void mpeg_thread(void) 1282static void mpeg_thread(void)
1281{ 1283{