Navigation

← Previous Changeset
Next Changeset →

Changeset 760

Timestamp:

05/10/09 01:35:59 (10 months ago)

Author:

reyalp

Message:

mantis 257 from mweerden:
* This patch adds beta versions for both the 1.00e and 1.02b firmware versions of the IXUS 870. In addition two fixes are made: the GetZoomLensCurrentPoint? pointer was incorrect and the default extension for RAW files is now .CR2 (to make them show up when you plug in the camera).

Files:

trunk/Makefile (modified) (5 diffs)
trunk/core/conf.c (modified) (2 diffs)
trunk/include/camera.h (modified) (3 diffs)
trunk/loader/ixus870_sd880/resetcode/main.c (modified) (2 diffs)
trunk/makefile.inc (modified) (1 diff)
trunk/platform/ixus870_sd880/main.c (modified) (1 diff)
trunk/platform/ixus870_sd880/sub/100e (added)
trunk/platform/ixus870_sd880/sub/100e/Makefile (added)
trunk/platform/ixus870_sd880/sub/100e/boot.c (added)
trunk/platform/ixus870_sd880/sub/100e/capt_seq.c (added)
trunk/platform/ixus870_sd880/sub/100e/lib.c (added)
trunk/platform/ixus870_sd880/sub/100e/makefile.inc (added)
trunk/platform/ixus870_sd880/sub/100e/movie_rec.c (added)
trunk/platform/ixus870_sd880/sub/100e/stubs_asm.h (added)
trunk/platform/ixus870_sd880/sub/100e/stubs_auto.S (added)
trunk/platform/ixus870_sd880/sub/100e/stubs_entry.S (added)
trunk/platform/ixus870_sd880/sub/100e/stubs_entry_2.S (added)
trunk/platform/ixus870_sd880/sub/100e/stubs_min.S (added)
trunk/platform/ixus870_sd880/sub/101a/boot.c (modified) (2 diffs)
trunk/platform/ixus870_sd880/sub/101a/lib.c (modified) (1 diff)
trunk/platform/ixus870_sd880/sub/101a/stubs_entry_2.S (modified) (3 diffs)
trunk/platform/ixus870_sd880/sub/102b (added)
trunk/platform/ixus870_sd880/sub/102b/Makefile (added)
trunk/platform/ixus870_sd880/sub/102b/boot.c (added)
trunk/platform/ixus870_sd880/sub/102b/capt_seq.c (added)
trunk/platform/ixus870_sd880/sub/102b/lib.c (added)
trunk/platform/ixus870_sd880/sub/102b/makefile.inc (added)
trunk/platform/ixus870_sd880/sub/102b/movie_rec.c (added)
trunk/platform/ixus870_sd880/sub/102b/stubs_asm.h (added)
trunk/platform/ixus870_sd880/sub/102b/stubs_auto.S (added)
trunk/platform/ixus870_sd880/sub/102b/stubs_entry.S (added)
trunk/platform/ixus870_sd880/sub/102b/stubs_entry_2.S (added)
trunk/platform/ixus870_sd880/sub/102b/stubs_min.S (added)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/Makefile

r754	r760
168	168	$(MAKE) -s --no-print-directory PLATFORM=ixus850_sd800 PLATFORMSUB=100e NO_INC_BUILD=1 firzipsub
169	169	$(MAKE) -s --no-print-directory PLATFORM=ixus860_sd870 PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub
	170	$(MAKE) -s --no-print-directory PLATFORM=ixus870_sd880 PLATFORMSUB=100e NO_INC_BUILD=1 firzipsub
170	171	$(MAKE) -s --no-print-directory PLATFORM=ixus870_sd880 PLATFORMSUB=101a NO_INC_BUILD=1 firzipsub
	172	$(MAKE) -s --no-print-directory PLATFORM=ixus870_sd880 PLATFORMSUB=102b NO_INC_BUILD=1 firzipsub
