Changeset 755

Timestamp:

08/16/11 18:01:33 (22 months ago)

Author:

CHDKLover

Message:

Neue Kamera hinzugefügt:

• SX20 100f, danke f_m_b (​http://chdk.setepontos.com/index.php?topic=4348.msg65447#msg65447)

Betrifft SX20 102b:
+ EXMEM hinzugefügt, danke f_m_b (​http://chdk.setepontos.com/index.php?topic=4348.msg64962#msg64962)

Location:

trunk

Files:

• Makefile (modified) (3 diffs)
• platform/sx20/platform_camera.h (modified) (1 diff)
• platform/sx20/sub/100f (added)
• platform/sx20/sub/100f/Makefile (added)
• platform/sx20/sub/100f/boot.c (added)
• platform/sx20/sub/100f/capt_seq.c (added)
• platform/sx20/sub/100f/lib.c (added)
• platform/sx20/sub/100f/makefile.inc (added)
• platform/sx20/sub/100f/movie_rec.c (added)
• platform/sx20/sub/100f/stubs_asm.h (added)
• platform/sx20/sub/100f/stubs_entry.S (added)
• platform/sx20/sub/100f/stubs_entry_2.S (added)
• platform/sx20/sub/100f/stubs_min.S (added)
• platform/sx20/sub/102b/boot.c (modified) (1 diff)
• platform/sx20/sub/102b/makefile.inc (modified) (1 diff)
• platform/sx20/sub/102d/makefile.inc (modified) (1 diff)

trunk/Makefile

@@ -284 +284 @@
         $(MAKE) -s --no-print-directory PLATFORM=s90  PLATFORMSUB=101a NO_INC_BUILD=1 firzipsub
         $(MAKE) -s --no-print-directory PLATFORM=s90  PLATFORMSUB=101c NO_INC_BUILD=1 firzipsub
+        $(MAKE) -s --no-print-directory PLATFORM=sx20 PLATFORMSUB=100f NO_INC_BUILD=1 firzipsub
         $(MAKE) -s --no-print-directory PLATFORM=sx20 PLATFORMSUB=102b NO_INC_BUILD=1 firzipsub
         $(MAKE) -s --no-print-directory PLATFORM=sx20 PLATFORMSUB=102d NO_INC_BUILD=1 firzipsub
@@ -509 +510 @@
         $(MAKE) -s --no-print-directory PLATFORM=s90  PLATFORMSUB=101a NO_INC_BUILD=1 firzipsubcomplete
         $(MAKE) -s --no-print-directory PLATFORM=s90  PLATFORMSUB=101c NO_INC_BUILD=1 firzipsubcomplete
+        $(MAKE) -s --no-print-directory PLATFORM=sx20 PLATFORMSUB=100f NO_INC_BUILD=1 firzipsubcomplete
         $(MAKE) -s --no-print-directory PLATFORM=sx20 PLATFORMSUB=102b NO_INC_BUILD=1 firzipsubcomplete
         $(MAKE) -s --no-print-directory PLATFORM=sx20 PLATFORMSUB=102d NO_INC_BUILD=1 firzipsubcomplete
@@ -805 +807 @@
         $(MAKE) -s --no-print-directory PLATFORM=s90  PLATFORMSUB=101a NO_INC_BUILD=1 clean
         $(MAKE) -s --no-print-directory PLATFORM=s90  PLATFORMSUB=101c NO_INC_BUILD=1 clean
+        $(MAKE) -s --no-print-directory PLATFORM=sx20 PLATFORMSUB=100f NO_INC_BUILD=1 clean
         $(MAKE) -s --no-print-directory PLATFORM=sx20 PLATFORMSUB=102b NO_INC_BUILD=1 clean
         $(MAKE) -s --no-print-directory PLATFORM=sx20 PLATFORMSUB=102d NO_INC_BUILD=1 clean

trunk/platform/sx20/platform_camera.h

@@ -102 +102 @@
 
     #define CAM_ZEBRA_ASPECT_ADJUST         1
+    
+#ifndef OPT_EXMEM_MALLOC
     #define CAM_ZEBRA_NOBUF                 1
+#endif
 
     #undef  CAM_BITMAP_PALETTE

trunk/platform/sx20/sub/102b/boot.c

@@ -174 +174 @@
                  "MOV     R0, #0x53000\n"
                  "STR     R0, [SP,#4]\n"
-//               "LDR     R0, =0x13DD20\n" // -
+#if defined(OPT_CHDK_IN_EXMEM)
+                 "LDR     R0, =0x13DD20\n" // use original heap offset since CHDK is loaded in high memory
+#else
                  "LDR     R0, =new_sa\n"   // +
                  "LDR     R0, [R0]\n"      // +
+#endif
                  "LDR     R2, =0x2F9C00\n"
                  "LDR     R1, =0x2F24A8\n"

trunk/platform/sx20/sub/102b/makefile.inc

@@ -4 +4 @@
 PLATFORMOS=dryos
 
+ROMBASEADDR=0xFF810000
+MAXRAMADDR=0x03FFFFFF
 MEMBASEADDR=0x1900
 RESTARTSTART=0x50000
-MEMISOSTART=0x13DD6C
-ROMBASEADDR=0xFF810000
+
+# Set up size variables for EXMEM
+EXMEM_HEAP_SKIP=0x2F7600        #(0x44000000-0x43D08A00) from sub_FF88A064 = size of video buffers in EXMEM area
+EXMEM_BUFFER_SIZE=0x200000      # Amount of EXMEM memory to allocate for CHDK = 2MB
+ifdef OPT_CHDK_IN_EXMEM
+  MEMISOSTART=0x3B089E0         # MAXRAMADDR+1 - EXMEM_HEAP_SKIP - EXMEM_BUFFER_SIZE - 32 (exmem allocates 64 bytes extra, 32 before and 32 after block allocated)
+else
+  MEMISOSTART=0x13DD6C
+endif
 
 PLFLAGS=-DMEMBASEADDR=$(MEMBASEADDR) -DMEMISOSTART=$(MEMISOSTART) -DMEMISOSIZE=$(MEMISOSIZE)

trunk/platform/sx20/sub/102d/makefile.inc

@@ -6 +6 @@
 ROMBASEADDR=0xFF810000
 MAXRAMADDR=0x03FFFFFF
-
 MEMBASEADDR=0x1900
 RESTARTSTART=0x50000