summaryrefslogtreecommitdiffstats
path: root/utils/ypr0tools
diff options
context:
space:
mode:
authorLorenzo Miori <memoryS60@gmail.com>2013-09-11 22:42:59 +0200
committerThomas Martitz <kugel@rockbox.org>2013-09-11 23:08:37 +0200
commit5ef1e2dcfa2845d7196223af2e170798f7621df6 (patch)
treebf33c9260e3fac5f7ee55baf19eafbf03528cac1 /utils/ypr0tools
parent743a6d0a5741bc0d4ef5ccc1c2e59ba8736c711e (diff)
downloadrockbox-5ef1e2dcfa2845d7196223af2e170798f7621df6.tar.gz
rockbox-5ef1e2dcfa2845d7196223af2e170798f7621df6.tar.bz2
rockbox-5ef1e2dcfa2845d7196223af2e170798f7621df6.zip
ypr0-ypr1 firmware tools fix
fixed a bug concerning bytes padding, since it wasn't correctly implemented regarding original firmware structure. This fixes ROM generation especially for ypr1. Change-Id: I1a40fb4bb8f9d6b005d694246123e314c4d19b49 Reviewed-on: http://gerrit.rockbox.org/616 Reviewed-by: Thomas Martitz <kugel@rockbox.org>
Diffstat (limited to 'utils/ypr0tools')
-rw-r--r--utils/ypr0tools/fwcrypt.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/utils/ypr0tools/fwcrypt.c b/utils/ypr0tools/fwcrypt.c
index e99d8872ba..feeff26bdc 100644
--- a/utils/ypr0tools/fwcrypt.c
+++ b/utils/ypr0tools/fwcrypt.c
@@ -47,6 +47,15 @@ static void die(int error)
exit(error);
}
+static void pad4byte(char byte, FILE* handle) {
+ int padding = 4 - ftell(handle) % 4;
+ if (padding != 4) {
+ while (padding-- > 0) {
+ fwrite(&byte, 1, 1, handle);
+ }
+ }
+}
+
int main(int argc, char **argv)
{
FILE* component_handle = NULL;
@@ -136,6 +145,9 @@ int main(int argc, char **argv)
}
}
+ /* Padding */
+ pad4byte('\n', output_file);
+
/* write final data to the firmware file */
for (int i = 0; i < YPR0_COMPONENTS_COUNT; i++)
{
@@ -162,7 +174,7 @@ int main(int argc, char **argv)
}
/* padding */
if (i < (YPR0_COMPONENTS_COUNT-1))
- fputs("\0\0\0\0", output_file);
+ pad4byte('\0', output_file);
}
/* free the big amount of memory and close handles */