Context Navigation

← Previous Changeset
Next Changeset →

Changeset 955

Timestamp:

10/14/10 09:12:26 (19 months ago)

Author:

fe50

Message:

* Fixes by ultimA from http://chdk.setepontos.com/index.php/topic,650.msg55640.html#msg55640
- Make the A2000, G11 and ixus100_sd780 ports compatible with GCC 4.5. Apparently GCC 4.4 was too forgiving and still built the code, but GCC 4.5.1 errored out on them. This patch fixes the ASM so that these cams can be built successfully. The changes were not actually tested, but the fixes are trivial. As a result, all stable ports can be built using GCC 4.5.1 now. Credit also goes to whim who noticed these cams failing to build and he also suggested the first set of fixes.
- Shut up some (not all) warnings from ixus100_sd780, ixus40_sd300, ixus65_sd630, s5is, ixus60_sd600
- Make edge overlay respect OPT_EDGEOVERLAY. Previously, generated binary size did not get significantly smaller even when OPT_EDGEOVERLAY was undefined, because undefining it only resulted in the overlay being excluded from the menu, but still being built. Excluding edge overlay now saves appr. 3Kbytes.
- Edge overlay erroneously depended on OPT_DEBUGGING. Builds failed when OPT_DEBUGGING was not defined previously.

Location:

trunk

Files:

: 15 modified

core/edgeoverlay.c (modified) (2 diffs)
core/gui.c (modified) (8 diffs)
platform/a2000/sub/100c/capt_seq.c (modified) (1 diff)
platform/g11/sub/100f/boot.c (modified) (2 diffs)
platform/g11/sub/100j/boot.c (modified) (4 diffs)
platform/ixus100_sd780/kbd.c (modified) (5 diffs)
platform/ixus100_sd780/sub/100c/boot.c (modified) (3 diffs)
platform/ixus100_sd780/sub/100c/capt_seq.c (modified) (7 diffs)
platform/ixus100_sd780/wrappers.c (modified) (1 diff)
platform/ixus40_sd300/kbd.c (modified) (1 diff)
platform/ixus60_sd600/kbd.c (modified) (1 diff)
platform/ixus65_sd630/kbd.c (modified) (1 diff)
platform/ixus65_sd630/sub/100a/lib.c (modified) (1 diff)
platform/s5is/sub/101a/boot.c (modified) (1 diff)
platform/s5is/sub/101b/boot.c (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/core/edgeoverlay.c

r931	r955
	1	#include "platform.h"
	2
	3	#ifdef OPT_EDGEOVERLAY
1	4	#include "edgeoverlay.h"
2		~~#include "platform.h"~~
3	5	#include "conf.h"
4	6	#include "keyboard.h"
…	…
765	767
766	768	} // function
	769
	770	#endif
	771

trunk/core/gui.c

r931	r955
43	43	#include "curves.h"
44	44	#endif
45		#include "edgeoverlay.h"
	45	#ifdef OPT_EDGEOVERLAY
	46	#include "edgeoverlay.h"
	47	#endif
46	48	//-------------------------------------------------------------------
47	49
…	…
159	161	static void gui_draw_load_lang(int arg);
160	162	static void gui_menuproc_mkbootdisk(int arg);
161		~~static void gui_menuproc_edge_save(int arg);~~
162		~~static void gui_menuproc_edge_load(int arg);~~
163	163	#ifdef OPT_DEBUGGING
164	164	void gui_compare_props(int arg);
…	…
256	256	#endif
257	257
	258	#ifdef OPT_EDGEOVERLAY
	259	static void gui_menuproc_edge_save(int arg);
	260	static void gui_menuproc_edge_load(int arg);
258	261	static const char* gui_edge_pano_enum(int change, int arg);
	262	#endif
259	263
260	264	void rinit();
…	…
2046	2050	// if (conf.zoom_override) shooting_set_zoom(conf.zoom_override_value);
2047	2051	#endif
2048		}
2049
2050		~~static void gui_load_edge_selected( const char* fn ) {~~
2051		~~if( fn )~~
2052		~~load_edge_overlay(fn);~~
2053	2052	}
2054	2053
…	…
3205	3204	}
3206	3205
	3206	#ifdef OPT_EDGEOVERLAY
	3207	static void gui_load_edge_selected( const char* fn ) {
	3208	if( fn )
	3209	load_edge_overlay(fn);
	3210	}
	3211
