Commit graph

23690 commits

Author SHA1 Message Date
Rafaël Carré
b6c20c17e4 mkamsboot: prevents 2 potential problems
We checked if the new firmware block (bootloader+ucl function+packed
bootloader & OF) fit in the OF file, but not if it would run properly.

For example the Clipv2 OF is bigger than 0x50000 bytes uncompressed, but
it fitted in this space when packed and concatenated to a packed
bootloader + ucl function and dualboot code (but we use 1MB of RAM and
not 0x50000 anyway).

Now we check that both bootloader and OF are small enough to be unpacked
at runtime: the unpacked data must be smaller than available memory and
not overlap with ucl function and packed data (although the unpacked and
packed data could probably overlap a bit, I don't know how to calculate
this and this could be quite complex).

total_size() is replaced by check_sizes() which will perform all the
checks and set an error string if the firmware can't be patched.
(both mkamsboot and rbutilqt modified accordingly)

The second problem is that dualboot.S assumed r3 and r5 were left
untouched in the device specific checks. This was undocumented and very
error prone when modifying these checks.

r3 is the last byte of packed copy (bootloader or OF)
r5 is the entry point of uclunpack function derived from r3, so move r5
calculation after the device specific code.

Even if r3 is currently unused in the device specific code, we store it
in memory after copying the ucl function, when it points to the last byte
of packed data (not yet copied at this point since we didn't chose if we
boot the OF or the bootloader), and restore it just before using it so no
restriction is placed on registers usage in device specific code.

Add a new variable ucl_dest in dualboot.S set by mkamsboot.c, which
represents the last bound of buffer where we copy the ucl function, and
then the packed data (bootloader or OF).

RAM_SIZE definition is moved from dualboot.S to mkamsboot.c new
model_memory_size(), where it is a bit better documented.

Tested on e200v2 and Clip+

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24772 a1c6a512-1295-4272-9138-f99709370657
2010-02-19 14:10:26 +00:00
Tomer Shalev
5bae969a3e Brickmania: Use defines for score values
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24771 a1c6a512-1295-4272-9138-f99709370657
2010-02-19 12:52:31 +00:00
Björn Stenberg
b4f6c6ffba Tweaked dependencies a bit
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24770 a1c6a512-1295-4272-9138-f99709370657
2010-02-19 08:09:41 +00:00
Tomer Shalev
320eab69d3 Brickmania: Remove spaces at the end of line
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24769 a1c6a512-1295-4272-9138-f99709370657
2010-02-19 07:36:56 +00:00
Tomer Shalev
ac9f850b7d Brickmania: Forgotten one more hard-coded value
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24768 a1c6a512-1295-4272-9138-f99709370657
2010-02-19 07:35:47 +00:00
Tomer Shalev
804f67b8ce Brickmania: Use constant for default value and rename variable of flip-sides delay
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24767 a1c6a512-1295-4272-9138-f99709370657
2010-02-19 07:32:27 +00:00
Tomer Shalev
a745fab8ce Brickmania: Use constants for number of bricks rows and columns, and for number of levels
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24766 a1c6a512-1295-4272-9138-f99709370657
2010-02-19 07:28:49 +00:00
Rafaël Carré
75919d5f3d Revert r24763 : LIBOBJS is already included in OBJS
The problem seems related to dependency on a directory

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24765 a1c6a512-1295-4272-9138-f99709370657
2010-02-19 07:16:51 +00:00
Tomer Shalev
9d8e07a3fc Brickmania: Use constant for number of fires
Part of FS#10485 by Asael Reiter


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24764 a1c6a512-1295-4272-9138-f99709370657
2010-02-19 07:16:09 +00:00
Rafaël Carré
a63b225a14 mkamsboot binary depends on the same object files than libmkamsboot
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24763 a1c6a512-1295-4272-9138-f99709370657
2010-02-19 07:05:39 +00:00
Tomer Shalev
a37e43cfba Move sample.emacs to utils/editors
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24762 a1c6a512-1295-4272-9138-f99709370657
2010-02-18 23:32:08 +00:00
Tomer Shalev
74c5033699 wps.vim : Syntax for Rockbox WPS
Author: Kevin Schoedel

Including wps.vim from http://www.vim.org/scripts/script.php?script_id=2550
(which now becomes obsolete), following the following e-mail from the author:

Hi,
Yes, please do -- I am not doing anything with WPS now and might never again.
Take it as GPL or whatever else is convenient. I'll put a note on the vim.org
page that the version there is obsolete.
Regards,
Kevin Schoedel


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24761 a1c6a512-1295-4272-9138-f99709370657
2010-02-18 23:31:37 +00:00
Tomer Shalev
9af97e74b9 Have /utils/editors to contain syntax files for WPS and possibly others Rockbox
specific file types

