Changeset 566

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

Location:

trunk

Files:

• core/Makefile (modified) (1 diff)
• core/gui.c (modified) (2 diffs)
• core/gui_osd.c (modified) (2 diffs)
• include/stdlib.h (modified) (1 diff)
• makefile.inc (modified) (1 diff)
• tools/Makefile (modified) (2 diffs)
• tools/dancingbits.c (added)
• tools/gensigs.sh (modified) (3 diffs)
• tools/readme.txt (modified) (1 diff)
• tools/sig_ref_dryos_1.txt (modified) (1 diff)
• tools/sig_ref_vxworks_1.txt (modified) (1 diff)
• tools/sig_ref_vxworks_2.txt (modified) (1 diff)
• tools/sig_ref_vxworks_3.txt (modified) (1 diff)

trunk/core/Makefile

@@ -37 +37 @@
 endif
 ifdef OPT_DEBUGGING
-CFLAGS+=-DOPT_DEBUGGING
+# global in root makefile.inc
+#CFLAGS+=-DOPT_DEBUGGING
 OPT_OBJS+=gui_debug.o gui_bench.o 
 endif

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);
+
     }
 

trunk/core/gui_osd.c

@@ -116 +116 @@
             osd[curr_item].pos->x+=(screen_width-osd[curr_item].size.x-osd[curr_item].pos->x>step)?step:screen_width-osd[curr_item].size.x-osd[curr_item].pos->x;
             osd_to_draw = 1;
-        }
+        } else
+            osd[curr_item].pos->x = screen_width-osd[curr_item].size.x;
         break;
     case KEY_UP:
@@ -128 +129 @@
             osd[curr_item].pos->y+=(screen_height-osd[curr_item].size.y-osd[curr_item].pos->y>step)?step:screen_height-osd[curr_item].size.y-osd[curr_item].pos->y;
             osd_to_draw = 1;
-        }
+        } else
+            osd[curr_item].pos->y = screen_height-osd[curr_item].size.y;
         break;
     case KEY_SET:

trunk/include/stdlib.h

@@ -46 +46 @@
 #else
 
+#define O_APPEND        0x8 // ok for dryos, vx?
 #define O_TRUNC         0x200
 #define O_CREAT         0x100

trunk/makefile.inc

@@ -261 +261 @@
 LDFLAGS+=-L$(topdir)platform/$(PLATFORM) -L$(topdir)platform/$(PLATFORM)/sub/$(PLATFORMSUB)
 
+ifdef OPT_DEBUGGING
+CFLAGS+=-DOPT_DEBUGGING
+endif
+
 ##########################################################################
 

trunk/tools/Makefile

@@ -5 +5 @@
 include $(topdir)makefile.inc
 
-OBJS=pakwif.o finsig.o gensig.o dumpchk.o
+OBJS=pakwif.o finsig.o gensig.o dumpchk.o dancingbits.o
 
-all: pakwif$(EXE) finsig$(EXE)
+all: pakwif$(EXE) finsig$(EXE) dancingbits$(EXE)
 
 %.o: %.c
@@ -31 +31 @@
 
 dumpchk$(EXE): dumpchk.o
+        @echo $< \-\> $@
+        $(HOSTCC) $(HOSTCFLAGS) -o $@ $^
+
+dancingbits$(EXE): dancingbits.o
         @echo $< \-\> $@
         $(HOSTCC) $(HOSTCFLAGS) -o $@ $^

trunk/tools/gensigs.sh

@@ -7 +7 @@
 for v in $VERSIONS; do
     cat sig_ref_$2_${v}.txt | \
+        ( read line; rom_start=($line) ; \
     while read line; do
         # workaround - multiword read does not work in Windows shell!
@@ -13 +14 @@
         addr=${line[1]}
         length=${line[2]}
-        ./gensig sig_ref_$2_${v}.bin 0xffc00000 ${name}_${v} $addr ${length:-32}
+        ./gensig sig_ref_$2_${v}.bin ${rom_start} ${name}_${v} $addr ${length:-32}
     done
+        )
 done
 
@@ -21 +23 @@
 for v in $VERSIONS; do
     cat sig_ref_$2_${v}.txt | \
+        ( read line; rom_start=($line) ; \
     awk -v v=${v} '{ printf("\t{ \"%s\", func_sig_%s_%d },\n",$1,$1,v)}'
+        )
 done | "$1"
 

trunk/tools/readme.txt

@@ -3 +3 @@
 sig_ref_vxworks_3.bin : should contain a570-100e primary
 sig_ref_dryos_1.bin   : should contain a720-100c primary
+sig_ref_dryos_2.bin   : should contain sd1100-100c primary
+
+files should have rom start address in first line.

trunk/tools/sig_ref_dryos_1.txt

@@ +1 @@
+0xffc00000
 SleepTask 0xFFC196d0
 CreateTask 0xFFC0BBC0

trunk/tools/sig_ref_vxworks_1.txt

@@ +1 @@
+0xFFC00000
 AllocateMemory 0xFFC01B1C 32
 close 0xFFEBBE5C

trunk/tools/sig_ref_vxworks_2.txt

@@ +1 @@
+0xFFC00000
 GetSystemTime 0xFFC04D38
 GetPropertyCase 0xFFC14DEC

trunk/tools/sig_ref_vxworks_3.txt

@@ +1 @@
+0xFFC00000
 Fclose_Fut 0xFFE422A0
 Fopen_Fut 0xFFE42260