Rockbox

fixed gigabeats. Use bootdir for MI4 format and gigabeat-s as well in some printf’s.

forgot to attach

   bootdir-in-bootloaderv2.diff (2.7 KiB)

fix mi4

   bootdir-in-bootloader-v2b.diff (2.7 KiB)

fix one more printf

   bootdir-in-bootloader-v2c.diff (3.2 KiB)

grml, what a mess. Fix mi4 again. That happens if you fix it the first time by only editing the diff and not the actual file :/

   bootdir-in-bootloader-v2d.diff (3.2 KiB)

- printf(”Can’t load rockbox.ipod:”);
+ printf(”Can’t load %s:”, BOOTFILE);

could be done simpler as
printf(”Can’t load " BOOTFILE “:”);

How’s that simpler? It’s just your preference.

It doesn’t require run-time evaluation and replacement of the format string. It’s not just my preference, though it’s debatable if it’s worth the change (though it’s also debatable if moving the string constants to defines is worth it in this limited scope). You could even use puts() with that string instead. Oh, and your version stores two strings, thus two terminating \0 while the concatenated string only stores one.

Seems you used the past hours to collect arguments for this text :)

Anyway. I’ll change it (if you don’t do it, it’s one line where you can even edit the diff). You’re probably right, doing that at compile time would be better. (and I don’t care about either way that much as I already said sometimes).

Still not my definition of simpler. More effective, indeed. But imho not really simpler.

BTW: Regarding doing stuff at compile time. Wouldn’t it also make sense to remove the filename argument of load_firmware and insert BOOTFILE in those snprintfs too?

fix mentioned issues.

What do you think about the BOOTFILE thing?

   bootdir-in-bootloader-v2e.diff (3.2 KiB)

final version, only some whitespaces changed

   bootdir-in-bootloader-v3.diff (3.2 KiB)

haha ok, one more. Fixed some more printfs using the method bluebrother proposed.

   bootdir-in-bootloader-v3b.diff (3.8 KiB)