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

reyalp

14082

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

« Reply #170 on: 27 / March / 2011, 01:12:42 »

Advertisements

Added, changesets 1110-1113

It's ok if you don't break them up quite this much, all of these seemed related (zoom issues specific to these two cameras) and reasonable simple.

Probably seems like I'm never satisfied

... actually I'm still figuring out what works best for me. The main thing I like to avoid is <something complicated I have to think about> + <some other unrelated stuff>. Of course, "complicated" and "unrelated" are subjective.

Thanks for all your contributions.

Logged

Don't forget what the H stands for.

philmoz

3450

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

« Reply #171 on: 01 / April / 2011, 03:49:09 »

Patch to cleanup 'inline' file I/O functions from stdlib.h.
Since inline optimisation is turned off this was causing multiple instances of each function to be generated.
Functions moved to platform/generic/wrappers.c since they were all simple wrappers for firmware code (except ftell which is in core/main.c).

stdlib_inline_functions.patch (4.91 kB - downloaded 85 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)
g5x (1.00c, 1.01a, 1.01b)
g7x2 (1.01a, 1.01b, 1.10b)

reyalp

14082

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

« Reply #172 on: 01 / April / 2011, 22:48:28 »

Quote from: philmoz on 01 / April / 2011, 03:49:09

Patch to cleanup 'inline' file I/O functions from stdlib.h.
Since inline optimisation is turned off this was causing multiple instances of each function to be generated.
Functions moved to platform/generic/wrappers.c since they were all simple wrappers for firmware code (except ftell which is in core/main.c).

Added, changeset 1119

Logged

Don't forget what the H stands for.

philmoz

3450

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

« Reply #173 on: 02 / April / 2011, 00:40:36 »

Some more cleanup of the file I/O functions.
- mkdir, rename & remove now use the _Fut firmware functions (required for lua). FS_USE_FUT define no longer needed.
- All file I/O wrappers moved to platform/generic/wrappers.c. Direct calls to file I/O firmware code removed from raw.c.
- Re-org, and some cleanup of platform/generic/wrappers.c

Phil.

stdlib_inline_functions2.patch (15.7 kB - downloaded 88 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)
g5x (1.00c, 1.01a, 1.01b)
g7x2 (1.01a, 1.01b, 1.10b)

reyalp

14082

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

« Reply #174 on: 02 / April / 2011, 02:27:05 »

Quote from: philmoz on 02 / April / 2011, 00:40:36

Some more cleanup of the file I/O functions.
- mkdir, rename & remove now use the _Fut firmware functions (required for lua). FS_USE_FUT define no longer needed.
- All file I/O wrappers moved to platform/generic/wrappers.c. Direct calls to file I/O firmware code removed from raw.c.
- Re-org, and some cleanup of platform/generic/wrappers.c

Phil.

Added, changeset 1122. I removed fdelete completely, since it's the same as remove() remove now.

Logged

Don't forget what the H stands for.

philmoz

3450

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

« Reply #175 on: 02 / April / 2011, 18:55:55 »

Small patch for G12 & SX30 - found the rand & srand functions in the firmware,

sx30_g12_patch21_rand.patch (7.43 kB - downloaded 116 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)
g5x (1.00c, 1.01a, 1.01b)
g7x2 (1.01a, 1.01b, 1.10b)

philmoz

3450

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

« Reply #176 on: 02 / April / 2011, 19:22:13 »

G12 & SX30 patch for loading CHDK into EXMEM allocated memory.
This includes a new option to enable the feature, plus an option to enable exmem test code (see wrappers.c & gui.c).
I've moved the values for the exmem block size and video buffer skip value from camera.h to the platformsub/makefile.inc file (this seems more consistent with other things like MEMISOSTART). These values are also needed to calculate the new MEMISOSTART for loading CHDK into exmem.

This should still be considered 'experimental'; but so far seems very stable on both G12 and SX30.

Edit
Changes to suba.c were also made in this patch:
- Removed code and variables that were not being used by CHDK (makes it smaller and simpler). This was related to supplying custom functions for the allocator and also to implement 'reclaim' logic if it ran out of memory. This would be used in more complex allocation systems (might be useful in future to merge Canon memory heap with exmem heap so you could use both).
- Added a new function 'suba_largest_block' that returns the size of the largest free memory block in the free list. This is called from 'core_get_free_memory' (main,c) to get the free memory value rather than allocating and freeing decreasing sized blocks.

Phil.

sx30_g12_patch22_exmem.patch (20.22 kB - downloaded 77 times.)

« Last Edit: 02 / April / 2011, 21:46:08 by philmoz »

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)
g5x (1.00c, 1.01a, 1.01b)
g7x2 (1.01a, 1.01b, 1.10b)

reyalp

14082

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

« Reply #177 on: 02 / April / 2011, 21:09:24 »

Quote from: philmoz on 02 / April / 2011, 18:55:55

Small patch for G12 & SX30 - found the rand & srand functions in the firmware,

Added changeset 1123. If someone wants to look into adding these to the sig finder, that might help other cameras.

Quote from: philmoz on 02 / April / 2011, 19:22:13

G12 & SX30 patch for loading CHDK into EXMEM allocated memory.

Very nice. Added in changeset 1124

Could you explain the changes in suba.c ?

Logged

Don't forget what the H stands for.

philmoz

3450

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

« Reply #178 on: 02 / April / 2011, 21:46:58 »

Quote from: reyalp on 02 / April / 2011, 21:09:24

Could you explain the changes in suba.c ?

Added details to the patch post.

Phil.

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)
g5x (1.00c, 1.01a, 1.01b)
g7x2 (1.01a, 1.01b, 1.10b)

philmoz

3450

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

« Reply #179 on: 02 / April / 2011, 21:55:05 »

Patch to cleanup font handling:
- allocate font memory in a single block instead of a small chunk for each character in the font (uses less memory and avoids fragmentation).
- cleaned up code in rbf_font.c for font loading (merged two similar functions).
- fixed problem with 'Visual Settings -> Reset Files' menu option that would erase the symbol font file instead of resetting it back to the default value, causing symbols to vanish (gui.c, conf.c, conf.h).

rbf_font_cleanup.patch (10.86 kB - downloaded 77 times.)

« Last Edit: 02 / April / 2011, 22:39:48 by philmoz »

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)
g5x (1.00c, 1.01a, 1.01b)
g7x2 (1.01a, 1.01b, 1.10b)