summaryrefslogtreecommitdiffstats
path: root/firmware/rolo.c
diff options
context:
space:
mode:
authorKarl Kurbjun <kkurbjun@gmail.com>2007-10-13 14:53:34 +0000
committerKarl Kurbjun <kkurbjun@gmail.com>2007-10-13 14:53:34 +0000
commitb7a4e101cb1bc8b01a1e6182939a33919814664f (patch)
tree752aeda80de82349a6215695b94105ce664e721f /firmware/rolo.c
parentc9d1ab721870b622a3698cd9b1ee9c451fabf85a (diff)
downloadrockbox-b7a4e101cb1bc8b01a1e6182939a33919814664f.tar.gz
rockbox-b7a4e101cb1bc8b01a1e6182939a33919814664f.tar.bz2
rockbox-b7a4e101cb1bc8b01a1e6182939a33919814664f.zip
M:Robe - Fix compilation and remove some warnings
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15095 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/rolo.c')
-rw-r--r--firmware/rolo.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/firmware/rolo.c b/firmware/rolo.c
index 9f9af40d39..fa1748341b 100644
--- a/firmware/rolo.c
+++ b/firmware/rolo.c
@@ -183,7 +183,7 @@ int rolo_load(const char* filename)
{
int fd;
long length;
-#if defined(CPU_COLDFIRE) || defined(CPU_PP)
+#if defined(CPU_COLDFIRE) || defined(CPU_ARM)
#if !defined(MI4_FORMAT)
int i;
#endif
@@ -215,7 +215,7 @@ int rolo_load(const char* filename)
length = filesize(fd) - FIRMWARE_OFFSET_FILE_DATA;
-#if defined(CPU_COLDFIRE) || defined(CPU_PP)
+#if defined(CPU_COLDFIRE) || defined(CPU_PP) || (CONFIG_CPU==DM320)
/* Read and save checksum */
lseek(fd, FIRMWARE_OFFSET_FILE_CRC, SEEK_SET);
if (read(fd, &file_checksum, 4) != 4) {
@@ -251,7 +251,7 @@ int rolo_load(const char* filename)
checksum = chksum_crc32 (audiobuf, length);
#else
checksum = MODEL_NUMBER;
-
+
for(i = 0;i < length;i++) {
checksum += audiobuf[i];
}
@@ -282,7 +282,7 @@ int rolo_load(const char* filename)
rolo_error("File length mismatch");
return -1;
}
-
+
/* Read and save checksum */
lseek(fd, FIRMWARE_OFFSET_FILE_CRC, SEEK_SET);
if (read(fd, &file_checksum, 2) != 2) {
@@ -306,7 +306,7 @@ int rolo_load(const char* filename)
lcd_update();
checksum = descramble(audiobuf + length, audiobuf, length);
-
+
/* Verify checksum against file header */
if (checksum != file_checksum) {
rolo_error("Checksum Error");
@@ -317,7 +317,7 @@ int rolo_load(const char* filename)
lcd_update();
set_irq_level(HIGHEST_IRQ_LEVEL);
-
+
/* Calling these 2 initialization routines was necessary to get the
the origional Archos version of the firmware to load and execute. */
system_init(); /* Initialize system for restart */