Changeset 566 for trunk/core/gui.c

Timestamp:

11/15/08 07:12:19 (5 years ago)

Author:

reyalp

Message:

misc patches from chr in prep for ixus80_sd1100
see ​http://chdk.setepontos.com/index.php/topic,650.msg24281.html#msg24281
applied
0001-found-O_APPEND-for-dryos.patch
0004-tool-for-encoding-diskboot.bin-images.patch
0005-hack-gensigs.sh-we-have-different-rom-start-adresse.patch
0008-while-hacking-it-happend-that-.cfg-got-corrupt-and.patch
0009-hacking-debug-osd-panel.patch
0011-compile-fix-make-OPT_DEBUGGING-global.patch

File:

• trunk/core/gui.c (modified) (2 diffs)

trunk/core/gui.c

@@ -2335 +2335 @@
 
 //-------------------------------------------------------------------
-extern long physw_status[3];
-extern long GetPropertyCase(long opt_id, void *buf, long bufsize);
 //extern int xxxx, eeee;
 //-------------------------------------------------------------------
@@ -2522 +2520 @@
 //      sprintf(osd_buf, "1:%03d-%04d  ", (v>>18)&0x3FF, (v>>4)&0x3FFF);
 //      sprintf(osd_buf, "1:%d, %08X  ", xxxx, eeee);
+/*
+extern long physw_status[3];
         sprintf(osd_buf, "1:%8x  ", physw_status[0]);
         draw_txt_string(28, 10, osd_buf, conf.osd_color);
 
- sprintf(osd_buf, "2:%8x  ", physw_status[1]);
-
+        sprintf(osd_buf, "2:%8x  ", physw_status[1]);
         draw_txt_string(28, 11, osd_buf, conf.osd_color);
 
-sprintf(osd_buf, "3:%8x  ", physw_status[2]);
-
+        sprintf(osd_buf, "3:%8x  ", physw_status[2]);
         draw_txt_string(28, 12, osd_buf, conf.osd_color);
 
-//      sprintf(osd_buf, "4:%8x  ", vid_get_viewport_fb_d());
-         sprintf(osd_buf, "4:%8x  ", get_usb_power(1));
+        //      sprintf(osd_buf, "4:%8x  ", vid_get_viewport_fb_d());
+*/
+        sprintf(osd_buf, "u:%8x  ", get_usb_power(1));
+        draw_txt_string(28,  9, osd_buf, conf.osd_color);
+
+        sprintf(osd_buf, "1:%8x  ", (void*) (*(int*)conf.mem_view_addr_init));
+        draw_txt_string(28, 10, osd_buf, conf.osd_color);
+
+extern volatile long focus_busy;
+        sprintf(osd_buf, "f:%8x  ", focus_busy);
+        draw_txt_string(28, 11, osd_buf, conf.osd_color);
+
+extern volatile long zoom_busy;
+        sprintf(osd_buf, "z:%8x  ", zoom_busy);
+        draw_txt_string(28, 12, osd_buf, conf.osd_color);
+
+        sprintf(osd_buf, "t:%8x  ", zoom_status);
         draw_txt_string(28, 13, osd_buf, conf.osd_color);
+
     }