--- debug_menu.c.old	2010-03-24 22:59:14.000000000 +0200
+++ rockbox/apps/debug_menu.c	2010-03-31 19:40:22.000000000 +0300
@@ -288,6 +288,9 @@
 {
     int button;
     int line;
+#ifdef HAVE_REMOTE_LCD
+    int remote_line;
+#endif
     bool done = false;
     size_t bufused;
     size_t bufsize = pcmbuf_get_bufsize();
@@ -299,6 +302,10 @@
     ticks = boost_ticks = freq_sum = 0;
 
     tick_add_task(dbg_audio_task);
+    
+#ifdef HAVE_REMOTE_LCD
+    lcd_remote_setfont(FONT_SYSFIXED);
+#endif
 
     lcd_setfont(FONT_SYSFIXED);
     while(!done)
@@ -321,23 +328,40 @@
 
         line = 0;
         lcd_clear_display();
+#ifdef HAVE_REMOTE_LCD
+        remote_line = 0;
+        lcd_remote_clear_display();
+#endif
 
         bufused = bufsize - pcmbuf_free();
 
+#ifdef HAVE_REMOTE_LCD
+        lcd_remote_putsf(0, line, "pcm: %6ld/%ld", (long) bufused, 
+                (long) bufsize);
+#endif
         lcd_putsf(0, line++, "pcm: %6ld/%ld", (long) bufused, (long) bufsize);
 
         gui_scrollbar_draw(&screens[SCREEN_MAIN],0, line*8, LCD_WIDTH, 6,
                            bufsize, 0, bufused, HORIZONTAL);
         line++;
+        
+#ifdef HAVE_REMOTE_LCD
+        lcd_remote_putsf(0, remote_line++, "alloc: %6ld/%ld", 
+                audio_filebufused(), (long) filebuflen);
+#endif
 
         lcd_putsf(0, line++, "alloc: %6ld/%ld", audio_filebufused(),
-                 (long) filebuflen);
+                (long) filebuflen);
 
 #if LCD_HEIGHT > 80
         gui_scrollbar_draw(&screens[SCREEN_MAIN],0, line*8, LCD_WIDTH, 6,
                            filebuflen, 0, audio_filebufused(), HORIZONTAL);
         line++;
-
+        
+#ifdef HAVE_REMOTE_LCD
+        lcd_remote_putsf(0, remote_line++, "real:  %6ld/%ld", 
+                 (long)d.buffered_data, (long)filebuflen);
+#endif
         lcd_putsf(0, line++, "real:  %6ld/%ld", (long)d.buffered_data,
                  (long)filebuflen);
 
@@ -345,23 +369,41 @@
                            filebuflen, 0, (long)d.buffered_data, HORIZONTAL);
         line++;
 #endif
-
+#ifdef HAVE_REMOTE_LCD
+        lcd_remote_putsf(0, remote_line++, "usefl: %6ld/%ld",
+                (long)(d.useful_data),(long)filebuflen);
+#endif
         lcd_putsf(0, line++, "usefl: %6ld/%ld", (long)(d.useful_data),
-                                                       (long)filebuflen);
+                (long)filebuflen);
 
 #if LCD_HEIGHT > 80
         gui_scrollbar_draw(&screens[SCREEN_MAIN],0, line*8, LCD_WIDTH, 6,
                            filebuflen, 0, d.useful_data, HORIZONTAL);
         line++;
 #endif
+#ifdef HAVE_REMOTE_LCD
+        lcd_remote_putsf(0, remote_line++, "data_rem: %ld", (long)d.data_rem);
+#endif
 
         lcd_putsf(0, line++, "data_rem: %ld", (long)d.data_rem);
-
+        
+#ifdef HAVE_REMOTE_LCD
+        lcd_remote_putsf(0, remote_line++, "track count: %2d",
+                            audio_track_count());
+#endif
         lcd_putsf(0, line++, "track count: %2d", audio_track_count());
-
+        
+#ifdef HAVE_REMOTE_LCD
+        lcd_remote_putsf(0, remote_line++, "handle count: %d",
+                            (int)d.num_handles);
+#endif
         lcd_putsf(0, line++, "handle count: %d", (int)d.num_handles);
 
 #ifndef SIMULATOR
+#ifdef HAVE_REMOTE_LCD
+        lcd_remote_putsf(0, remote_line++, "cpu freq: %3dMHz",
+                 (int)((FREQ + 500000) / 1000000));
+#endif
         lcd_putsf(0, line++, "cpu freq: %3dMHz",
                  (int)((FREQ + 500000) / 1000000));
 #endif
@@ -370,19 +412,37 @@
         {
             int boostquota = boost_ticks * 1000 / ticks; /* in 0.1 % */
             int avgclock   = freq_sum * 10 / ticks;      /* in 100 kHz */
+#ifdef HAVE_REMOTE_LCD
+            lcd_remote_putsf(0, remote_line++, "boost:%3d.%d%% (%d.%dMHz)",
+                     boostquota/10, boostquota%10, avgclock/10, avgclock%10);
+#endif
             lcd_putsf(0, line++, "boost:%3d.%d%% (%d.%dMHz)",
                      boostquota/10, boostquota%10, avgclock/10, avgclock%10);
         }
-
+        
+#ifdef HAVE_REMOTE_LCD
+        lcd_remote_putsf(0, remote_line++, "pcmbufdesc: %2d/%2d",
+                pcmbuf_used_descs(), pcmbufdescs);
+#endif
         lcd_putsf(0, line++, "pcmbufdesc: %2d/%2d",
                 pcmbuf_used_descs(), pcmbufdescs);
+        
+#ifdef HAVE_REMOTE_LCD
+        lcd_remote_putsf(0, remote_line++, "watermark: %6d",
+                (int)(d.watermark));
+#endif
         lcd_putsf(0, line++, "watermark: %6d",
                 (int)(d.watermark));
-
+#ifdef HAVE_REMOTE_LCD
+        lcd_remote_update();
+#endif
         lcd_update();
     }
 
     tick_remove_task(dbg_audio_task);
+#ifdef HAVE_REMOTE_LCD
+    lcd_remote_setfont(FONT_UI);
+#endif
     lcd_setfont(FONT_UI);
 
     return false;