Changeset 409

Timestamp:

06/06/08 10:42:23 (5 years ago)

Author:

fingalo

Message:

+Added Ixus50sd400 impl. by fe50 and mproko

Location:

trunk

Files:

• Makefile (modified) (2 diffs)
• include/camera.h (modified) (2 diffs)
• loader/ixus50_sd400/blobs.S (added)
• loader/ixus50_sd400/entry.S (added)
• loader/ixus50_sd400/main.c (added)
• loader/ixus50_sd400/resetcode/entry.S (added)
• loader/ixus50_sd400/resetcode/main.c (added)
• platform/ixus50_sd400/Makefile (modified) (1 diff)
• platform/ixus50_sd400/kbd.c (added)
• platform/ixus50_sd400/lib.c (added)
• platform/ixus50_sd400/main.c (added)
• platform/ixus50_sd400/shooting.c (added)
• platform/ixus50_sd400/sub/101a/boot.c (added)
• platform/ixus50_sd400/sub/101a/capt_seq.c (added)
• platform/ixus50_sd400/sub/101a/lib.c (added)
• platform/ixus50_sd400/sub/101a/makefile.inc (added)
• platform/ixus50_sd400/sub/101a/movie_rec.c (added)
• platform/ixus50_sd400/sub/101a/stubs_asm.h (added)
• platform/ixus50_sd400/sub/101a/stubs_auto.S (added)
• platform/ixus50_sd400/sub/101a/stubs_entry.S (added)
• platform/ixus50_sd400/sub/101a/stubs_entry_2.S (added)
• platform/ixus50_sd400/sub/101a/stubs_min.S (added)
• platform/ixus50_sd400/sub/101b (added)
• platform/ixus50_sd400/sub/101b/Makefile (added)
• platform/ixus50_sd400/sub/101b/boot.c (added)
• platform/ixus50_sd400/sub/101b/capt_seq.c (added)
• platform/ixus50_sd400/sub/101b/lib.c (added)
• platform/ixus50_sd400/sub/101b/makefile.inc (added)
• platform/ixus50_sd400/sub/101b/movie_rec.c (added)
• platform/ixus50_sd400/sub/101b/stubs_asm.h (added)
• platform/ixus50_sd400/sub/101b/stubs_auto.S (added)
• platform/ixus50_sd400/sub/101b/stubs_entry.S (added)
• platform/ixus50_sd400/sub/101b/stubs_entry_2.S (added)
• platform/ixus50_sd400/sub/101b/stubs_min.S (added)
• platform/ixus50_sd400/wrappers.c (added)

trunk/Makefile

@@ -107 +107 @@
         $(MAKE) -s --no-print-directory PLATFORM=ixus950_sd850   PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub      
         #$(MAKE) -s --no-print-directory PLATFORM=ixus40_sd300    PLATFORMSUB=100k NO_INC_BUILD=1 firzipsub
-        #$(MAKE) -s --no-print-directory PLATFORM=ixus50_sd400    PLATFORMSUB=101a NO_INC_BUILD=1 firzipsub
+        $(MAKE) -s --no-print-directory PLATFORM=ixus50_sd400    PLATFORMSUB=101a NO_INC_BUILD=1 firzipsub
+        $(MAKE) -s --no-print-directory PLATFORM=ixus50_sd400    PLATFORMSUB=101b NO_INC_BUILD=1 firzipsub
         $(MAKE) -s --no-print-directory PLATFORM=ixus55_sd450    PLATFORMSUB=100b NO_INC_BUILD=1 firzipsub
         $(MAKE) -s --no-print-directory PLATFORM=ixus55_sd450    PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub
@@ -157 +158 @@
         $(MAKE) -s --no-print-directory PLATFORM=ixus950_sd850   PLATFORMSUB=100c NO_INC_BUILD=1 clean  
         #$(MAKE) -s --no-print-directory PLATFORM=ixus40_sd300    PLATFORMSUB=100k NO_INC_BUILD=1 clean
-        #$(MAKE) -s --no-print-directory PLATFORM=ixus50_sd400    PLATFORMSUB=101a NO_INC_BUILD=1 clean
+        $(MAKE) -s --no-print-directory PLATFORM=ixus50_sd400    PLATFORMSUB=101a NO_INC_BUILD=1 clean
+        $(MAKE) -s --no-print-directory PLATFORM=ixus50_sd400    PLATFORMSUB=101b NO_INC_BUILD=1 clean
         $(MAKE) -s --no-print-directory PLATFORM=ixus55_sd450    PLATFORMSUB=100b NO_INC_BUILD=1 clean
         $(MAKE) -s --no-print-directory PLATFORM=ixus55_sd450    PLATFORMSUB=100c NO_INC_BUILD=1 clean

trunk/include/camera.h

@@ -278 +278 @@
 // SD-Series (IXUS-Series)
 //==========================================================
-#elif defined (CAMERA_ixus55_sd450)
+#elif defined (CAMERA_ixus50_sd400)
     #define CAM_PROPSET                 1
 
@@ -292 +292 @@
     #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
     #undef  CAM_HAS_IS
+        //#define CAM_CONSOLE_LOG_ENABLED     1
+
+//----------------------------------------------------------
+#elif defined (CAMERA_ixus55_sd450)
+    #define CAM_PROPSET                 1
+
+    #define CAM_RAW_ROWPIX              2672   // for 5 MP
+    #define CAM_RAW_ROWS                1968   // for 5 MP
+
+    #undef  CAM_USE_ZOOM_FOR_MF
+    #undef  CAM_HAS_ERASE_BUTTON
+    #undef  CAM_HAS_IRIS_DIAPHRAGM
+    #define CAM_HAS_ND_FILTER           1
+    #undef  CAM_HAS_MANUAL_FOCUS
+    #undef  CAM_HAS_USER_TV_MODES
+    #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
+    #undef  CAM_HAS_IS
 
 //----------------------------------------------------------

trunk/platform/ixus50_sd400/Makefile

@@ -24 +24 @@
         rm -f $(OBJS) libplatform.a
 
-include $(topdir)bottom.inc