171	173	$(MAKE) -s --no-print-directory PLATFORM=ixus950_sd850 PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub
172	174	$(MAKE) -s --no-print-directory PLATFORM=ixus980_sd990 PLATFORMSUB=100e NO_INC_BUILD=1 firzipsub
…	…
226	228	mv $(topdir)bin/$(VER)-sx1-200h-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-sx1-200h-$(BUILD_NUMBER)_BETA.zip
227	229	mv $(topdir)bin/$(VER)-ixus980_sd990-100e-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus980_sd990-100e-$(BUILD_NUMBER)_BETA.zip
	230	mv $(topdir)bin/$(VER)-ixus870_sd880-100e-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus870_sd880-100e-$(BUILD_NUMBER)_BETA.zip
228	231	mv $(topdir)bin/$(VER)-ixus870_sd880-101a-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus870_sd880-101a-$(BUILD_NUMBER)_BETA.zip
	232	mv $(topdir)bin/$(VER)-ixus870_sd880-102b-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus870_sd880-102b-$(BUILD_NUMBER)_BETA.zip
229	233	@echo "**** Done Copying duplicate Firmwares"
230	234	@echo "**** Summary of memisosizes"
…	…
265	269	$(MAKE) -s --no-print-directory PLATFORM=ixus850_sd800 PLATFORMSUB=100e NO_INC_BUILD=1 firzipsubcomplete
266	270	$(MAKE) -s --no-print-directory PLATFORM=ixus860_sd870 PLATFORMSUB=100c NO_INC_BUILD=1 firzipsubcomplete
	271	$(MAKE) -s --no-print-directory PLATFORM=ixus870_sd880 PLATFORMSUB=100e NO_INC_BUILD=1 firzipsubcomplete
267	272	$(MAKE) -s --no-print-directory PLATFORM=ixus870_sd880 PLATFORMSUB=101a NO_INC_BUILD=1 firzipsubcomplete
	273	$(MAKE) -s --no-print-directory PLATFORM=ixus870_sd880 PLATFORMSUB=102b NO_INC_BUILD=1 firzipsubcomplete
268	274	$(MAKE) -s --no-print-directory PLATFORM=ixus950_sd850 PLATFORMSUB=100c NO_INC_BUILD=1 firzipsubcomplete
269	275	$(MAKE) -s --no-print-directory PLATFORM=ixus980_sd990 PLATFORMSUB=100e NO_INC_BUILD=1 firzipsubcomplete
…	…
335	341	mv $(topdir)bin/ixus980_sd990-100e-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus980_sd990-100e-$(BUILD_NUMBER)-full_BETA.zip
336	342	mv $(topdir)bin/ixus980_sd990-100e-$(BUILD_NUMBER).zip $(topdir)bin/ixus980_sd990-100e-$(BUILD_NUMBER)_BETA.zip
	343	mv $(topdir)bin/ixus870_sd880-100e-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus870_sd880-100e-$(BUILD_NUMBER)-full_BETA.zip
	344	mv $(topdir)bin/ixus870_sd880-100e-$(BUILD_NUMBER).zip $(topdir)bin/ixus870_sd880-100e-$(BUILD_NUMBER)_BETA.zip
337	345	mv $(topdir)bin/ixus870_sd880-101a-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus870_sd880-101a-$(BUILD_NUMBER)-full_BETA.zip
338	346	mv $(topdir)bin/ixus870_sd880-101a-$(BUILD_NUMBER).zip $(topdir)bin/ixus870_sd880-101a-$(BUILD_NUMBER)_BETA.zip
	347	mv $(topdir)bin/ixus870_sd880-102b-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus870_sd880-102b-$(BUILD_NUMBER)-full_BETA.zip
	348	mv $(topdir)bin/ixus870_sd880-102b-$(BUILD_NUMBER).zip $(topdir)bin/ixus870_sd880-102b-$(BUILD_NUMBER)_BETA.zip
339	349	@echo "**** Done Copying duplicate Firmwares"
340	350	@echo "**** Summary of memisosizes"
…	…
377	387	$(MAKE) -s --no-print-directory PLATFORM=ixus850_sd800 PLATFORMSUB=100e NO_INC_BUILD=1 clean
378	388	$(MAKE) -s --no-print-directory PLATFORM=ixus860_sd870 PLATFORMSUB=100c NO_INC_BUILD=1 clean
	389	$(MAKE) -s --no-print-directory PLATFORM=ixus870_sd880 PLATFORMSUB=100e NO_INC_BUILD=1 clean
