Adding new cameras, applying patches into trunk (with source code prepared)

philmoz

3070

Re: Adding new cameras, applying patches into trunk (with source code prepared)

« Reply #120 on: 05 / January / 2011, 03:57:56 »

Advertisements

Minor update for SX30 & G12.
- Cleaned up the image offset code.
- minor bug fixes and corrected address for exmem_alloc
- moved SCREEN_COLOR define into gui_draw.h so it can be easily overridden (found in five places and default value was white on the SX30 and G12).
- added some defines configured in makefile.inc so that gui_debug_draw_values can be used to show memory properly (was hard wired to VX addresses).

Phil.

sx30_g12_patch9_chgset1023.patch (21.23 kB - downloaded 105 times.)

Logged

CHDK ports:
sx30is (1.00c, 1.00h, 1.00l, 1.00n & 1.00p)
g12 (1.00c, 1.00e, 1.00f & 1.00g)
sx130is (1.01d & 1.01f)
ixus310hs (1.00a & 1.01a)
sx40hs (1.00d, 1.00g & 1.00i)
g1x (1.00e, 1.00f & 1.00g)

reyalp

11514

Re: Adding new cameras, applying patches into trunk (with source code prepared)

« Reply #121 on: 06 / January / 2011, 23:30:28 »

Added, changeset 2^10. I didn't add pb2rec and rec2pb for g12 to stubs_entry_2.s, since the same addresses are found by finsig.

I actually had something else in mind for the image offset code (add the offset outside the loops, like chdkde) but that's OK.

Logged

Don't forget what the H stands for.

reyalp

11514

Re: Adding new cameras, applying patches into trunk (with source code prepared)

« Reply #122 on: 07 / January / 2011, 01:00:00 »

Note

Code: [Select]

# Misc (only used in ARM code so do not need stub)
DEF(_DebugAssert,      0xFF81EB78) // ok (comp 1.00c)
DEF(_PT_GetPropertyCaseString,   0xFF8954F0) // ok (comp 1.00c)

This compiles on some compilers (not the one on the autobuild server, apparently), but it doesn't work.

These addresses are too far away for a B/BL from RAM. It's another instances of the B <address> mistake in http://chdk.wikia.com/wiki/CHDK_Coding_Guidelines#Calling_original_ROM_functions

You need a stub to get from RAM to ROM.

Logged

Don't forget what the H stands for.

waldo

Re: Adding new cameras, applying patches into trunk (with source code prepared)

« Reply #123 on: 15 / January / 2011, 18:05:47 »

I'm trying to use diff to create a patch file. Is there a command-line option for outputting relative directory paths like the patches I get from tools.assembla.com rather than the absolute paths that it generates?

Logged

reyalp

11514

Re: Adding new cameras, applying patches into trunk (with source code prepared)

« Reply #124 on: 15 / January / 2011, 18:35:39 »

Quote from: waldo on 15 / January / 2011, 18:05:47

I'm trying to use diff to create a patch file. Is there a command-line option for outputting relative directory paths like the patches I get from tools.assembla.com rather than the absolute paths that it generates?

I'm not sure which 'diff' you are talking about (svn, gnu, other) but the person applying the patch can always use -p N to remove N leading path elements.

svn diff produces relative paths by default. SVN diff is preferred for CHDK patches (as long as they are against our SVN) because they include the revision numbers which helps dealing with conflicts.

Logged

Don't forget what the H stands for.

waldo

Re: Adding new cameras, applying patches into trunk (with source code prepared)

« Reply #125 on: 15 / January / 2011, 21:50:45 »

Below, I have posted a link to a complete version 1043 release with the changes for the S95. Perhaps someone more comfortable with the patching process could merge this into the trunk. Thanks.

http://www.zshare.net/download/8529240391496f6b/

Logged

reyalp

11514

Re: Adding new cameras, applying patches into trunk (with source code prepared)

« Reply #126 on: 15 / January / 2011, 22:17:45 »

Quote from: waldo on 15 / January / 2011, 21:50:45

Below, I have posted a link to a complete version 1043 release with the changes for the S95. Perhaps someone more comfortable with the patching process could merge this into the trunk. Thanks.

http://www.zshare.net/download/8529240391496f6b/

This is definitely NOT the preferred format for submissions

Logged

Don't forget what the H stands for.

waterwingz

11578

Re: Adding new cameras, applying patches into trunk (with source code prepared)

« Reply #127 on: 25 / January / 2011, 23:49:21 »

IXUS120-SD940
First attempt at a TortoiseSVN patch file Used TortoiseSVN to create a local repository and downloaded trunk1053. Modified those files to match the IXUS120_SD940 Beta 6 build and then had TortoiseSVN create a patch file. Does this look right? Can this be used to add the Beta version of the IXUS120_SD940 to the core trunk?

TIA.

Update : whoops - changes to core/conf.c need #if defined(CAMERA_ixus120_sd940) around them. Reposted - but there should probably be a better way to change the Mode set key default though ?

« Last Edit: 01 / February / 2011, 22:42:21 by waterwingz »

Logged

Ported : A1200 SD940 G10 Powershot N G16

reyalp

11514

Re: Adding new cameras, applying patches into trunk (with source code prepared)

« Reply #128 on: 26 / January / 2011, 01:46:34 »

waterwingz
The patch looks ok (haven't looked at the code). My time will be very limited for the next couple weeks, so I may not get to this or any other large submissions for a while.

re conf.c
Yes, it would be better to have the default alt key defined some other way.

Logged

Don't forget what the H stands for.

waterwingz

11578

Re: Adding new cameras, applying patches into trunk (with source code prepared)

« Reply #129 on: 26 / January / 2011, 06:17:17 »

Quote from: reyalp on 26 / January / 2011, 01:46:34

re conf.c
Yes, it would be better to have the default alt key defined some other way.

Thanks - now that I'm comfortable with the release mechanism, I'll use the time to clean-up the default settings for CCHDK.CFG a bit, remove my patch to conf.c and do some testing to assure that I can apply the patch file to a clean download and compile to get a working release. Let me know if you get some time sooner but otherwise assume I'm not ready to complete the release until I post an update ?

Logged

Ported : A1200 SD940 G10 Powershot N G16