Changeset 1335

Timestamp:

09/12/11 02:46:06 (21 months ago)

Author:

reyalp

Message:

a410 cosmetic cleanup from srsa_4c in ​http://chdk.setepontos.com/index.php?topic=650.msg73045#msg73045

• removes unneeded platform specific ifdefs

Location:

trunk

Files:

• include/lolevel.h (modified) (1 diff)
• platform/a410/sub/100f/stubs_entry_2.S (modified) (1 diff)
• platform/generic/wrappers.c (modified) (1 diff)

trunk/include/lolevel.h

@@ -21 +21 @@
 extern long _GetFocusLensSubjectDistanceFromLens();
 extern void _MoveFocusLensToDistance(short *dist);
-#if defined(CAMERA_a410)
-extern void MoveFocusLensToDistanceA410(short *dist);
-#endif
 extern void _PutInNdFilter();
 extern void _PutOutNdFilter();

trunk/platform/a410/sub/100f/stubs_entry_2.S

@@ -42 +42 @@
 NHSTUB(MFOn,0xffd24c18)
 NHSTUB(MFOff,0xffd24c48)
+
+NHSTUB(MoveFocusLensToDistance, MoveFocusLensToDistanceA410) //hack to make this work

trunk/platform/generic/wrappers.c

@@ -262 +262 @@
 #endif
         {
-#if defined(CAMERA_a410) // need to disable a (false) assert here to make this function work 
-                MoveFocusLensToDistanceA410((short*)&newpos);
-#else
                 _MoveFocusLensToDistance((short*)&newpos);
-#endif
                 //while (focus_busy);
                 while ((shooting_is_flash_ready()!=1) || (focus_busy));