3207	3212	void gui_menuproc_edge_save(int arg) {
3208	3213	save_edge_overlay();
…	…
3224	3229	gui_fselect_init(LANG_MENU_EDGE_LOAD, path, gui_load_edge_selected);
3225	3230	}
	3231	#endif
3226	3232
3227	3233	//-------------------------------------------------------------------
…	…
3364	3370	}
3365	3371	}
	3372
	3373	#ifdef OPT_EDGEOVERLAY
	3374	static const char* gui_edge_pano_enum(int change, int arg)
	3375	{
	3376	static const char* modes[]={ "Off", "Right", "Down", "Left", "Up", "Free"};
	3377
	3378	conf.edge_overlay_pano+=change;
	3379	if (conf.edge_overlay_pano<0)
	3380	conf.edge_overlay_pano=(sizeof(modes)/sizeof(modes[0]))-1;
	3381	else if (conf.edge_overlay_pano>=(sizeof(modes)/sizeof(modes[0])))
	3382	conf.edge_overlay_pano=0;
	3383	return modes[conf.edge_overlay_pano];
	3384	}
	3385	#endif
3366	3386
3367	3387	#ifdef OPT_DEBUGGING
…	…
3415	3435	}
3416	3436
3417		static const char* gui_edge_pano_enum(int change, int arg)
3418		{
3419		static const char* modes[]={ "Off", "Right", "Down", "Left", "Up", "Free"};
3420
3421		conf.edge_overlay_pano+=change;
3422		if (conf.edge_overlay_pano<0)
3423		conf.edge_overlay_pano=(sizeof(modes)/sizeof(modes[0]))-1;
3424		else if (conf.edge_overlay_pano>=(sizeof(modes)/sizeof(modes[0])))
3425		conf.edge_overlay_pano=0;
3426		return modes[conf.edge_overlay_pano];
3427		}
3428
3429		#endif
	3437	#endif

trunk/platform/a2000/sub/100c/capt_seq.c

r797	r955
22	22	" LDR R1, =0x539\n"
23	23	" LDR R0, =0xFFC4AA98\n" // "SsShootTask.c"
24		" BL 0xFFC0BD98\n" // DebugAssert
25		" BL 0xFFC0BB50\n" // eventproc_export_ExitTask ; LOCATION: KerTask.c:0
	24	" BL =0xFFC0BD98\n" // DebugAssert
	25	" BL =0xFFC0BB50\n" // eventproc_export_ExitTask ; LOCATION: KerTask.c:0
26	26	" LDMFD SP!, {R3-R7,PC}\n"
27	27	"loc_FFC4AEB8:\n"

trunk/platform/g11/sub/100f/boot.c

r871	r955
773	773	"BL sub_FF8398B4\n"
774	774	//"ADR R2, sub_FF860490\n"
775		"ADR R2, sub_FF860490_my\n" //+
	775	"ADRL R2, sub_FF860490_my\n" //+
776	776	"MOV R1, R2\n"
777	777	"ORR R3, R4, #0x200\n"
…	…
892	892	"BEQ loc_FF860810\n"
893	893	// "ADR R2, sub_FF860490\n"
894		"ADR R2, sub_FF860490_my\n" //+
	894	"ADRL R2, sub_FF860490_my\n" //+
895	895	"MOV R1, R2\n"
896	896	"ORR R3, R4, #0x400\n"

trunk/platform/g11/sub/100j/boot.c

r871	r955
491	491	"LDMEQFD SP!, {R4-R8,LR}\n"
492	492	"LDREQ R0, =0xFF86F9A8\n"
493		"BEQ 0xFF81175C\n" //qPrintf
	493	"BEQ =0xFF81175C\n" //qPrintf
494	494	"LDMFD SP!, {R4-R8,PC}\n"
495	495	);
…	…
682	682	"LDR R0, =0xFF86F378\n"
683	683
684		"BL 0xFF81E88C\n"
	684	"BL =0xFF81E88C\n"
685	685
686	686	"loc_FF86F340:\n"
…	…
779	779	"LDR R0, [R5,R4,LSL#2]\n"
780	780	"BL sub_FF8398E4\n"
781		"ADR R2, sub_FF8604E0_my\n"
	781	"ADRL R2, sub_FF8604E0_my\n"
