Changeset 767
- Timestamp:
- 06/01/09 02:25:59 (9 months ago)
- Files:
-
- trunk/include/camera.h (modified) (2 diffs)
- trunk/platform/ixus870_sd880/kbd.c (modified) (5 diffs)
- trunk/platform/ixus870_sd880/sub/100e/stubs_entry_2.S (modified) (1 diff)
- trunk/platform/ixus870_sd880/sub/100e/stubs_min.S (modified) (1 diff)
- trunk/platform/ixus870_sd880/sub/101a/stubs_entry_2.S (modified) (1 diff)
- trunk/platform/ixus870_sd880/sub/101a/stubs_min.S (modified) (1 diff)
- trunk/platform/ixus870_sd880/sub/102b/stubs_entry_2.S (modified) (1 diff)
- trunk/platform/ixus870_sd880/sub/102b/stubs_min.S (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/include/camera.h
r765 r767 1332 1332 #define CAM_PROPSET 2 1333 1333 1334 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 1334 1335 #define CAM_BITMAP_PALETTE 1 1335 1336 #define CAM_BRACKETING 1 // XXX 1336 #define CAM_CAN_SD_OVER_NOT_IN_MF 1 // XXX1337 #define CAM_CAN_SD_OVERRIDE 1 // XXX1337 #define CAM_CAN_SD_OVER_NOT_IN_MF 1 1338 #define CAM_CAN_SD_OVERRIDE 1 1338 1339 #define CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO 1 1339 1340 #define CAM_EXT_TV_RANGE 1 … … 1349 1350 #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData 1350 1351 1351 #undef CAM_AF_SCAN_DURING_VIDEO_RECORD // XXX1352 1352 #undef CAM_CAN_MUTE_MICROPHONE // XXX 1353 1353 #undef CAM_HAS_ERASE_BUTTON trunk/platform/ixus870_sd880/kbd.c
r754 r767 37 37 // LDRB R2, [R1,#0x114] R2 = a[0x114] = 0x51 38 38 // LDRB R1, [R1,#0x114] R1 = a[0x114] = 0x51 39 // MOV R2, R2,LSR#5 R2 = 0x51 >> 5 = 2 39 // MOV R2, R2,LSR#5 R2 = 0x51 >> 5 = 2 = SD_READONLY_REG 40 40 // LDR R0, [R0,R2,LSL#2] R0 = R0[2] = b[2] 41 41 // AND R1, R1, #0x1F R1 = 0x51 & 0x1F = 0x11 … … 45 45 // BX LR return 46 46 #define SD_READONLY_FLAG (0x20000) // 1 << 0x11 47 #define SD_READONLY_REG 2 47 48 48 49 #define USB_MASK (0x40000) … … 71 72 { 2, KEY_RIGHT , 0x00000020 }, 72 73 { 2, KEY_SET , 0x00000100 }, 73 { 2, KEY_ZOOM_IN , 0x0000000 8},74 { 2, KEY_ZOOM_OUT , 0x0000000 4},74 { 2, KEY_ZOOM_IN , 0x00000004 }, 75 { 2, KEY_ZOOM_OUT , 0x00000008 }, 75 76 { 2, KEY_MENU , 0x00000400 }, 76 77 { 2, KEY_DISPLAY , 0x00000200 }, … … 307 308 _kbd_read_keys_r2(physw_status); 308 309 309 remote_key = (physw_status[ 2] & USB_MASK)==USB_MASK;310 remote_key = (physw_status[USB_REG] & USB_MASK)==USB_MASK; 310 311 if (remote_key) 311 312 remote_count += 1; … … 315 316 } 316 317 if (conf.remote_enable) { 317 physw_status[2] = physw_status[2] & ~(SD_READONLY_FLAG | USB_MASK); 318 #if USB_REG == SD_READONLY_REG 319 physw_status[USB_REG] = physw_status[USB_REG] & ~(SD_READONLY_FLAG | USB_MASK); 320 #else 321 physw_status[USB_REG] = physw_status[USB_REG] & ~USB_MASK; 322 physw_status[SD_READONLY_REG] = physw_status[SD_READONLY_REG] & ~SD_READONLY_FLAG; 323 #endif 318 324 } else { 319 physw_status[ 2] = physw_status[2] & ~SD_READONLY_FLAG;325 physw_status[SD_READONLY_REG] = physw_status[SD_READONLY_REG] & ~SD_READONLY_FLAG; 320 326 } 321 327 trunk/platform/ixus870_sd880/sub/100e/stubs_entry_2.S
r760 r767 35 35 //NHSTUB(PutOutNdFilter,0xFFA9C1FC) // function table 36 36 NHSTUB(PutOutNdFilter,0xFFA3AD3C) // function table TurnOffNdFilter (used ixus980) 37 NHSTUB(ScreenLock, 0xFF9B83CC) // via aScreenlock 38 NHSTUB(MakeAFScan, 0xFF933E50) // via aSsprepareseqba (function with most uses) 39 NHSTUB(ExpCtrlTool_StartContiAE, 0xFF830D00) // via aStartcontiae 37 40 38 41 trunk/platform/ixus870_sd880/sub/100e/stubs_min.S
r760 r767 13 13 DEF(enabled_refresh_physical_screen, 0xB268+0x30) // via aScreenLock, after ldr of 0xB268 14 14 DEF(playrec_mode, 0x5394+0x4) // @0xff865b40, via aShootseqapi_c (adrne/ldrne ~), between the ZoomCtrl and CameraLog above, the one below MOV R0, #1 15 DEF(some_flag_for_af_scan, 0x9280) // second value above string "SsPrepareSeq.c" trunk/platform/ixus870_sd880/sub/101a/stubs_entry_2.S
r760 r767 35 35 //NHSTUB(PutOutNdFilter,0xFFA9C20C) // function table 36 36 NHSTUB(PutOutNdFilter,0xFFA3AD4C) // function table TurnOffNdFilter (used ixus980) 37 NHSTUB(ScreenLock, 0xFF9B83D0) // via aScreenlock 38 NHSTUB(MakeAFScan, 0xFF933E54) // via aSsprepareseqba (function with most uses) 39 NHSTUB(ExpCtrlTool_StartContiAE, 0xFF830D00) // via aStartcontiae 37 40 38 41 trunk/platform/ixus870_sd880/sub/101a/stubs_min.S
r754 r767 13 13 DEF(enabled_refresh_physical_screen, 0xB268+0x30) // via aScreenLock, after ldr of 0xB268 14 14 DEF(playrec_mode, 0x5394+0x4) // @0xff865b40, via aShootseqapi_c (adrne/ldrne ~), between the ZoomCtrl and CameraLog above, the one below MOV R0, #1 15 DEF(some_flag_for_af_scan, 0x9280) // second value above string "SsPrepareSeq.c" trunk/platform/ixus870_sd880/sub/102b/stubs_entry_2.S
r760 r767 35 35 //NHSTUB(PutOutNdFilter,0xFFA9C20C) // function table 36 36 NHSTUB(PutOutNdFilter,0xFFA3AD4C) // function table TurnOffNdFilter (used ixus980) 37 NHSTUB(ScreenLock, 0xFF9B83D0) // via aScreenlock 38 NHSTUB(MakeAFScan, 0xFF933E54) // via aSsprepareseqba (function with most uses) 39 NHSTUB(ExpCtrlTool_StartContiAE, 0xFF830D00) // via aStartcontiae 37 40 38 41 trunk/platform/ixus870_sd880/sub/102b/stubs_min.S
r760 r767 13 13 DEF(enabled_refresh_physical_screen, 0xB268+0x30) // via aScreenLock, after ldr of 0xB268 14 14 DEF(playrec_mode, 0x5394+0x4) // @0xff865b40, via aShootseqapi_c (adrne/ldrne ~), between the ZoomCtrl and CameraLog above, the one below MOV R0, #1 15 DEF(some_flag_for_af_scan, 0x9280) // second value above string "SsPrepareSeq.c"