379	390	$(MAKE) -s --no-print-directory PLATFORM=ixus870_sd880 PLATFORMSUB=101a NO_INC_BUILD=1 clean
	391	$(MAKE) -s --no-print-directory PLATFORM=ixus870_sd880 PLATFORMSUB=102b NO_INC_BUILD=1 clean
380	392	$(MAKE) -s --no-print-directory PLATFORM=ixus950_sd850 PLATFORMSUB=100c NO_INC_BUILD=1 clean
381	393	$(MAKE) -s --no-print-directory PLATFORM=ixus980_sd990 PLATFORMSUB=100e NO_INC_BUILD=1 clean

trunk/core/conf.c

r698	r760
187	187	CONF_INFO( 35, conf.raw_in_dir, CONF_DEF_VALUE, i:0, NULL),
188	188	CONF_INFO( 36, conf.raw_prefix, CONF_DEF_VALUE, i:RAW_PREFIX_CRW, NULL),
189		CONF_INFO( 37, conf.raw_ext, CONF_DEF_VALUE, i:~~RAW_EXT_CRW~~, NULL),
	189	CONF_INFO( 37, conf.raw_ext, CONF_DEF_VALUE, i:DEFAULT_RAW_EXT, NULL),
190	190	CONF_INFO( 38, conf.reader_file, CONF_DEF_PTR, ptr:"A/README.TXT", conf_change_script_file),
191	191	CONF_INFO( 39, conf.reader_pos, CONF_DEF_VALUE, i:0, NULL),
…	…
371	371	CONF_INFO(207, conf.zoom_timeout, CONF_DEF_VALUE, i:5, NULL),
372	372	CONF_INFO(208, conf.start_sound, CONF_DEF_VALUE, i:0, NULL),
373		CONF_INFO(209, conf.sub_batch_prefix, CONF_DEF_VALUE, i:2, NULL), // SND_
374		CONF_INFO(210, conf.sub_batch_ext, CONF_DEF_VALUE, i:1, NULL), // .CRW
	373	CONF_INFO(209, conf.sub_batch_prefix, CONF_DEF_VALUE, i:RAW_PREFIX_SND, NULL), // SND_
	374	CONF_INFO(210, conf.sub_batch_ext, CONF_DEF_VALUE, i:DEFAULT_RAW_EXT, NULL), // .CRW
375	375	CONF_INFO(211, conf.sub_in_dark_value, CONF_DEF_VALUE, i:30, NULL),
376	376	CONF_INFO(212, conf.sub_out_dark_value, CONF_DEF_VALUE, i:0, NULL),

trunk/include/camera.h

r757	r760
64	64
65	65	#undef CAM_HAS_VARIABLE_ASPECT // can switch between 16:9 and 4:3
	66	#define DEFAULT_RAW_EXT 1 // extension to use for raw (see raw_exts in conf.c)
66	67
67	68	//----------------------------------------------------------
…	…
1342	1343	#define CAM_HAS_ZOOM_LEVER 1
1343	1344	#define CAM_MULTIPART 1
1344		#define CAM_REMOTE 1 ~~// XXX~~
	1345	#define CAM_REMOTE 1
1345	1346	#define CAM_SYNCH 1 // XXX
1346	1347	#undef CAM_UNCACHED_BIT
…	…
1387	1388	#define CAM_EMUL_KEYPRESS_DURATION 5
1388	1389	#define CAM_SHOW_OSD_IN_SHOOT_MENU 1
	1390	#undef DEFAULT_RAW_EXT
	1391	#define DEFAULT_RAW_EXT 2 // use .CR2
1389	1392	#define DNG_SUPPORT 1
1390	1393

trunk/loader/ixus870_sd880/resetcode/main.c

r754	r760
33	33	}
34	34
35		// from 0xFF829~~878 (sub_FF829848~~)
	35	// from 0xFF82940C (sub_FF8293DC, via call to _sub_???__ADCScn.c__214)
36	36	asm volatile (
37	37	"MRS R0, CPSR\n"
…	…
81	81	: : "r"(dst_void) : "memory","r0","r1","r2","r3","r4");
82	82
83		((volatile long ) 0xC0223030) = 0x46;
	83	// needed in case call BX R0 "returns"? (note that LR is set, but to what?)
84	84
85		~~// needed in case call BX R0 "returns"? (note that LR is set, but to what?)~~
	85	((volatile long ) 0xC0223030) = 0x46;
