Changeset 2013

Timestamp:

07/27/12 08:49:06 (10 months ago)

Author:

philmoz

Message:

Merged revision(s) 2011-2012 from trunk:

Location:

branches/philmoz-uitest

Files:

• . (modified) (1 prop)
• platform/a3200/sub/100d/stubs_entry.S (modified) (2 diffs)
• platform/ixus115_elph100hs/sub/101b/stubs_entry.S (modified) (2 diffs)
• platform/s100/sub/101b (modified) (1 prop)
• platform/s100/sub/101b/Makefile (modified) (1 prop)
• platform/s100/sub/101b/boot.c (modified) (1 prop)
• platform/s100/sub/101b/capt_seq.c (modified) (1 prop)
• platform/s100/sub/101b/lib.c (modified) (1 prop)
• platform/s100/sub/101b/makefile.inc (modified) (1 prop)
• platform/s100/sub/101b/movie_rec.c (modified) (1 prop)
• platform/s100/sub/101b/stubs_asm.h (modified) (1 prop)
• platform/s100/sub/101b/stubs_auto.S (modified) (1 prop)
• platform/s100/sub/101b/stubs_entry.S (modified) (1 diff, 1 prop)
• platform/s100/sub/101b/stubs_entry_2.S (modified) (1 prop)
• platform/s100/sub/101b/stubs_min.S (modified) (1 prop)

branches/philmoz-uitest/platform/a3200/sub/100d/stubs_entry.S

@@ -8 +8 @@
 
 // Values for makefile.inc
+//   PLATFORMOSVER = 47
 //   PLATFORMID = 12836 (0x3224) // Found @ 0xfffe0040
 //   MAXRAMADDR = 0x03ffffff
@@ -138 +139 @@
 NSTUB(GetPropertyCase                         ,0xff88cef8) //102
 NSTUB(GetSystemTime                           ,0xffab6650) //101
+NSTUB(GetVRAMHPixelsSize                      ,0xff853c08) //102
+NSTUB(GetVRAMVPixelsSize                      ,0xff853c14) //102
 NSTUB(GetZoomLensCurrentPoint                 ,0xff964c28) //102
 NSTUB(GetZoomLensCurrentPosition              ,0xffaa33c8) //102

branches/philmoz-uitest/platform/ixus115_elph100hs/sub/101b/stubs_entry.S

@@ -69 +69 @@
 //    { 1, KEY_ZOOM_OUT        ,0x10000000 }, // Found @0xffb996b8, levent 0x03
 //    { 1, KEY_ZOOM_IN         ,0x20000000 }, // Found @0xffb996c0, levent 0x02
+//    { 2, KEY_UP              ,0x00000001 }, // Found @0xffb996d8, levent 0x04
 //    { 2, KEY_SHOOT_FULL      ,0x00000030 }, // Found @0xffb99700, levent 0x01
 //    { 2, KEY_SHOOT_FULL_ONLY ,0x00000020 }, // Found @0xffb99700, levent 0x01
 //    { 2, KEY_SHOOT_HALF      ,0x00000010 }, // Found @0xffb996f8, levent 0x00
-//    { 2, KEY_UP              ,0x00000001 }, // Found @0xffb996d8, levent 0x04
 //    { 2, KEY_DOWN            ,0x00000002 }, // Found @0xffb996e0, levent 0x05
 //    { 2, KEY_LEFT            ,0x00000004 }, // Found @0xffb996e8, levent 0x06
@@ -106 +106 @@
 NSTUB(DoAFLock                                ,0xff8396dc) //102
 NSTUB(EnterToCompensationEVF                  ,0xff839938) //104
-NSTUB(ExecuteEventProcedure                   ,0xff890b4c) //  2
+NSTUB(ExecuteEventProcedure                   ,0xff890b4c) //  1
 NSTUB(ExitFromCompensationEVF                 ,0xff83997c) //104
 NSTUB(ExitTask                                ,0xff81ec40) //101

branches/philmoz-uitest/platform/s100/sub/101b/stubs_entry.S

@@ -104 +104 @@
 NSTUB(DoAFLock                                ,0xff029208) //102
 NSTUB(EnterToCompensationEVF                  ,0xff0295dc) //104
-NSTUB(ExecuteEventProcedure                   ,0xff08d868) //  2
+NSTUB(ExecuteEventProcedure                   ,0xff08d868) //  1
 NSTUB(ExitFromCompensationEVF                 ,0xff029620) //104
 NSTUB(ExitTask                                ,0xff00ed80) //101