Changeset 1201

Timestamp:

06/08/11 07:48:44 (2 years ago)

Author:

msl

Message:

SX130 (currently not available from autobuild server)

• author philmoz
• ​http://chdk.setepontos.com/index.php?topic=650.msg68231#msg68231

+ added version 1.01d

• some cleanup for 1.01c
• changed aspect ratio stuff to X2 instead of 9/4
• fixed some stubs and updated taskHook code
• forced EXMEM and loading CHDK in EXMEM in the makefile.inc

Location:

trunk

Files:

• Makefile (modified) (3 diffs)
• makefile.inc (modified) (1 diff)
• platform/sx130is/platform_camera.h (modified) (1 diff)
• platform/sx130is/sub/101c/boot.c (modified) (1 diff)
• platform/sx130is/sub/101c/lib.c (modified) (1 diff)
• platform/sx130is/sub/101c/makefile.inc (modified) (2 diffs)
• platform/sx130is/sub/101c/stubs_entry_2.S (modified) (5 diffs)
• platform/sx130is/sub/101d (added)
• platform/sx130is/sub/101d/Makefile (added)
• platform/sx130is/sub/101d/boot.c (added)
• platform/sx130is/sub/101d/capt_seq.c (added)
• platform/sx130is/sub/101d/lib.c (added)
• platform/sx130is/sub/101d/makefile.inc (added)
• platform/sx130is/sub/101d/movie_rec.c (added)
• platform/sx130is/sub/101d/stubs_asm.h (added)
• platform/sx130is/sub/101d/stubs_auto.S (added)
• platform/sx130is/sub/101d/stubs_entry.S (added)
• platform/sx130is/sub/101d/stubs_entry_2.S (added)
• platform/sx130is/sub/101d/stubs_min.S (added)

trunk/Makefile

@@ -234 +234 @@
         $(MAKE) -s --no-print-directory PLATFORM=sx110is  PLATFORMSUB=100b NO_INC_BUILD=1 firzipsub
         #$(MAKE) -s --no-print-directory PLATFORM=sx130is  PLATFORMSUB=101c NO_INC_BUILD=1 firzipsub
+        #$(MAKE) -s --no-print-directory PLATFORM=sx130is  PLATFORMSUB=101d NO_INC_BUILD=1 firzipsub
         $(MAKE) -s --no-print-directory PLATFORM=sx200is  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub
         $(MAKE) -s --no-print-directory PLATFORM=ixus90_sd790  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub
@@ -418 +419 @@
         $(MAKE) -s --no-print-directory PLATFORM=sx110is  PLATFORMSUB=100b NO_INC_BUILD=1 firzipsubcomplete
         #$(MAKE) -s --no-print-directory PLATFORM=sx130is  PLATFORMSUB=101c NO_INC_BUILD=1 firzipsubcomplete
+        #$(MAKE) -s --no-print-directory PLATFORM=sx130is  PLATFORMSUB=101d NO_INC_BUILD=1 firzipsubcomplete
         $(MAKE) -s --no-print-directory PLATFORM=sx200is  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsubcomplete
         $(MAKE) -s --no-print-directory PLATFORM=ixus90_sd790  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsubcomplete
@@ -647 +649 @@
         $(MAKE) -s --no-print-directory PLATFORM=sx110is  PLATFORMSUB=100b NO_INC_BUILD=1 clean
         #$(MAKE) -s --no-print-directory PLATFORM=sx130is  PLATFORMSUB=101c NO_INC_BUILD=1 clean
+        #$(MAKE) -s --no-print-directory PLATFORM=sx130is  PLATFORMSUB=101d NO_INC_BUILD=1 clean
         $(MAKE) -s --no-print-directory PLATFORM=sx200is  PLATFORMSUB=100c NO_INC_BUILD=1 clean
         $(MAKE) -s --no-print-directory PLATFORM=ixus90_sd790  PLATFORMSUB=100c NO_INC_BUILD=1 clean

trunk/makefile.inc

@@ -33 +33 @@
 #PLATFORM=sx130is
 #PLATFORMSUB=101c
+
+#PLATFORM=sx130is
+#PLATFORMSUB=101d
 
 #PLATFORM=sx200is

trunk/platform/sx130is/platform_camera.h

@@ -76 +76 @@
  
      #undef ASPECT_XCORRECTION
-     #define ASPECT_XCORRECTION(x)                       ((((x)<<3)+(x))>>2)  //correction x*screen_buffer_width/screen_width = x*720/320 = x*9/4 = (x<<3 + x)>>2
+     #define ASPECT_XCORRECTION(x)                       ((x)<<1)
  
      #undef ASPECT_GRID_XCORRECTION
-     #define ASPECT_GRID_XCORRECTION(x)                  ((((x)<<3)/9))  //grids are designed on a 360x240 basis and screen is 320x240, we need x*320/360=x*8/9
+     #define ASPECT_GRID_XCORRECTION(x)                  (x)  //grids are designed on a 360x240 basis and screen is 320x240, we need x*320/360=x*8/9
      #undef ASPECT_GRID_YCORRECTION
-     #define ASPECT_GRID_YCORRECTION(y)                  ((y))  //y correction for grids  made on a 360x240 As the buffer is 720x240 we have no correction here.
+     #define ASPECT_GRID_YCORRECTION(y)                  (y)  //y correction for grids  made on a 360x240 As the buffer is 720x240 we have no correction here.
  
      #undef ASPECT_VIEWPORT_XCORRECTION 
      #define ASPECT_VIEWPORT_XCORRECTION(x)              ASPECT_GRID_XCORRECTION(x)
      #undef ASPECT_VIEWPORT_YCORRECTION 
