Rockbox

It seems you forgot to include in the patch the scrolling.c file you just created. This is probably because you used “cvs diff” on a tree with non-yet-added cvs files (see first line of your .diff

Doh! I spent ages fighting with cvs over that misfeature and then I manage to upload the wrong file.
Here’s the correct diff with scrolling.c included.

   correct_patch.diff (39.8 KiB)

OK, I managed to leave some junk in a function declaration. Here’s a new patch.

   correct_patch2.diff (39.8 KiB)

quick attempt to merge the bits of the lcd drivers which wernt done last week.
untested because stupid gcc complains about no sysfont.h with this, hopefully someone else has more luck

   lcd_update.diff (23.1 KiB)

Jonathan?

forgot about this one…

something causes sysfont.h to not be created…

The problem isn’t really with sysfont.h. The problem is your change in firmware/SOURCES. The added line should be ‘drivers/lcd-generic.c’. For some reason, whenever a file from SOURCES doesn’t exist, we get an error about sysont.h not being created instead of an error about the missing file.

I made the change to firmware/SOURCES, but there are a load of errors in compiling lcd-generic.c so I didn’t go any further with testing it.

Edit: I’ve opened a task for the sysfont.h problem and added it as a related task here.

doh, thanks Barry.

here is a partial sync.. it now compiles fine on 16 bit non-lcd-remote targets.. if this is wanted the rest of the lcd targets can be fixed up also

   lcd_update.diff (25.7 KiB)

This is more of a rewrite than a resync, moving pretty much all of the text drawing code into a new lcd-bitmap-common.c, merging the styled text draw code used by puts_style_offset and puts_scroll_style_offset, and merging lcd_gradient_rect and lcd_gradient_rect_scroll. There are binsize savings on the order of 500-600B on color targets, with smaller or no improvement on greyscale targets. I also have a version in a branch which avoids including lcd-bitmap-common.c, but this is more invasive (because the viewports must be made non-static, and therefore must have unique names between main and remote) and causes binsize increase on some targets compared to this version (probably because of long calls).
EDIT: new diff, previous one missed the new file

   lcd-bitmap-common-20090718072... (51.2 KiB)

Updated, mostly just line-length fixes

   lcd-bitmap-common-20090724004... (51.5 KiB)