Currently it contains only Emacs style for WPS, but a request was sent to the
author of the Vim's WPS style file at
http://www.vim.org/scripts/script.php?script_id=2550

Developers, please add your own files.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24760 a1c6a512-1295-4272-9138-f99709370657
2010-02-18 22:42:11 +00:00
Tomer Shalev
f3e0275671 Brickmania: Test returned value of file operations
This doesn't solve FS#11031, but it's a good practice to test returned values nevertheless.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24759 a1c6a512-1295-4272-9138-f99709370657
2010-02-18 22:01:40 +00:00
Dominik Wenger
963fdc340b rbutil: fix voice downloads.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24758 a1c6a512-1295-4272-9138-f99709370657
2010-02-18 19:47:09 +00:00
Thomas Martitz
4c78ecaa5e Hopefully fix yellow now, I don't understand why %ld works for ssize_t but %lu not for size_t (and still no warnings on my system).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24757 a1c6a512-1295-4272-9138-f99709370657
2010-02-18 17:43:55 +00:00
Thomas Martitz
81187d88fd Fix yellow caused by signedness.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24756 a1c6a512-1295-4272-9138-f99709370657
2010-02-18 17:19:10 +00:00
Thomas Martitz
df79ac2f9d Fix FS#11004 - Buffering crashes when skipping back from end of song.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24755 a1c6a512-1295-4272-9138-f99709370657
2010-02-18 15:38:30 +00:00
Teruaki Kawashima
c4eea8f11f FS#10535: bmp viewer plugin.
* changed bmp.c so that it loads bitmap larger than LCD correctly.
* removed bmp entry form inbuilt_filetypes in filetypes.c so that bmp files will be opened with bmp viewer when selected in browser.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24754 a1c6a512-1295-4272-9138-f99709370657
2010-02-18 15:10:31 +00:00
Yoshihisa Uchida
2a4bbde44e Add myself to the commiters list
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24752 a1c6a512-1295-4272-9138-f99709370657
2010-02-18 11:46:18 +00:00
Björn Stenberg
c6f2a90635 Added Packard Bell Vibe 500 to build list.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24748 a1c6a512-1295-4272-9138-f99709370657
2010-02-18 10:30:00 +00:00
Jonathan Gordon
45a181d8fc allow integer sound settings (bass, volume, etc) to be used with conditional %St. "%?St|name|<min|min+1|...|max-1|max>"
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24745 a1c6a512-1295-4272-9138-f99709370657
2010-02-18 07:04:16 +00:00
Jonathan Gordon
55b21c104f NULL check so it doesnt display (null) on the comment line
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24744 a1c6a512-1295-4272-9138-f99709370657
2010-02-18 05:50:44 +00:00
Jonathan Gordon
c647e62c30 bandaid fix for FS#11033 where a really long comment crashes. Real fix is figuring out why the scroll engine doesnt handle this properly (I give up though)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24743 a1c6a512-1295-4272-9138-f99709370657
2010-02-18 05:43:51 +00:00
Michael Giacomelli
aea6dd036c Commit FS#11034 by Andrew Engelbrecht. Fixes default contrast value on ipod 3G.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24742 a1c6a512-1295-4272-9138-f99709370657
2010-02-18 04:21:15 +00:00
Jonathan Gordon
7dfd594cca fix yellow
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24741 a1c6a512-1295-4272-9138-f99709370657
2010-02-18 02:37:58 +00:00
Jonathan Gordon
3cb735ef39 basic alignment support (%a|l|c|r|L|R) in the playlist viewer. no sublines so the whole line will either be left, right or centered.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24740 a1c6a512-1295-4272-9138-f99709370657
2010-02-18 01:52:13 +00:00
Dave Hooper
3a9852be1c I don't yet fully understand why this is required, but without it the output is signed-inverted (compared to e.g. the output of oggdec). ac3 confirmed to be ok so the problem must be in the imdct not the ifft. but the algo seems correct (in that seems same as original ffmpeg version)..
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24739 a1c6a512-1295-4272-9138-f99709370657
2010-02-18 00:14:13 +00:00
Rafaël Carré
8b4ee2cfdd as3525: make clear the CCU bit we can't reset is the IDE interface
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24738 a1c6a512-1295-4272-9138-f99709370657
2010-02-17 23:27:35 +00:00
Rafaël Carré
9f228d7662 as3525v2: use CGU_BASE instead of hardcoded address for unknown register
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24737 a1c6a512-1295-4272-9138-f99709370657
2010-02-17 23:27:31 +00:00
Rafaël Carré
04fef58210 as3525v2: make clear the SD code is debug only and display a message
comment out printing of registers in the isr

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24736 a1c6a512-1295-4272-9138-f99709370657
2010-02-17 23:09:56 +00:00
Frank Gevaerts
afa04b12d9 Make checkwps compile again for the player. If we had proper multifont on charcell this would never have happened
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24735 a1c6a512-1295-4272-9138-f99709370657
2010-02-17 23:08:25 +00:00
Frank Gevaerts
07a5bf967a Initialuse user font table for checkwps. This is normally done from the settings code, which isn't run in this case
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24734 a1c6a512-1295-4272-9138-f99709370657
2010-02-17 22:59:34 +00:00
Tomer Shalev
658bd7b912 Touchscreen: Yet another WPS keymap tweak
- WPS --> Playlist:         Touch bottom right
- WPS --> ID3 screen:       Touch long bottom right
- WPS --> Recording screen: Touch long top left


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24733 a1c6a512-1295-4272-9138-f99709370657
2010-02-17 21:01:31 +00:00
Andree Buschmann
a20d3fa3a4 Allow batteries with higher capacity for iPod Mini1G, Mini2G and Video (FS#8973).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24732 a1c6a512-1295-4272-9138-f99709370657
2010-02-17 20:46:22 +00:00
Rafaël Carré
9668883bac Sansa Clip+: simulator
Add the Clipv1 bitmap for Clipv2 so it builds

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24731 a1c6a512-1295-4272-9138-f99709370657
2010-02-17 19:46:51 +00:00
Amaury Pouly
eb54ede182 Fix error handling in dircache generation.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24730 a1c6a512-1295-4272-9138-f99709370657
2010-02-17 19:31:07 +00:00
Rafaël Carré
020322665b Clip+: LCD display (with FlynDice help)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24729 a1c6a512-1295-4272-9138-f99709370657
2010-02-17 18:43:13 +00:00
Szymon Dziok
d3d29edbf3 Packard Bell Vibe 500: add RTC alarm.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24728 a1c6a512-1295-4272-9138-f99709370657
2010-02-17 18:42:19 +00:00
Rafaël Carré
40e833af5f Clip+ remove setting GPIOB PIN0, it seems needed only for power
Also only use 0x50000 bytes of memory since the files just fit in.
TODO: make mkamsboot abort if the decompressed OF or bootloader doesn't
fit in RAM / or overlap on compressed data or uclunpack function

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24727 a1c6a512-1295-4272-9138-f99709370657
2010-02-17 18:27:50 +00:00
Szymon Dziok
b4e1cae3d6 Packard Bell Vibe 500: Full RTC support.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24726 a1c6a512-1295-4272-9138-f99709370657
2010-02-17 18:18:20 +00:00
Michael Sparmann
9ba7cff6c1 Reduce Nano2G main thread stack size to the default value again. The huge sector buffers of the FTL have been moved to the bss some time ago, so this isn't needed any more.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24725 a1c6a512-1295-4272-9138-f99709370657
2010-02-17 16:31:19 +00:00
Michael Sparmann
04ea85fb88 Revert accidental changes from r24723
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24724 a1c6a512-1295-4272-9138-f99709370657
2010-02-17 16:12:21 +00:00
Michael Sparmann
e5c815272d Add more information to the battery debug screen for Nano2G
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24723 a1c6a512-1295-4272-9138-f99709370657
2010-02-17 15:57:53 +00:00
Michael Sparmann
b3c18aeb4d Somewhat calibrated battery parameters for Nano2G - still not very accurate though, especially while charging.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24722 a1c6a512-1295-4272-9138-f99709370657
2010-02-17 15:56:30 +00:00
Michael Sparmann
8f33879fed Enable iPod Nano 2G boosting (without undervolting for now)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24721 a1c6a512-1295-4272-9138-f99709370657
2010-02-17 15:54:48 +00:00
Michael Sparmann
48e38b8759 Increase iPod Nano2G NAND stack size (fixes FS#11030)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24720 a1c6a512-1295-4272-9138-f99709370657
2010-02-17 15:49:19 +00:00
Rafaël Carré
7c8dbf46a8 mkamsboot: update dualboot.c / dualboot.h in place
This removes the need for copying these files to ../ and removes the
risk of only copying one of the files (which led to bricking 2 c200v2
already)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24719 a1c6a512-1295-4272-9138-f99709370657
2010-02-17 14:37:06 +00:00
Teruaki Kawashima
35fa12d85f playlist catalog: improve UTF-8 BOM handling. correct length of array passed to create_playlist_list.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24718 a1c6a512-1295-4272-9138-f99709370657
2010-02-17 14:14:24 +00:00
Jonathan Gordon
f7ba156b27 change the %St tag so it only shows the filename of file settings, not the full path (i.e cabbiev2 instead of /.rockbox/wps/cabbiev2.wps)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24717 a1c6a512-1295-4272-9138-f99709370657
2010-02-17 07:17:06 +00:00