Changeset 1205

Timestamp:

06/18/11 03:27:25 (2 years ago)

Author:

reyalp

Message:

a490 100f beta support, thanks to mrowl in ​http://chdk.setepontos.com/index.php?topic=650.msg68942#msg68942

Location:

trunk

Files:

• Makefile (modified) (5 diffs)
• core/kbd.c (modified) (1 diff)
• loader/a490 (added)
• loader/a490/Makefile (added)
• loader/a490/blobs.S (added)
• loader/a490/entry.S (added)
• loader/a490/main.c (added)
• loader/a490/resetcode (added)
• loader/a490/resetcode/Makefile (added)
• loader/a490/resetcode/entry.S (added)
• loader/a490/resetcode/main.c (added)
• makefile.inc (modified) (3 diffs)
• platform/a490 (added)
• platform/a490/Makefile (added)
• platform/a490/kbd.c (added)
• platform/a490/lib.c (added)
• platform/a490/main.c (added)
• platform/a490/notes.txt (added)
• platform/a490/platform_camera.h (added)
• platform/a490/shooting.c (added)
• platform/a490/sub (added)
• platform/a490/sub/100f (added)
• platform/a490/sub/100f/Makefile (added)
• platform/a490/sub/100f/boot.c (added)
• platform/a490/sub/100f/capt_seq.c (added)
• platform/a490/sub/100f/lib.c (added)
• platform/a490/sub/100f/makefile.inc (added)
• platform/a490/sub/100f/movie_rec.c (added)
• platform/a490/sub/100f/stubs_asm.h (added)
• platform/a490/sub/100f/stubs_auto.S (added)
• platform/a490/sub/100f/stubs_entry.S (added)
• platform/a490/sub/100f/stubs_entry_2.S (added)
• platform/a490/sub/100f/stubs_min.S (added)
• platform/a490/sub/Makefile (added)
• platform/a490/wrappers.c (added)

trunk/Makefile

@@ -248 +248 @@
         $(MAKE) -s --no-print-directory PLATFORM=ixus120_sd940  PLATFORMSUB=103c NO_INC_BUILD=1 firzipsub
         $(MAKE) -s --no-print-directory PLATFORM=a480  PLATFORMSUB=100b NO_INC_BUILD=1 firzipsub
+        $(MAKE) -s --no-print-directory PLATFORM=a490  PLATFORMSUB=100f NO_INC_BUILD=1 firzipsub
         $(MAKE) -s --no-print-directory PLATFORM=a495  PLATFORMSUB=100d NO_INC_BUILD=1 firzipsub
         $(MAKE) -s --no-print-directory PLATFORM=a495  PLATFORMSUB=100e NO_INC_BUILD=1 firzipsub
@@ -320 +321 @@
         mv $(topdir)bin/$(VER)-s95-100i-$(BUILD_NUMBER).zip $(topdir)bin/s95-100i-$(BUILD_NUMBER)_BETA.zip
         mv $(topdir)bin/$(VER)-ixus750_sd550-100h-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus750_sd550-100h-$(BUILD_NUMBER)_BETA.zip
+        mv $(topdir)bin/$(VER)-a490-100f-$(BUILD_NUMBER).zip $(topdir)bin/a490-100f-$(BUILD_NUMBER)_BETA.zip
         mv $(topdir)bin/$(VER)-a495-100d-$(BUILD_NUMBER).zip $(topdir)bin/a495-100d-$(BUILD_NUMBER)_BETA.zip
         mv $(topdir)bin/$(VER)-a495-100e-$(BUILD_NUMBER).zip $(topdir)bin/a495-100e-$(BUILD_NUMBER)_BETA.zip
@@ -433 +435 @@
         $(MAKE) -s --no-print-directory PLATFORM=ixus120_sd940  PLATFORMSUB=103c NO_INC_BUILD=1 firzipsubcomplete
         $(MAKE) -s --no-print-directory PLATFORM=a480  PLATFORMSUB=100b NO_INC_BUILD=1 firzipsubcomplete
+        $(MAKE) -s --no-print-directory PLATFORM=a490  PLATFORMSUB=100f NO_INC_BUILD=1 firzipsubcomplete
         $(MAKE) -s --no-print-directory PLATFORM=a495  PLATFORMSUB=100d NO_INC_BUILD=1 firzipsubcomplete
         $(MAKE) -s --no-print-directory PLATFORM=a495  PLATFORMSUB=100e NO_INC_BUILD=1 firzipsubcomplete
@@ -551 +554 @@
         mv $(topdir)bin/ixus750_sd550-100h-$(BUILD_NUMBER).zip $(topdir)bin/ixus750_sd550-100h-$(BUILD_NUMBER)_BETA.zip
         mv $(topdir)bin/ixus750_sd550-100h-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus750_sd550-100h-$(BUILD_NUMBER)-full_BETA.zip
