Fix simulator builds, and some debugf() format strings.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12817 a1c6a512-1295-4272-9138-f99709370657

14 files changed, 37 insertions, 36 deletions

diff --git a/apps/codecs/adx.c b/apps/codecs/adx.c
index 337e07e721..d85269f999 100644
--- a/apps/codecs/adx.c
+++ b/apps/codecs/adx.c
@@ -92,8 +92,8 @@ next_track:
     
     /* useful for seeking and reporting current playback position */
     avgbytespersec = ci->id3->frequency * 18 * channels / 32;
-    DEBUGF("avgbytespersec=%d\n",avgbytespersec);
-    
+    DEBUGF("avgbytespersec=%ld\n",avgbytespersec);
+
     /* Get loop data */
     
     looping = 0; start_adr = 0; end_adr = 0;
@@ -146,14 +146,14 @@ next_track:
     }
 
     if (looping) {
-        DEBUGF("ADX: looped, start: %x end: %x\n",start_adr,end_adr);
+        DEBUGF("ADX: looped, start: %lx end: %lx\n",start_adr,end_adr);
     } else {
         DEBUGF("ADX: not looped\n");
     }
     
     /* advance to first frame */
     /*ci->seek_buffer(chanstart);*/
-    DEBUGF("ADX: first frame at %x\n",chanstart);
+    DEBUGF("ADX: first frame at %lx\n",chanstart);
     bufoff = chanstart;
 
     /* setup pcm buffer format */