-     #define ASPECT_VIEWPORT_YCORRECTION(y)              ((y))
+     #define ASPECT_VIEWPORT_YCORRECTION(y)              (y)
  
      //games mappings

trunk/platform/sx130is/sub/101c/boot.c

@@ -20 +20 @@
 -----------------------------------------------------------------------*/
 
+extern void task_CaptSeq();
+extern void task_InitFileModules();
+extern void task_RotaryEncoder();
+extern void task_MovieRecord();
+extern void task_ExpDrv();
+
 void taskCreateHook(context_t **context) { 
- task_t *tcb=(task_t*)((char*)context-offsetof(task_t, context));
-
-// physw is done directly to avoid wasting stack space
-// if(!_strcmp(tcb->name, "PhySw"))           tcb->entry = (void*)mykbd_task; 
- if(!_strcmp(tcb->name, "CaptSeqTask"))     tcb->entry = (void*)capt_seq_task; 
- if(!_strcmp(tcb->name, "InitFileModules")) tcb->entry = (void*)init_file_modules_task;
- if(!_strcmp(tcb->name, "ExpDrvTask"))      tcb->entry = (void*)exp_drv_task;
- if(!_strcmp(tcb->name, "RotaryEncoder"))   tcb->entry = (void*)JogDial_task_my;
- if(!_strcmp(tcb->name, "MovieRecord"))     tcb->entry = (void*)movie_record_task;
+        task_t *tcb=(task_t*)((char*)context-offsetof(task_t, context));
+
+        // Replace firmware task addresses with ours
+        if(tcb->entry == (void*)task_CaptSeq)                   tcb->entry = (void*)capt_seq_task; 
+        if(tcb->entry == (void*)task_InitFileModules)   tcb->entry = (void*)init_file_modules_task;
+        if(tcb->entry == (void*)task_RotaryEncoder)             tcb->entry = (void*)JogDial_task_my;
+        if(tcb->entry == (void*)task_MovieRecord)               tcb->entry = (void*)movie_record_task;
+        if(tcb->entry == (void*)task_ExpDrv)                    tcb->entry = (void*)exp_drv_task;
 }
 

trunk/platform/sx130is/sub/101c/lib.c

@@ -222 +222 @@
 long vid_get_bitmap_screen_width()
 {
-    return 320;    
+    return 360;    
 }
 

trunk/platform/sx130is/sub/101c/makefile.inc

@@ -4 +4 @@
 
 PLATFORMOS=dryos
+
+# Force EXMEM on for sx130is - not enough heap to work in low memory
+override OPT_EXMEM_MALLOC=1
+override OPT_CHDK_IN_EXMEM=1
 
 # start of firmware
@@ -25 +29 @@
 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=0x166210
-#MEMISOSTART=0xF00000
+#MEMISOSTART=0x166210
+MEMISOSTART=0xF00000
 endif
 

trunk/platform/sx130is/sub/101c/stubs_entry_2.S

@@ -56 +56 @@
 NHSTUB(PostLogicalEventToUI, 0xff891ddc)
 NHSTUB(RenameFile_Fut, 0xFF8365E0)                         // orig:0xff8367ac
-NHSTUB(Restart, 0xff83be48)
+NHSTUB(Restart, 0xff83be44)
 NHSTUB(SetAutoShutdownTime, 0xff894060)
 NHSTUB(SetCurrentCaptureModeType, 0xff89abfc)
@@ -86 +86 @@
 // Missing from stubs_entry.s
 
-NHSTUB(DoAFLock, 0xFF8384D8)                                
-NHSTUB(LEDDrive, 0xFF85F1BC)                                // inner function like in sx120 and d10, sikahr:xFF96A8B0
+NHSTUB(DoAFLock, 0xff878eec)                                
+NHSTUB(LEDDrive, 0xff85f0f4)                                // inner function like in sx120 and d10, sikahr:xFF96A8B0
 NHSTUB(ScreenLock, 0xFF8A8A1C)                              // 0xFF8A8DB4 like in sx120 and d10?
 NHSTUB(ScreenUnlock, 0xFF8A8A80)                            // 0xFF8A788C like in sx120 and d10?
@@ -93 +93 @@
 //NHSTUB(ScreenUnlock, 0xFF8A788C)                          // does not draw Canon interface
 NHSTUB(SetScriptMode, 0xFF893D88)                          
-NHSTUB(UnlockAF, 0xFF838510)                  
+NHSTUB(UnlockAF, 0xff878efc)                  
 NHSTUB(WriteSDCard, 0xFF950268)     
 NHSTUB(apex2us, 0xFFA0E804)      
@@ -112 +112 @@
 NHSTUB(kbd_pwr_off, NULL_STUB)
 
-
 NHSTUB(rand, 0xFFA0D940)                    
 NHSTUB(srand, 0xFFA0D934)
-
-
 
 NHSTUB(DebugAssert, 0xFF81EB78)                                                         // Usefull in tasks
@@ -122 +119 @@
 // allocate from given EXMEM pool 
 NHSTUB(exmem_alloc, 0xFF888334)
+
+# Addresses for firmware task handlers (used in taskHook)
+DEF(task_CaptSeq, 0xff87b564)
+DEF(task_ExpDrv, 0xff8bfa94)
+DEF(task_InitFileModules, 0xff897938)
+DEF(task_MovieRecord, 0xff969bc8)
+DEF(task_RotaryEncoder, 0xff85fd80)