782	782	// "LDR R2, sub_FF8604E0\n"
783	783	"ADD R1, R2, #0\n"
…	…
900	900	"BEQ loc_FF860860\n"
901	901	// "ADR R2, loc_FF8604E0\n"
902		"ADR R2,sub_FF8604E0_my\n"
	902	"ADRL R2,sub_FF8604E0_my\n"
903	903	"ADD R1, R2, #0\n"
904	904	"ORR R3, R4, #0x400\n"

trunk/platform/ixus100_sd780/kbd.c

r881	r955
4	4	#include "keyboard.h"
5	5	#include "conf.h"
6		//#include "stdlib.h"
	6	#include "stdlib.h"
	7	#include "gui.h"
	8	#include "../../core/gui_draw.h"
7	9
8	10	typedef struct {
…	…
203	205	"stmdb sp!, {r0, r1, lr}\n"
204	206	"mov r0, sp\n"
205		"BL 0xFF922E14\n" //GetLogToFile
	207	"BL =0xFF922E14\n" //GetLogToFile
206	208	"ldmia sp!, {r0, r1, lr}\n"
207	209	);
…	…
212	214	int i;
213	215	char aStr[50];
214		void* l;
215
216		l=~~(void*)~~Fopen_Fut("A/PropDmp.txt","a");
	216	long l;
	217
	218	l=Fopen_Fut("A/PropDmp.txt","a");
217	219	for (i=0;i<300;i++){
218	220	_GetPropertyCase(i, &avv, sizeof(avv)); // 23 for DiGiC III
…	…
229	231	#define FWSIZE 0x30
230	232
231		void* l;
	233	long l;
232	234	int j,k;
233	235	int* myPtr, myPtr2;
…	…
245	247	j=0;
246	248
247		l=~~(void*)~~Fopen_Fut("A/aHookList.txt","ab");
	249	l=Fopen_Fut("A/aHookList.txt","ab");
248	250
249	251	while (j<aHookNum)

trunk/platform/ixus100_sd780/sub/100c/boot.c

r876	r955
2	2	#include "platform.h"
3	3	#include "core.h"
	4	#include "stdlib.h"
	5	#include "gui.h"
	6	#include "../../../../core/gui_draw.h"
4	7
5	8	const char * const new_sa = &_end;
…	…
8	11	extern long wrs_kernel_bss_start;
9	12	extern long wrs_kernel_bss_end;
10		~~long~~ aHookList[128];
	13	int* aHookList[128];
11	14	long aHookNum=0;
12	15
…	…
139	142	int jF;
140	143
141		void* l;
	144	long l;
142	145	char filen[32];
143	146
144		l~~=(void*)~~Fopen_Fut("A/0xCF90a.bin","ab");
145		Fwrite_Fut(~~START_ADDRESS~~,1,FWSIZE,l);
	147	l = Fopen_Fut("A/0xCF90a.bin","ab");
	148	Fwrite_Fut((void*)(START_ADDRESS),1,FWSIZE,l);
146	149	Fflush_Fut(l);
147	150	Fclose_Fut(l);
148		l~~=(void*)~~Fopen_Fut("A/0xCF90b.bin","ab");
149		Fwrite_Fut(~~START_ADDRESS2~~,1,FWSIZE,l);
	151	l = Fopen_Fut("A/0xCF90b.bin","ab");
	152	Fwrite_Fut((void*)(START_ADDRESS2),1,FWSIZE,l);
150	153	Fflush_Fut(l);
151	154	Fclose_Fut(l);

trunk/platform/ixus100_sd780/sub/100c/capt_seq.c

r876	r955
685	685	" MOV R1, #1\n"
686	686	" BL sub_FF866178\n"
687		" BL 0xFF81B23C\n" //ExitTask
	687	" BL =0xFF81B23C\n" //ExitTask
688	688	" ADD SP, SP, #0x20\n"
689	689	" LDMFD SP!, {R4-R8,PC}\n"
…	…
738	738	"loc_FF899E10:\n"
739	739	" LDR R0, =0xFF896C24\n" //aExpdrv_c
740		" BL 0xFF81B284\n" //DebugAssert
	740	" BL =0xFF81B284\n" //DebugAssert
741	741	" B loc_FF899DB8\n"
742	742	"loc_FF899E1C:\n"
…	…
1186	1186	" LDRNE R1, =0x583\n"
1187	1187	" LDRNE R0, =0xFF896C24\n" //aExpdrv_c
1188		" BLNE 0xFF81B284\n" //DebugAssert
	1188	" BLNE =0xFF81B284\n" //DebugAssert
1189	1189	"loc_FF897740:\n"
1190	1190	" CMP R5, #1\n"
…	…
1198	1198	" LDRNE R0, =0xFF896C24\n" //aExpdrv_c
1199	1199	" LDMNEFD SP!, {R4-R8,LR}\n"
1200		" BNE 0xFF81B284\n" //DebugAssert
	1200	" BNE =0xFF81B284\n" //DebugAssert
1201	1201	" LDMFD SP!, {R4-R8,PC}\n"
1202	1202	);
…	…
1216	1216	" MOVNE R1, #0x140\n"
1217	1217	" LDRNE R0, =0xFF888D10\n" //aShutter_c
1218		" BLNE 0xFF81B284\n" //DebugAssert
	1218	" BLNE =0xFF81B284\n" //DebugAssert