@@ -205,7 +205,7 @@ next_track:
         if (ci->seek_time) {
             uint32_t newpos;
             
-            DEBUGF("ADX: seek to %dms\n",ci->seek_time);
+            DEBUGF("ADX: seek to %ldms\n",ci->seek_time);
 
             endofstream = 0;
             loop_count = 0;
@@ -227,7 +227,7 @@ next_track:
         /* dance with the devil in the pale moonlight */
         if ((bufoff > ci->curpos + (off_t)bufsize - channels*18) ||
             bufoff < ci->curpos) {
-            DEBUGF("ADX: requesting another buffer at %x size %x\n",
+            DEBUGF("ADX: requesting another buffer at %lx size %lx\n",
                 bufoff,ci->filesize-bufoff);
             ci->seek_buffer(bufoff);
             buf = ci->request_buffer(&n, ci->filesize-bufoff);
@@ -236,13 +236,13 @@ next_track:
             if ((off_t)bufsize < channels*18) {
                 /* if we can't get a full frame, just request a single
                    frame (should be able to fit it in the guard buffer) */
-                DEBUGF("ADX: requesting single frame at %x\n",bufoff);
+                DEBUGF("ADX: requesting single frame at %lx\n",bufoff);
                 buf = ci->request_buffer(&n, channels*18);
                 bufsize=n;
                 DEBUGF("ADX: read size = %x\n",bufsize);
             }
             if (!buf) {
-                DEBUGF("ADX: couldn't get buffer at %x size %x\n",
+                DEBUGF("ADX: couldn't get buffer at %lx size %lx\n",
                     bufoff,ci->filesize-bufoff);
                 return CODEC_ERROR;
             }
diff --git a/apps/codecs/aiff.c b/apps/codecs/aiff.c
index 7cb471c432..e154bce583 100644
--- a/apps/codecs/aiff.c
+++ b/apps/codecs/aiff.c
@@ -112,7 +112,7 @@ next_track:
             sample_size  = ((buf[14]<<8)|buf[15]);
             /* sample_rate (don't use last 4 bytes, only integer fs) */
             if (buf[16] != 0x40) {
-                DEBUGF("CODEC_ERROR: weird sampling rate (no @)\n", i);
+                DEBUGF("CODEC_ERROR: weird sampling rate (no @)\n");
                 i = CODEC_ERROR;
                 goto done;
             }
diff --git a/apps/codecs/libm4a/demux.c b/apps/codecs/libm4a/demux.c
index 10972f8b1f..29cbba7402 100644
--- a/apps/codecs/libm4a/demux.c
+++ b/apps/codecs/libm4a/demux.c
@@ -139,7 +139,7 @@ static bool read_chunk_esds(qtmovie_t *qtmovie, size_t chunk_len)
     temp=stream_read_int32(qtmovie->stream);//0x15000414 ????
     maxBitrate = stream_read_int32(qtmovie->stream);
     avgBitrate = stream_read_int32(qtmovie->stream);
-    DEBUGF("audioType=%d, maxBitrate=%d, avgBitrate=%d\n",audioType,maxBitrate,avgBitrate);
+    DEBUGF("audioType=%d, maxBitrate=%ld, avgBitrate=%ld\n",audioType,maxBitrate,avgBitrate);
 
     /* get and verify DecSpecificInfoTag */
     if (stream_read_uint8(qtmovie->stream) != 0x05)
@@ -272,7 +272,7 @@ static bool read_chunk_stsd(qtmovie_t *qtmovie, size_t chunk_len)
           j=qtmovie->stream->ci->curpos+sub_chunk_len-8;
           if (read_chunk_esds(qtmovie,sub_chunk_len)) {
              if (j!=qtmovie->stream->ci->curpos) {
-               DEBUGF("curpos=%d, j=%d - Skipping %d bytes\n",qtmovie->stream->ci->curpos,j,j-qtmovie->stream->ci->curpos);
+               DEBUGF("curpos=%ld, j=%d - Skipping %ld bytes\n",qtmovie->stream->ci->curpos,j,j-qtmovie->stream->ci->curpos);
                stream_skip(qtmovie->stream,j-qtmovie->stream->ci->curpos);
              }
              entry_remaining-=sub_chunk_len;
@@ -281,7 +281,7 @@ static bool read_chunk_stsd(qtmovie_t *qtmovie, size_t chunk_len)
               return false;
           }
 
-          DEBUGF("entry_remaining=%d\n",entry_remaining);
+          DEBUGF("entry_remaining=%ld\n",entry_remaining);
           stream_skip(qtmovie->stream,entry_remaining);
 
         } else {
@@ -379,7 +379,7 @@ static bool read_chunk_stsz(qtmovie_t *qtmovie, size_t chunk_len)
         
         if (v > 0x0000ffff)
         {
-            DEBUGF("stsz[%d] > 65 kB (%d)\n", i, v);
+            DEBUGF("stsz[%d] > 65 kB (%ld)\n", i, v);
             return false;
         }
         
@@ -545,7 +545,7 @@ static bool read_chunk_minf(qtmovie_t *qtmovie, size_t chunk_len)
 
     if ((i = stream_read_uint32(qtmovie->stream)) != 16)
     {
-        DEBUGF("unexpected size in media info: %d\n",i);
+        DEBUGF("unexpected size in media info: %ld\n",i);
         stream_skip(qtmovie->stream, size_remaining-4);
         return true;
     }
diff --git a/apps/codecs/spc.c b/apps/codecs/spc.c
index 1cf20098fa..61376a5770 100644
--- a/apps/codecs/spc.c
+++ b/apps/codecs/spc.c
@@ -759,7 +759,7 @@ static int play_track( void )
 
         if (ci->seek_time) {
             int curtime = sampleswritten*1000LL/sample_rate;
-            DEBUGF("seek to %d\ncurrently at %d\n",ci->seek_time,curtime);
+            DEBUGF("seek to %ld\ncurrently at %d\n",ci->seek_time,curtime);
             if (ci->seek_time < curtime) {
                 DEBUGF("seek backwards = reset\n");
                 ci->seek_complete();
diff --git a/apps/codecs/wav.c b/apps/codecs/wav.c
index 94099c543d..f45953a118 100644
--- a/apps/codecs/wav.c
+++ b/apps/codecs/wav.c
@@ -297,7 +297,7 @@ next_track:
                     /* this is not a fatal error with some formats,
                      * we'll see later if we can't decode it */
                     DEBUGF("CODEC_WARNING: non-PCM WAVE (formattag=0x%x) "
-                           "doesn't have ext. fmt descr (chunksize=%d<18).\n",
+                           "doesn't have ext. fmt descr (chunksize=%ld<18).\n",
                            formattag, i);
                 }
                 size = buf[24]|(buf[25]<<8);
diff --git a/apps/metadata.c b/apps/metadata.c
index 3fee412b3d..e5c8ad6500 100644
--- a/apps/metadata.c
+++ b/apps/metadata.c
@@ -1611,13 +1611,13 @@ static bool get_mp4_metadata(int fd, struct mp3entry* id3)
         }
         
         id3->bitrate = ((int64_t) id3->filesize * 8) / id3->length;
-        DEBUGF("MP4 bitrate %d, frequency %d Hz, length %d ms\n",
+        DEBUGF("MP4 bitrate %d, frequency %ld Hz, length %ld ms\n",
             id3->bitrate, id3->frequency, id3->length);
     }
     else
     {
         logf("MP4 metadata error");
-        DEBUGF("MP4 metadata error. errno %d, length %d, frequency %d, filesize %d\n",
+        DEBUGF("MP4 metadata error. errno %d, length %ld, frequency %ld, filesize %ld\n",
             errno, id3->length, id3->frequency, id3->filesize);
         return false;
     }
diff --git a/apps/plugins/dict.c b/apps/plugins/dict.c
index 2fde18611e..82c6afc906 100644
--- a/apps/plugins/dict.c
+++ b/apps/plugins/dict.c
@@ -217,7 +217,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
         return PLUGIN_OK;
     }
 
-    DEBUGF("Found %s at offset %d\n", word.word, reverse(word.offset));
+    DEBUGF("Found %s at offset %ld\n", word.word, reverse(word.offset));
 
     /* now open the description file */
     fData = rb->open(DICT_DESC, O_RDONLY);
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index bd0b7a5a42..96866c397d 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -830,7 +830,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
     /* Grab most of the buffer for the compressed video - leave some for 
        PCM audio data and some for libmpeg2 malloc use. */
     buffer_size = audiosize - (PCMBUFFER_SIZE+AUDIOBUFFER_SIZE+LIBMPEG2BUFFER_SIZE);
-    DEBUGF("audiosize=%d, buffer_size=%d\n",audiosize,buffer_size);
+    DEBUGF("audiosize=%d, buffer_size=%ld\n",audiosize,buffer_size);
     buffer = mpeg2_malloc(buffer_size,-1);
 
     if (buffer == NULL)
diff --git a/apps/plugins/search.c b/apps/plugins/search.c
index 26669f2b83..1705998607 100644
--- a/apps/plugins/search.c
+++ b/apps/plugins/search.c
@@ -154,7 +154,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
 
     rb = api;
 
-    DEBUGF("%s - %s\n", parameter, &filename[rb->strlen(filename)-4]);
+    DEBUGF("%s - %s\n", (char *)parameter, &filename[rb->strlen(filename)-4]);
     /* Check the extension. We only allow .m3u files. */
     if(rb->strcasecmp(&filename[rb->strlen(filename)-4], ".m3u") &&
        rb->strcasecmp(&filename[rb->strlen(filename)-5], ".m3u8")) {
diff --git a/apps/root_menu.c b/apps/root_menu.c
index 75846e3a6c..45a9b72451 100644
--- a/apps/root_menu.c
+++ b/apps/root_menu.c
@@ -219,7 +219,7 @@ static int wpsscrn(void* param)
     }
     else if ( global_status.resume_index != -1 )
     {
-        DEBUGF("Resume index %X offset %X\n",
+        DEBUGF("Resume index %X offset %lX\n",
                global_status.resume_index,
                global_status.resume_offset);
         if (playlist_resume() != -1)
@@ -229,7 +229,7 @@ static int wpsscrn(void* param)
             ret_val = gui_wps_show();
         }
     }
-    else 
+    else
     {
         gui_syncsplash(HZ*2, str(LANG_NOTHING_TO_RESUME));
     }
diff --git a/firmware/export/debug.h b/firmware/export/debug.h
index ef56ea6092..17c4bdfdd6 100644
--- a/firmware/export/debug.h
+++ b/firmware/export/debug.h
@@ -19,7 +19,7 @@
 #ifndef DEBUG_H
 #define DEBUG_H
 
-#include <_ansi.h>
+#include "../include/_ansi.h"
 
 extern void debug_init(void);
 extern void debugf(const char* fmt,...) ATTRIBUTE_PRINTF(1, 2);
diff --git a/firmware/export/logf.h b/firmware/export/logf.h
index 016425f334..868e8fc723 100644
--- a/firmware/export/logf.h
+++ b/firmware/export/logf.h
@@ -20,7 +20,7 @@
 #define LOGF_H
 #include <config.h>
 #include <stdbool.h>
-#include "_ansi.h"
+#include "../include/_ansi.h"
 
 #ifdef ROCKBOX_HAS_LOGF
 
diff --git a/firmware/id3.c b/firmware/id3.c
index 88bc399b71..92327ed92b 100644
--- a/firmware/id3.c
+++ b/firmware/id3.c
@@ -768,7 +768,7 @@ static void setid3v2title(int fd, struct mp3entry *entry)
         /* Keep track of the total size */
         totframelen = framelen;
 
-        DEBUGF("framelen = %d\n", framelen);
+        DEBUGF("framelen = %ld\n", framelen);
         if(framelen == 0){
             if (header[0] == 0 && header[1] == 0 && header[2] == 0)
                 return;
@@ -1000,7 +1000,7 @@ static int getsonglength(int fd, struct mp3entry *entry)
 
     bytecount = get_mp3file_info(fd, &info);
 
-    DEBUGF("Space between ID3V2 tag and first audio frame: 0x%x bytes\n",
+    DEBUGF("Space between ID3V2 tag and first audio frame: 0x%lx bytes\n",
            bytecount);
 
     if(bytecount < 0)
@@ -1021,7 +1021,7 @@ static int getsonglength(int fd, struct mp3entry *entry)
             || (info.byte_count < expected - diff))
         {
             DEBUGF("Note: info.byte_count differs from expected value by "
-                "%d bytes\n", labs((long) (expected - info.byte_count)));
+                "%ld bytes\n", labs((long) (expected - info.byte_count)));
             info.byte_count = 0;
             info.frame_count = 0;
             info.file_time = 0;
@@ -1085,7 +1085,7 @@ static int getsonglength(int fd, struct mp3entry *entry)
 
     /* Update the seek point for the first playable frame */
     entry->first_frame_offset = bytecount;
-    DEBUGF("First frame is at %x\n", entry->first_frame_offset);
+    DEBUGF("First frame is at %lx\n", entry->first_frame_offset);
 
     return filetime;
 }
diff --git a/firmware/mp3data.c b/firmware/mp3data.c
index 2ebb620ed6..f62afda62f 100644
--- a/firmware/mp3data.c
+++ b/firmware/mp3data.c
@@ -185,7 +185,7 @@ static bool mp3headerinfo(struct mp3info *info, unsigned long header)
     info->emphasis = header & EMPHASIS_MASK;
 
 #ifdef DEBUG_VERBOSE
-    DEBUGF( "Header: %08x, Ver %d, lay %d, bitr %d, freq %ld, "
+    DEBUGF( "Header: %08lx, Ver %d, lay %d, bitr %d, freq %ld, "
             "chmode %d, mode_ext %d, emph %d, bytes: %d time: %d/%d\n",
             header, info->version, info->layer+1, info->bitrate,
             info->frequency, info->channel_mode, info->mode_extension,
@@ -232,7 +232,7 @@ static unsigned long __find_next_frame(int fd, long *offset, long max_offset,
 
 #if defined(DEBUG) || defined(SIMULATOR)
     if(*offset)
-        DEBUGF("Warning: skipping %d bytes of garbage\n", *offset);
+        DEBUGF("Warning: skipping %ld bytes of garbage\n", *offset);
 #endif
 
     return header;
@@ -495,7 +495,8 @@ int get_mp3file_info(int fd, struct mp3info *info)
         if(!mp3headerinfo(info, header))
             return -7;
 
-        DEBUGF("%04x: %04x %04x ", 0, header >> 16, header & 0xffff);
+        DEBUGF("%04x: %04x %04x ", 0, (short)(header >> 16),
+               (short)(header & 0xffff));
         for(i = 4;i < (int)sizeof(frame)-4;i+=2) {
             if(i % 16 == 0) {
                 DEBUGF("\n%04x: ", i-4);
@@ -529,8 +530,8 @@ int get_mp3file_info(int fd, struct mp3info *info)
         frames_per_entry = bytes2int(0, 0, vbrheader[24], vbrheader[25]);
         DEBUGF("Frame size (%dkpbs): %d bytes (0x%x)\n",
                info->bitrate, info->frame_size, info->frame_size);
-        DEBUGF("Frame count: %x\n", info->frame_count);
-        DEBUGF("Byte count: %x\n", info->byte_count);
+        DEBUGF("Frame count: %lx\n", info->frame_count);
+        DEBUGF("Byte count: %lx\n", info->byte_count);
         DEBUGF("Offsets: %d\n", num_offsets);
         DEBUGF("Frames/entry: %d\n", frames_per_entry);
 
@@ -540,7 +541,7 @@ int get_mp3file_info(int fd, struct mp3info *info)
         {
            j = bytes2int(0, 0, vbrheader[26+i*2], vbrheader[27+i*2]);
            offset += j;
-           DEBUGF("%03d: %x (%x)\n", i, offset - bytecount, j);
+           DEBUGF("%03d: %lx (%x)\n", i, offset - bytecount, j);
         }
     }
 
@@ -695,7 +696,7 @@ int create_xing_header(int fd, long startpos, long filesize,
                 toc[i] = filepos * 256 / filesize;
             }
             
-            DEBUGF("Pos %d: %d  relpos: %d  filepos: %x tocentry: %x\n",
+            DEBUGF("Pos %d: %ld  relpos: %ld  filepos: %lx tocentry: %x\n",
                    i, pos, pos-last_pos, filepos, toc[i]);
             
             last_pos = pos;