Some code rearrangement and function renaming to help incorporation into rbutil without clashing with ipodpatcher.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12797 a1c6a512-1295-4272-9138-f99709370657
3 files changed