Changeset 1368
- Timestamp:
- 10/15/11 20:13:06 (19 months ago)
- Location:
- trunk/platform/ixus300_sd4000
- Files:
-
- 4 edited
-
kbd.c (modified) (1 diff)
-
shooting.c (modified) (1 diff)
-
sub/100d/stubs_entry.S (modified) (6 diffs)
-
sub/100d/stubs_entry_2.S (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/platform/ixus300_sd4000/kbd.c
r1344 r1368 26 26 #define KEYS_MASK2 (0x00000000) // physw_status[2] 27 27 //static long alt_mode_key_mask = 0x00000000; // we use two Keys, no need to override 28 #define SD_READONLY_FLAG (0x20000) // SD-Card Lock Status (locked / unlocked) 29 #define USB_MASK (0x80000) // USB-Power (triggered around 3,5V) 28 29 #define SD_READONLY_FLAG (0x00020000) // SD-Card Lock Status (locked / unlocked) 30 #define SD_READONLY_IDX 2 31 32 #define USB_MASK (0x00080000) // USB-Power (triggered around 3,5V) 33 #define USB_IDX 2 30 34 31 35 volatile int jogdial_stopped=0; -
trunk/platform/ixus300_sd4000/shooting.c
r1268 r1368 102 102 // Mapping between camera mode and PROPCASE_SHOOTING_MODE (modelist.h) 103 103 // finsig2 found 33324, 33323, 33320, 33322, 33321, 33288, 33289 in firmware but not in modemap 104 // ROM:FFC0041C Table with Data Words 104 105 static const CapturemodeMap modemap[] = { 105 106 { MODE_AUTO, 32768 }, -
trunk/platform/ixus300_sd4000/sub/100d/stubs_entry.S
r1291 r1368 9 9 // Stubs below should be checked. Stub not matched 100%, or difference found to current 'stubs_entry_2.S' 10 10 // Name Address Rule % Comp to stubs_entry_2.S 11 //NSTUB(DoAFLock ,0xff8382e4) //102 *** != 0xff87a91012 11 //NSTUB(GetDrive_FreeClusters ,0xff8344a8) // 3 *** != 0xff871e90 13 12 // ALT: NSTUB(GetDrive_FreeClusters, 0xff871e90) // 4 9/0 14 13 //NSTUB(GetImageFolder ,0xff94345c) //106 *** != 0xff94337c 15 //NSTUB(MoveFocusLensToDistance ,0xffb228b0) //102 *** != 0xffb2289c16 //NSTUB(Open ,0xff836d4c) //101 *** != 0xff86f13c17 14 //NSTUB(PutInNdFilter ,0xffab69c8) //102 *** != 0xffb2056c 18 15 //NSTUB(PutOutNdFilter ,0xffab69ec) //102 *** != 0xffb205a4 19 16 //NSTUB(ScreenLock ,0xffa13354) // 3 *** != 0xffa1356c 20 17 //NSTUB(SetScriptMode ,0xff895904) //101 *** != 0xff810f6c 21 //NSTUB(UnlockAF ,0xff83831c) //102 *** != 0xff87a92022 18 //NSTUB(kbd_pwr_off ,0xff861a14) // 2 60% *** != 0x00000000 23 19 // ERROR: kbd_pwr_on is not found. //--- --- *** != 0x00000000 24 //NSTUB(rename ,0xff83669c) // 4 *** != 0xff836e9425 //NSTUB(write ,0xff836e48) //101 *** != 0xff81acdc26 20 27 21 // Check of modemap from 'platform/CAMERA/shooting.c': … … 92 86 NSTUB(DebugAssert ,0xff81eb14) //111 93 87 NSTUB(DeleteFile_Fut ,0xff836730) //112 88 NSTUB(DoAFLock ,0xff8382e4) //102 94 89 //NSTUB(EnterToCompensationEVF ,0xff8383e4) //104 == 0xff8383e4 95 90 NSTUB(ExecuteEventProcedure ,0xff88b948) // 1 … … 130 125 //NSTUB(Lseek ,0xff836ed4) //101 == 0xff836ed4 131 126 NSTUB(MakeDirectory_Fut ,0xff8367a4) // 1 127 NSTUB(MoveFocusLensToDistance ,0xffb228b0) //102 132 128 NSTUB(MoveIrisWithAv ,0xffab6408) //102 133 129 NSTUB(MoveZoomLensWithPoint ,0xffab6b64) //102 134 130 NSTUB(NewTaskShell ,0xff88f06c) //103 131 NSTUB(Open ,0xff836d4c) //101 135 132 //NSTUB(PB2Rec ,0xff898b40) //104 == 0xff898b40 136 133 NSTUB(PT_MoveDigitalZoomToWide ,0xff87a8c0) //102 … … 159 156 //NSTUB(TurnOnBackLight ,0xff8a4968) //104 == 0xff8a4968 160 157 //NSTUB(UIFS_WriteFirmInfoToFile ,0xff984ab4) //103 == 0xff984ab4 158 NSTUB(UnlockAF ,0xff83831c) //102 161 159 NSTUB(UnlockMainPower ,0xff895acc) //103 162 160 NSTUB(UpdateMBROnFlash ,0xff871cb0) // 3 … … 195 193 //NSTUB(readfastdir ,0xffa95de4) // 4 == 0xffa95de4 196 194 NSTUB(reboot_fw_update ,0xffa9b228) // 1 195 NSTUB(rename ,0xff83669c) // 4 197 196 NSTUB(set_control_event ,0xff895504) //111 198 197 NSTUB(srand ,0xff820768) // 1 … … 217 216 NSTUB(time ,0xff88981c) // 2 218 217 NSTUB(vsprintf ,0xff8205d4) // 4 218 NSTUB(write ,0xff836e48) //101 -
trunk/platform/ixus300_sd4000/sub/100d/stubs_entry_2.S
r1342 r1368 19 19 //NHSTUB(SetScriptMode, 0xFF895904) // eventproc 20 20 NHSTUB(SetScriptMode, 0xFF810F6C) // OK!, like SX210 and G11 21 //NHSTUB(UnlockAF, 0xFF83831C) // OK!, like SX210 and G11 22 NHSTUB(UnlockAF, 0xFF87A920) // PT_UnlockAF, like D1023 //NHSTUB(DoAFLock, 0xFF8382E4) // OK!, like SX210 and G11 24 NHSTUB(DoAFLock, 0xFF87A910) // PT_DoAFLock, like D1021 //NHSTUB(UnlockAF, 0xFF83831C) // OK!, like SX210 and G11, finsig2 22 //NHSTUB(UnlockAF, 0xFF87A920) // PT_UnlockAF, like D10 23 //NHSTUB(DoAFLock, 0xFF8382E4) // OK!, like SX210 and G11, finsig2 24 //NHSTUB(DoAFLock, 0xFF87A910) // PT_DoAFLock, like D10 25 25 26 26 NHSTUB(GiveSemaphore, 0xFF839E38) // OK!!, eventproc, like G11 27 27 NHSTUB(GetDrive_FreeClusters, 0xFF871E90) // OK!, like SX210 and G11, UI does show free space 28 28 NHSTUB(PT_PlaySound, 0xFF8840B8) // OK!, like SX210 and G11, plays sound on CHDK startup 29 //NHSTUB(rename, 0xFF83669C) // maybe OK, like SX210 30 NHSTUB(rename, 0xFF836E94) // maybe OK, like G1129 //NHSTUB(rename, 0xFF83669C) // maybe OK, like SX210, finsig2 30 //NHSTUB(rename, 0xFF836E94) // maybe OK, like G11 31 31 NHSTUB(qsort, 0xFFB0B1F8) // maybe OK, like SX210, G11 and D10 are different but referens is same 32 32 NHSTUB(EnterToCompensationEVF, 0xFF8383E4) // OK, like SX210 and G11 … … 98 98 //NHSTUB(MakeDirectory_Fut, 0xff8367a4) // OK, like SD990, finsig2 99 99 //NHSTUB(MoveFocusLensToDistance, 0xffb228b0) // finsig2 100 NHSTUB(MoveFocusLensToDistance, 0xFFB2289C)// ?!?100 //NHSTUB(MoveFocusLensToDistance, 0xFFB2289C) // ?!? 101 101 //NHSTUB(MoveZoomLensWithPoint, 0xffab6b64) // maybe ok 102 102 //NHSTUB(NewTaskShell, 0xff88f06c) // OK … … 213 213 214 214 NHSTUB(LEDDrive, 0xFF860C6C) // camera_set_led() 215 216 217 // Added by finsig_dryos V2 to match old values found by finsig.218 // Values should be checked in firmware, if the new address in stubs_entry.S219 // is correct then delete the correspoding entry below.220 NHSTUB(Open ,0xff86f13c) // New address = 0xff836d4c221 NHSTUB(write ,0xff81acdc) // New address = 0xff836e48
Note: See TracChangeset
for help on using the changeset viewer.
