Changeset 1598
- Timestamp:
- 01/22/12 02:33:37 (16 months ago)
- Location:
- trunk
- Files:
-
- 8 edited
-
. (modified) (1 prop)
-
platform/sx150is/platform_camera.h (modified) (3 diffs)
-
platform/sx150is/shooting.c (modified) (1 diff)
-
platform/sx150is/sub/100a/boot.c (modified) (2 diffs)
-
platform/sx150is/sub/100a/capt_seq.c (modified) (3 diffs)
-
platform/sx150is/sub/100a/stubs_auto.S (modified) (4 diffs)
-
platform/sx150is/sub/100a/stubs_entry.S (modified) (1 diff)
-
platform/sx150is/sub/100a/stubs_min.S (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/release-1_0 merged: 1597
- Property svn:mergeinfo changed
-
trunk/platform/sx150is/platform_camera.h
r1580 r1598 21 21 // don't override them again in here. 22 22 23 #define CAM_PROPSET 4 24 #define CAM_DRYOS 1 25 #define CAM_DRYOS_2_3_R39 1 26 #define CAM_DRYOS_2_3_R47 1 // Defined for cameras with DryOS version R47 or higher 23 #define CAM_PROPSET 4 24 #define CAM_DRYOS 1 25 #define CAM_DRYOS_2_3_R39 1 26 #define CAM_DRYOS_2_3_R47 1 // Defined for cameras with DryOS version R47 or higher 27 28 #undef CAM_CAN_SD_OVER_NOT_IN_MF 29 #undef CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO 30 //#define CAM_HAS_VIDEO_BUTTON 0 31 #define CAM_VIDEO_QUALITY_ONLY 1 32 #define CAM_BRACKETING 1 33 #undef CAM_VIDEO_CONTROL 34 #define CAM_MULTIPART 1 35 #define CAM_HAS_JOGDIAL 1 36 #undef CAM_USE_ZOOM_FOR_MF 37 #undef CAM_UNCACHED_BIT 38 #define CAM_UNCACHED_BIT 0x40000000 39 40 #define CAM_DNG_LENS_INFO { 50,10, 600,10, 34,10, 56,10 } // See comments in camera.h 41 // pattern 42 #define cam_CFAPattern 0x01000201 // Green Blue Red Green 43 // color 44 #define CAM_COLORMATRIX1 \ 45 1301431, 1000000, -469837, 1000000, -102652, 1000000, \ 46 -200195, 1000000, 961551, 1000000, 238645, 1000000, \ 47 -16441, 1000000, 142319, 1000000, 375979, 1000000 48 #define cam_CalibrationIlluminant1 1 // Daylight 49 50 // Sensor size, DNG image size & cropping 51 #define CAM_RAW_ROWPIX 4464 52 #define CAM_RAW_ROWS 3276 53 #define CAM_JPEG_WIDTH 4368 54 #define CAM_JPEG_HEIGHT 3254 55 #define CAM_ACTIVE_AREA_X1 24 56 #define CAM_ACTIVE_AREA_Y1 10 57 #define CAM_ACTIVE_AREA_X2 (CAM_RAW_ROWPIX-72) 58 #define CAM_ACTIVE_AREA_Y2 (CAM_RAW_ROWS-12) 27 59 28 #define CAM_RAW_ROWPIX 4464 29 #define CAM_RAW_ROWS 3276 60 // camera name 61 #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData 62 #undef CAM_SENSOR_BITS_PER_PIXEL 63 #define CAM_SENSOR_BITS_PER_PIXEL 12 30 64 31 #undef CAM_CAN_SD_OVER_NOT_IN_MF 32 #undef CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO 33 //#define CAM_HAS_VIDEO_BUTTON 0 34 #define CAM_VIDEO_QUALITY_ONLY 1 35 #define CAM_BRACKETING 1 36 #undef CAM_VIDEO_CONTROL 37 #define CAM_MULTIPART 1 38 #define CAM_HAS_JOGDIAL 1 39 #undef CAM_USE_ZOOM_FOR_MF 40 #undef CAM_UNCACHED_BIT 41 #define CAM_UNCACHED_BIT 0x40000000 42 43 #define CAM_DNG_LENS_INFO { 50,10, 600,10, 34,10, 56,10 } // See comments in camera.h 44 // pattern 45 #define cam_CFAPattern 0x02010100 // Red Green Green Blue 46 // color 47 #define CAM_COLORMATRIX1 \ 48 827547, 1000000, -290458, 1000000, -126086, 1000000, \ 49 -12829, 1000000, 530507, 1000000, 50537, 1000000, \ 50 5181, 1000000, 48183, 1000000, 245014, 1000000 51 #define cam_CalibrationIlluminant1 1 // Daylight 52 53 // cropping 54 #define CAM_JPEG_WIDTH 4000 55 #define CAM_JPEG_HEIGHT 3000 56 #define CAM_ACTIVE_AREA_X1 36 57 #define CAM_ACTIVE_AREA_Y1 20 58 #define CAM_ACTIVE_AREA_X2 4036 59 #define CAM_ACTIVE_AREA_Y2 3020 60 // camera name 61 #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData 62 #undef CAM_SENSOR_BITS_PER_PIXEL 63 #define CAM_SENSOR_BITS_PER_PIXEL 12 64 65 #define CAM_EXT_TV_RANGE 1 66 #define CAM_QUALITY_OVERRIDE 1 65 #define CAM_EXT_TV_RANGE 1 66 #define CAM_QUALITY_OVERRIDE 1 67 67 68 68 // copied from the SX200 which has the same video buffer size … … 72 72 #define CAM_BITMAP_WIDTH 720 // Actual width of bitmap screen in bytes 73 73 74 75 74 #define CAM_ZEBRA_ASPECT_ADJUST 1 75 #define CAM_ZEBRA_NOBUF 1 76 76 77 78 77 #undef CAM_BITMAP_PALETTE 78 #define CAM_BITMAP_PALETTE 7 79 79 80 81 82 #define CAM_CHDK_PTP 1 83 80 //#undef EDGE_HMARGIN 81 //#define EDGE_HMARGIN 28 82 83 #define CAM_DATE_FOLDER_NAMING 1 84 84 85 86 87 88 89 90 85 // Menu width like in g11 and s90 86 #undef CAM_MENU_BORDERWIDTH 87 #define CAM_MENU_BORDERWIDTH 10 88 // CR2 accesible through USB 89 #undef DEFAULT_RAW_EXT 90 #define DEFAULT_RAW_EXT 2 91 91 92 92 #define CAM_STARTUP_CRASH_FILE_OPEN_FIX 1 // enable fix for camera crash at startup when opening the conf / font files … … 94 94 95 95 #define CAM_DRIVE_MODE_FROM_TIMER_MODE // use PROPCASE_TIMER_MODE to check for multiple shot custom timer. 96 97 96 // Used to enabled bracketing in custom timer, required on many recent cameras 97 // see http://chdk.setepontos.com/index.php/topic,3994.405.html 98 98 99 99 #define CAM_DETECT_SCREEN_ERASE 1 // Turn on guard pixels to detect screen erase and redraw CHDK buttons and menus -
trunk/platform/sx150is/shooting.c
r1415 r1598 155 155 156 156 #if defined(CAM_DATE_FOLDER_NAMING) 157 // G12uses date to name directory157 // SX150IS uses date to name directory 158 158 void get_target_dir_name(char *out) 159 159 { 160 160 extern void _GetImageFolder(char*,int,int,int); 161 out[0] = 'A'; 162 _GetImageFolder(out+1,get_file_next_counter(),0x400,time(NULL)); 161 _GetImageFolder(out,get_file_next_counter(),0x400,time(NULL)); 163 162 } 164 163 #else -
trunk/platform/sx150is/sub/100a/boot.c
r1415 r1598 142 142 void __attribute__((naked,noinline)) sub_FF810358_my() { 143 143 144 // SX150 values found via CHDK Memory Browser 145 *(int*)0x1930 = (int)taskCreateHook; 146 *(int*)0x1934 = (int)taskCreateHook; 147 144 // SX150 145 *(int*)0x1938 = (int)taskCreateHook; 146 *(int*)0x193C = (int)taskCreateHook; 148 147 149 148 // SX150 @FF864BEC … … 441 440 " BLNE sub_FF899828 \n" 442 441 " BL sub_FF8956C8 \n" 443 //" BL sub_FF8956C8_my \n" // patched -------------> 442 444 443 " BL core_spytask_can_start \n" // added -------------> 445 444 446 445 " B sub_FF89F658 \n" // Return to firmware -----------> 447 );448 }449 450 //** sub_FF8956C8_my @ 0xFF8956C8451 void __attribute__((naked,noinline)) sub_FF8956C8_my() {452 453 454 asm volatile (455 456 457 " STMFD SP!, {R4,LR} \n"458 " MOV R0, #3 \n"459 //" BL sub_FF876630 \n"460 " BL sub_FF876630_my \n" // patched ------------->461 //" BL sub_FF968D58 \n"462 463 " B sub_FF8956D8 \n" // Return to firmware ----------->464 );465 }466 467 //** sub_FF876630_my @ 0xFF876630468 void __attribute__((naked,noinline)) sub_FF876630_my() {469 470 asm volatile (471 472 " STMFD SP!, {R4-R10,LR} \n"473 " MOV R6, R0 \n"474 " BL sub_FF8765E0 \n"475 " LDR R1, =0x38230 \n"476 " MOV R5, R0 \n"477 " ADD R4, R1, R0, LSL #7 \n"478 " LDR R0, [R4, #0x6C] \n"479 " TST R0, #4 \n"480 " LDRNE R1, =0x9CD \n"481 " LDRNE R0, =0xFF876024 \n" // "Mounter.c"482 " BLNE sub_FF81EDBC \n"483 " MOV R1, R6 \n"484 " MOV R0, R5 \n"485 " BL sub_FF875D98 \n"486 " LDR R0, [R4, #0x38] \n"487 " BL sub_FF876C74 \n"488 " CMP R0, #0 \n"489 " STREQ R0, [R4, #0x6C] \n"490 " MOV R0, R5 \n"491 " BL sub_FF875E28 \n"492 " MOV R0, R5 \n"493 //" BL sub_FF876184 \n"494 " BL sub_FF876184_my \n" // patched ------------->495 496 " B sub_FF876688 \n" // Return to firmware ----------->497 498 );499 }500 501 //** sub_FF876184_my @ 0xFF876184502 503 void __attribute__((naked,noinline)) sub_FF876184_my() {504 asm volatile (505 506 " STMFD SP!, {R4-R6,LR} \n"507 " MOV R5, R0 \n"508 " LDR R0, =0x38230 \n"509 " ADD R4, R0, R5, LSL #7 \n"510 " LDR R0, [R4, #0x6C] \n"511 " TST R0, #2 \n"512 " MOVNE R0, #1 \n"513 " LDMNEFD SP!, {R4-R6,PC} \n"514 " LDR R0, [R4, #0x38] \n"515 " MOV R1, R5 \n"516 //" BL sub_FF875EAC \n"517 " BL sub_FF875EAC_my \n"518 519 " B sub_FF8761B0 \n" // Return to firmware ----------->520 );521 }522 523 //** sub_FF875EAC_my @ 0xFF875EAC524 void __attribute__((naked,noinline)) sub_FF875EAC_my() {525 526 asm volatile (527 " STMFD SP!, {R4-R10,LR} \n"528 " MOV R9, R0 \n"529 " LDR R0, =0x38230 \n"530 " MOV R6, #0 \n"531 " ADD R5, R0, R1, LSL #7 \n"532 " LDR R0, [R5, #0x3C] \n"533 " MOV R7, R6 \n"534 " CMP R0, #7 \n"535 " MOV R8, R6 \n"536 " ADDCC PC, PC, R0, LSL #2 \n"537 " B sub_FF876004 \n"538 " B loc_FF875F0C \n"539 " B loc_FF875EF4 \n"540 " B loc_FF875EF4 \n"541 " B loc_FF875EF4 \n"542 " B loc_FF875EF4 \n"543 " B sub_FF875FFC \n"544 " B loc_FF875EF4 \n"545 "loc_FF875EF4:\n"546 // jumptable FF875ED0 entries 1-4,6547 " MOV R2, #0 \n"548 " MOV R1, #0x200 \n"549 " MOV R0, #2 \n"550 " BL sub_FF88F4E4 \n"551 " MOVS R4, R0 \n"552 " BNE loc_FF875F14 \n"553 "loc_FF875F0C:\n"554 // jumptable FF875ED0 entry 0555 " MOV R0, #0 \n"556 " LDMFD SP!, {R4-R10,PC} \n"557 "loc_FF875F14:\n"558 " LDR R12, [R5, #0x50] \n"559 " MOV R3, R4 \n"560 " MOV R2, #1 \n"561 " MOV R1, #0 \n"562 " MOV R0, R9 \n"563 " BLX R12 \n"564 " CMP R0, #1 \n"565 " BNE loc_FF875F40 \n"566 " MOV R0, #2 \n"567 " BL sub_FF88F628 \n"568 " B loc_FF875F0C \n"569 "loc_FF875F40:\n"570 " LDR R1, [R5, #0x64] \n"571 " MOV R0, R9 \n"572 " BLX R1 \n"573 574 // The following may not be needed for the SX150 ??575 576 ////------------------ begin added code ---------------577 // "MOV R1, R4\n" // pointer to MBR in R1578 // "BL mbr_read_dryos\n" // total sectors count in R0 before and after call579 //580 // // Start of DataGhost's FAT32 autodetection code581 // // Policy: If there is a partition which has type W95 FAT32, use the first one of those for image storage582 // // According to the code below, we can use R1, R2, R3 and R12.583 // // LR wasn't really used anywhere but for storing a part of the partition signature. This is the only thing584 // // that won't work with an offset, but since we can load from LR+offset into LR, we can use this to do that :)585 // "MOV R12, R4\n" // Copy the MBR start address so we have something to work with586 // "MOV LR, R4\n" // Save old offset for MBR signature587 // "MOV R1, #1\n" // Note the current partition number588 // "B dg_sd_fat32_enter\n" // We actually need to check the first partition as well, no increments yet!589 // "dg_sd_fat32:\n"590 // "CMP R1, #4\n" // Did we already see the 4th partition?591 // "BEQ dg_sd_fat32_end\n" // Yes, break. We didn't find anything, so don't change anything.592 // "ADD R12, R12, #0x10\n" // Second partition593 // "ADD R1, R1, #1\n" // Second partition for the loop594 // "dg_sd_fat32_enter:\n"595 // "LDRB R2, [R12, #0x1BE]\n" // Partition status596 // "LDRB R3, [R12, #0x1C2]\n" // Partition type (FAT32 = 0xB)597 // "CMP R3, #0xB\n" // Is this a FAT32 partition?598 // "CMPNE R3, #0xC\n" // Not 0xB, is it 0xC (FAT32 LBA) then?599 // "BNE dg_sd_fat32\n" // No, it isn't.600 // "CMP R2, #0x00\n" // It is, check the validity of the partition type601 // "CMPNE R2, #0x80\n"602 // "BNE dg_sd_fat32\n" // Invalid, go to next partition603 // // This partition is valid, it's the first one, bingo!604 // "MOV R4, R12\n" // Move the new MBR offset for the partition detection.605 //606 // "dg_sd_fat32_end:\n"607 // // End of DataGhost's FAT32 autodetection code608 ////------------------ end added code ---------------609 610 " MOV R1, R0 \n"611 " LDRB R0, [R4, #0x1C9] \n"612 " LDRB R2, [R4, #0x1C8] \n"613 " LDRB R12, [R4, #0x1CC] \n"614 " MOV R0, R0, LSL #0x18 \n"615 " ORR R0, R0, R2, LSL #0x10 \n"616 " LDRB R2, [R4, #0x1C7] \n"617 " LDRB R3, [R4, #0x1BE] \n"618 " ORR R0, R0, R2, LSL #8 \n"619 " LDRB R2, [R4, #0x1C6] \n"620 " CMP R3, #0 \n"621 " CMPNE R3, #0x80 \n"622 " ORR R0, R0, R2 \n"623 " LDRB R2, [R4, #0x1CD] \n"624 " MOV R2, R2, LSL #0x18 \n"625 " ORR R2, R2, R12, LSL #0x10 \n"626 " LDRB R12, [R4, #0x1CB] \n"627 " ORR R2, R2, R12, LSL #8 \n"628 " LDRB R12, [R4, #0x1CA] \n"629 " ORR R2, R2, R12 \n"630 " LDRB R12, [R4, #0x1FE] \n"631 " LDRB R4, [R4, #0x1FF] \n"632 //" LDRB R12, [LR,#0x1FE]\n" // New! First MBR signature byte (0x55)633 //" LDRB LR, [LR,#0x1FF]\n" // Last MBR signature byte (0xAA)634 635 " B sub_FF875FA4 \n" // Return to firmware ----------->636 637 446 ); 638 447 } -
trunk/platform/sx150is/sub/100a/capt_seq.c
r1415 r1598 118 118 //" BL sub_FF98C47C \n" 119 119 " BL sub_FF98C47C_my \n" // Patched ------------> 120 121 " BL capt_seq_hook_raw_here \n" // Added ----------> 120 122 121 123 " MOV R7, R0 \n" … … 394 396 " STR R0, [R4, #0xD8] \n" 395 397 " MOV R0, R4 \n" 398 396 399 //" BL sub_FFAE3934 \n" 397 400 " BL sub_FFAE3934_my \n" // Patched ------------> 398 " BL capt_seq_hook_raw_here \n" // Added ---------->399 401 400 402 "loc_FF98C5C8:\n" … … 427 429 " BL sub_FF884D50 \n" 428 430 " BL sub_FF98C3AC \n" 429 " CMP R7, #0xA \n"430 431 431 432 " BL wait_until_remote_button_is_released\n" // Added (not tested) --------> 432 433 " BL capt_seq_hook_set_nr_my \n" // Added -------------> 433 434 434 " B sub_FFAE398 8\n" // Return to firmware --------->435 " B sub_FFAE3984 \n" // Return to firmware ---------> 435 436 436 437 ); -
trunk/platform/sx150is/sub/100a/stubs_auto.S
r1415 r1598 56 56 STUB(FF865798) 57 57 STUB(FF8657B4) 58 STUB(FF875D98)59 STUB(FF875E28)60 STUB(FF875EAC)61 STUB(FF875FA4)62 STUB(FF875FFC)63 STUB(FF876004)64 STUB(FF876184)65 STUB(FF8761B0)66 STUB(FF8765E0)67 STUB(FF876630)68 STUB(FF876688)69 STUB(FF876C74)70 58 STUB(FF87FA30) 71 59 STUB(FF880050) … … 99 87 STUB(FF88C868) 100 88 STUB(FF88C89C) 101 STUB(FF88F4E4)102 STUB(FF88F628)103 89 STUB(FF894CCC) 104 90 STUB(FF894E58) 105 91 STUB(FF89569C) 106 92 STUB(FF8956C8) 107 STUB(FF8956D8)108 93 STUB(FF899828) 109 94 STUB(FF89F658) … … 155 140 STUB(FF9077D4) 156 141 STUB(FF914B50) 157 STUB(FF968D58)158 142 STUB(FF97D2A4) 159 143 STUB(FF97D5C8) … … 194 178 STUB(FFAD9FE8) 195 179 STUB(FFAE3934) 196 STUB(FFAE398 8)180 STUB(FFAE3984) 197 181 STUB(FFB8B798) 198 182 STUB(FFB8BA64) -
trunk/platform/sx150is/sub/100a/stubs_entry.S
r1531 r1598 23 23 24 24 // Values below can be overridden in 'stubs_min.S': 25 //DEF(physw_status ,0x00033694) // Found @0xff834580, stubs_min = 0x00033694 (0x00033694) 26 //DEF(physw_run ,0x00001c30) // Found @0xff83412c, stubs_min = 0x00001c30 (0x00001c30) 27 //DEF(levent_table ,0xffbe99e8) // Found @0xffbe99e8, stubs_min = 0xffbe99e8 (0xffbe99e8) 28 //DEF(FlashParamsTable ,0xffc4e360) // Found @0xffc4e360, stubs_min = 0xffc4e360 (0xffc4e360) 29 //DEF(movie_status ,0x00006ec4) // Found @0xff985fb4, stubs_min = 0x00006ec4 (0x00006ec4) 30 //DEF(full_screen_refresh ,0x00009654) // Found @0xffa2a00c, stubs_min = 0x00009654 (0x00009654) 31 //DEF(canon_menu_active ,0x00003194) // Found @0xff8958f0, stubs_min = 0x00003194 (0x00003194) 32 //DEF(canon_shoot_menu_active ,0x00008109) // Found @0xff9cec20, stubs_min = 0x00008109 (0x00008109) 33 //DEF(playrec_mode ,0x00002eb8) // Found @0xff8877d0, stubs_min = 0x00002eb8 (0x00002eb8) 34 //DEF(zoom_status ,0x0000d520) // Found @0xffafaf48, stubs_min = 0x0000d520 (0x0000d520) 25 DEF(physw_status ,0x00033694) // Found @0xff834580 26 DEF(physw_run ,0x00001c30) // Found @0xff83412c 27 DEF(levent_table ,0xffbe99e8) // Found @0xffbe99e8 28 DEF(FlashParamsTable ,0xffc4e360) // Found @0xffc4e360 29 DEF(movie_status ,0x00006ec4) // Found @0xff985fb4 30 DEF(full_screen_refresh ,0x00009654) // Found @0xffa2a00c 31 DEF(canon_menu_active ,0x00003194) // Found @0xff8958f0 32 DEF(canon_shoot_menu_active ,0x00008109) // Found @0xff9cec20 33 DEF(playrec_mode ,0x00002eb8) // Found @0xff8877d0 34 DEF(zoom_status ,0x0000d520) // Found @0xffafaf48 35 35 // focus_len_table contains zoom focus lengths for use in 'get_focal_length' (main.c). 36 36 // each entry contains 2 int value(s), the first is the zoom focus length. 37 37 // there are 128 entries in the table - set NUM_FL to 128 38 38 DEF(focus_len_table ,0xfffeabd8) // Found @0xfffeabd8 39 //DEF(zoom_busy ,0x00006dcc) // Found @0xff98138c, stubs_min = 0x00006dcc (0x6DB0+0x1C) 40 //DEF(focus_busy ,0x00006c5c) // Found @0xff97b73c, stubs_min = 0x00006c5c (0x6C54+8) 41 //DEF(recreview_hold ,0x00003b7c) // Found @0xff8a6484, ** != ** stubs_min = 0x00007e08 (0x7DE0+0x28) 39 DEF(zoom_busy ,0x00006dcc) // Found @0xff98138c 40 DEF(focus_busy ,0x00006c5c) // Found @0xff97b73c 41 DEF(recreview_hold ,0x00003b7c) // Found @0xff8a6484 42 42 43 43 // Values below go in 'lib.c': -
trunk/platform/sx150is/sub/100a/stubs_min.S
r1415 r1598 1 1 #include "stubs_asm.h" 2 2 3 DEF(zoom_busy, 0x6DB0+0x1C) // @FF98138C4 DEF(focus_busy, 0x6C54 + 8) // @FF97B73C5 3 DEF(enabled_refresh_physical_screen, 0x9458) // @FFA29FF8 6 4 DEF(led_table, 0x2464 + 0x04) // @FF85EFEC 7 DEF(recreview_hold, 0x7DE0+0x28) // @FF9BE9CC8 5 9 DEF(physw_status ,0x00033694) // Found @0xff83458010 DEF(physw_run ,0x00001c30) // Found @0xff83412c11 DEF(levent_table ,0xffbe99e8) // Found @0xffbe99e812 DEF(FlashParamsTable ,0xffc4e360) // Found @0xffc4e36013 DEF(movie_status ,0x00006ec4) // Found @0xff985fb414 DEF(full_screen_refresh ,0x00009654) // Found @0xffa2a00c15 DEF(canon_menu_active ,0x00003194) // Found @0xff8958f016 DEF(canon_shoot_menu_active ,0x00008109) // Found @0xff9cec2017 DEF(playrec_mode ,0x00002eb8) // Found @0xff8877d0, stubs_min = 0x00002eb8 (0x00002eb8)18 DEF(zoom_status ,0x0000d520) // Found @0xffafaf4819 6 DEF(some_flag_for_af_scan ,0x000072F8) // Found @0xFF98A5FC 20 7
Note: See TracChangeset
for help on using the changeset viewer.