86	86	while(1);
87	87	}

trunk/makefile.inc

r754	r760
119	119
120	120	#PLATFORM=ixus870_sd880
121		#PLATFORMSUB=101a
	121	#PLATFORMSUB=100e
	122
	123	#PLATFORM=ixus870_sd880
	124	#PLATFORMSUB=101a
	125
	126	#PLATFORM=ixus870_sd880
	127	#PLATFORMSUB=102b
122	128
123	129	#PLATFORM=ixus80_sd1100

trunk/platform/ixus870_sd880/main.c

r754	r760
101	101	long get_vbatt_min()
102	102	{
103		return 3205; // observed with osd:
104		// 3320 -> blinking icon 3205
105		// 3205 -> warning and power off
	103	return 3265; // min seen: 3205 (warning + power off)
	104	// 3320 -> blinking icon
106	105	}
107	106
108	107	long get_vbatt_max()
109	108	{
110		return 4065; // ~~XXX max seen~~
	109	return 4065; // max seen: 4065
111	110	}
112	111

trunk/platform/ixus870_sd880/sub/101a/boot.c

r754	r760
2	2	#include "platform.h"
3	3	#include "core.h"
4
5		~~int led_counter = 0;~~
6	4
7	5	const char * const new_sa = &_end;
…	…
19	17	// via JogDail.c ref (function calls sub_FF..__JogDial.c__14)
20	18	if (p[0]==0xFF846338) p[0]=(int)JogDial_task_my;
21		// found @0xFF85E03C (~~via~~ call to taskcreate_AviWrite)
	19	// found @0xFF85E03C (above call to taskcreate_AviWrite)
22	20	if (p[0]==0xFF85E03C) p[0]=(int)movie_record_task;
23	21	// task_ExpDrvTask

trunk/platform/ixus870_sd880/sub/101a/lib.c

r754	r760
10	10	//
11	11	// just before aEscapeOriginal (" Escape Original Raw to CRAW2 BUFFER. ")
12		~~// 0xFF84D01C: 0x413D2684~~
13	12	// 0xFF84D020: 0x429AAA2C
14	13	return (char) ((int*)(0x5324+0x18) ? 0x429AAA2C : 0x412007FC);

trunk/platform/ixus870_sd880/sub/101a/stubs_entry_2.S

r754	r760
31	31	NHSTUB(platformsub_kbd_fetch_data, 0xFF846248) // GetKbdState
32	32	NHSTUB(UnsetZoomForMovie,0xFF9607A0) // via aZoomcon_Unsetz (used ixus980 dump)
33		//NHSTUB(PutInNdFilter,0xFFA9C1BC) // function table
	33	//NHSTUB(PutInNdFilter,0xFFA9C1D4) // function table
34	34	NHSTUB(PutInNdFilter,0xFFA3AD28) // function table TurnOnNdFilter (used ixus980)
35	35	//NHSTUB(PutOutNdFilter,0xFFA9C20C) // function table
…	…
39	39	// Corrections for uncertain entries in stubs_entry.S
40	40
41		NHSTUB(AllocateUncacheableMemory, 0xFF827B68) // via task_UartLog, 2nd call ~~before loc_ label~~
	41	NHSTUB(AllocateUncacheableMemory, 0xFF827B68) // via task_UartLog, 2nd call
42	42	// NHSTUB(ExitTask, 0xff81b184) // ok, eventproc_export_ExitTask
43	43	// NHSTUB(FreeUncacheableMemory, 0xff827ba8) // ok, via task_UartLog, call before the last one
…	…
51	51	// NHSTUB(GetPropertyCase, 0xff8717a8) // ok, PT_GetPropertyCaseString_0
52	52	// NHSTUB(GetSystemTime, 0xffa3d910) // ok, GetSystemTime
53		NHSTUB(GetZoomLensCurrentPoint, 0xFF~~A329D8~~) // function table
	53	NHSTUB(GetZoomLensCurrentPoint, 0xFF92B9CC) // function table
54	54	// NHSTUB(IsStrobeChargeCompleted, 0xff8ab714) // ok, via _sub_???__EFCharge.c__856
55	55	// NHSTUB(LockMainPower, 0xff878ec8) // ok, eventproc_export_LockMainPower

chdk