+        mv $(topdir)bin/a490-100f-$(BUILD_NUMBER).zip $(topdir)bin/a490-100f-$(BUILD_NUMBER)_BETA.zip
         mv $(topdir)bin/a495-100d-$(BUILD_NUMBER).zip $(topdir)bin/a495-100d-$(BUILD_NUMBER)_BETA.zip
         mv $(topdir)bin/a495-100e-$(BUILD_NUMBER).zip $(topdir)bin/a495-100e-$(BUILD_NUMBER)_BETA.zip
@@ -663 +667 @@
         $(MAKE) -s --no-print-directory PLATFORM=ixus120_sd940  PLATFORMSUB=103c NO_INC_BUILD=1 clean
         $(MAKE) -s --no-print-directory PLATFORM=a480  PLATFORMSUB=100b NO_INC_BUILD=1 clean
+        $(MAKE) -s --no-print-directory PLATFORM=a490  PLATFORMSUB=100f NO_INC_BUILD=1 clean
         $(MAKE) -s --no-print-directory PLATFORM=a495  PLATFORMSUB=100d NO_INC_BUILD=1 clean
         $(MAKE) -s --no-print-directory PLATFORM=a495  PLATFORMSUB=100e NO_INC_BUILD=1 clean

trunk/core/kbd.c

@@ -41 +41 @@
 #endif
 
-#if defined(CAMERA_a450) || defined(CAMERA_ixus50_sd400) || defined(CAMERA_ixusizoom_sd30) || defined(CAMERA_ixus40_sd300) || defined(CAMERA_ixus55_sd450) || defined(CAMERA_ixus60_sd600) || defined(CAMERA_ixus65_sd630) || defined(CAMERA_ixus70_sd1000) || defined(CAMERA_ixus700_sd500) || defined(CAMERA_ixus750_sd550) || defined(CAMERA_ixus850_sd800) || defined(CAMERA_ixus900_sd900) || defined(CAMERA_ixus75_sd750) || defined(CAMERA_a470) || defined(CAMERA_ixus90_sd790) || defined(CAMERA_ixus100_sd780) || defined(CAMERA_ixus120_sd940) || defined(CAMERA_a480) || defined(CAMERA_a495) || defined(CAMERA_d10) || defined(CAMERA_ixus85_sd770) || defined(CAMERA_ixus95_sd1200) || defined(CAMERA_a580) || defined(CAMERA_ixus300_sd4000)
+#if defined(CAMERA_a450) || defined(CAMERA_ixus50_sd400) || defined(CAMERA_ixusizoom_sd30) || defined(CAMERA_ixus40_sd300) || defined(CAMERA_ixus55_sd450) || defined(CAMERA_ixus60_sd600) || defined(CAMERA_ixus65_sd630) || defined(CAMERA_ixus70_sd1000) || defined(CAMERA_ixus700_sd500) || defined(CAMERA_ixus750_sd550) || defined(CAMERA_ixus850_sd800) || defined(CAMERA_ixus900_sd900) || defined(CAMERA_ixus75_sd750) || defined(CAMERA_a470) || defined(CAMERA_ixus90_sd790) || defined(CAMERA_ixus100_sd780) || defined(CAMERA_ixus120_sd940) || defined(CAMERA_a480) || defined(CAMERA_a495) || defined(CAMERA_a490) || defined(CAMERA_d10) || defined(CAMERA_ixus85_sd770) || defined(CAMERA_ixus95_sd1200) || defined(CAMERA_a580) || defined(CAMERA_ixus300_sd4000)
 #define ZSTEP_TABLE_SIZE 7
 static int nTxtbl[]={0,1,2,3,4,5,6};    // remote zoom steps (we need a distinct number of steps, even if the camera zooms smoothly)

trunk/makefile.inc

@@ -239 +239 @@
 #PLATFORMSUB=101b
 
+#PLATFORM=a490
+#PLATFORMSUB=100f
+
 #PLATFORM=a495
 #PLATFORMSUB=100d
@@ -281 +284 @@
 #PLATFORMSUB=100d
 
-#PLATFORM=g11 
-#PLATFORMSUB=100f
-
-#PLATFORM=g11 
+#PLATFORM=g11
+#PLATFORMSUB=100f
+
+#PLATFORM=g11
 #PLATFORMSUB=100j
 
-#PLATFORM=g11 
+#PLATFORM=g11
 #PLATFORMSUB=100l
 
@@ -489 +492 @@
 endif
 
-ifdef OPT_SCRIPTING 
+ifdef OPT_SCRIPTING
 CFLAGS+=-DOPT_SCRIPTING
 endif