1219	1219	" CMN R4, #0xC00\n"
1220	1220	" LDREQSH R4, [R5,#2]\n"
…	…
1223	1223	" LDREQ R0, =0xFF888D10\n" //aShutter_c
1224	1224	" STRH R4, [R5,#2]\n"
1225		" BLEQ 0xFF81B284\n" //DebugAssert
	1225	" BLEQ =0xFF81B284\n" //DebugAssert
1226	1226	" MOV R0, R4\n"
1227	1227	// " BL sub_FF9A010C\n" //--
…	…
1236	1236	" LDMNEFD SP!, {R4-R6,LR}\n"
1237	1237	" LDRNE R0, =0xFF888D10\n" //aShutter_c
1238		" BNE 0xFF81B284\n" //DebugAssert
	1238	" BNE =0xFF81B284\n" //DebugAssert
1239	1239	" LDMFD SP!, {R4-R6,PC}\n"
1240	1240	);

trunk/platform/ixus100_sd780/wrappers.c

r876	r955
18	18	}
19	19
20		//VERIFY_SD780 Only one arg?
21		long OpLog_Get(long i)
22		{
23		return _OpLog_Get(i);
24		}
	20	// VERIFY_SD780 Only one arg? - unknown
	21	// I dared to comment it out, because it produced
	22	// a warning, but is not called anywhere - ultimA
	23	//long OpLog_Get(long i)
	24	//{
	25	// return _OpLog_Get(i);
	26	//}

trunk/platform/ixus40_sd300/kbd.c

r515	r955
43	43	} SEM_B_STATE;
44	44
45		typedef void *SEM_ID;
	45	typedef int SEM_ID;
46	46	extern SEM_ID _semBCreate(int options, SEM_B_STATE initialState);
47	47	extern STATUS _TakeSemaphore(SEM_ID, int);

trunk/platform/ixus60_sd600/kbd.c

r515	r955
3	3	#include "core.h"
4	4	#include "keyboard.h"
	5	#include "stdlib.h"
5	6
6	7	#define KEY_MASK 0x17FF

trunk/platform/ixus65_sd630/kbd.c

r515	r955
3	3	#include "core.h"
4	4	#include "keyboard.h"
	5	#include "stdlib.h"
5	6
6	7	#define KEY_MASK 0x17FF

trunk/platform/ixus65_sd630/sub/100a/lib.c

r820	r955
40	40	void *vid_get_viewport_fb_d()
41	41	{
42		return 0x104AFCA0;
	42	return (void*)0x104AFCA0;
43	43	//return (void)((int*));
44	44	}

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

r750	r955
2	2	#include "platform.h"
3	3	#include "core.h"
	4	#include "stdlib.h"
4	5
5	6	const char * const new_sa = &_end;

trunk/platform/s5is/sub/101b/boot.c

r750	r955
2	2	#include "platform.h"
3	3	#include "core.h"
	4	#include "stdlib.h"
4	5
5	6	const char * const new_sa = &_end;

Context Navigation

Changeset 955

Legend:

Download in other formats: