diff options
author | Amaury Pouly <pamaury@rockbox.org> | 2011-11-01 11:26:16 +0000 |
---|---|---|
committer | Amaury Pouly <pamaury@rockbox.org> | 2011-11-01 11:26:16 +0000 |
commit | dd0fffe50fc8ecadcb26b7551ee57afa8c7c30db (patch) | |
tree | 302416fb733c484aac65f99d0613b491c1a32b4e /utils/sbtools/sb.c | |
parent | e36471df9cfb3fa7aaa2216d9b5c79cb775bf9da (diff) | |
download | rockbox-dd0fffe50fc8ecadcb26b7551ee57afa8c7c30db.tar.gz rockbox-dd0fffe50fc8ecadcb26b7551ee57afa8c7c30db.zip |
sbtoos: restore elf extraction functionality of sbtoelf
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30882 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils/sbtools/sb.c')
-rw-r--r-- | utils/sbtools/sb.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/utils/sbtools/sb.c b/utils/sbtools/sb.c index 99f953600d..d620c00f42 100644 --- a/utils/sbtools/sb.c +++ b/utils/sbtools/sb.c | |||
@@ -571,7 +571,7 @@ static struct sb_section_t *read_section(bool data_sec, uint32_t id, byte *buf, | |||
571 | #undef printf | 571 | #undef printf |
572 | } | 572 | } |
573 | 573 | ||
574 | static void fill_section_name(char name[5], uint32_t identifier) | 574 | void sb_fill_section_name(char name[5], uint32_t identifier) |
575 | { | 575 | { |
576 | name[0] = (identifier >> 24) & 0xff; | 576 | name[0] = (identifier >> 24) & 0xff; |
577 | name[1] = (identifier >> 16) & 0xff; | 577 | name[1] = (identifier >> 16) & 0xff; |
@@ -773,7 +773,7 @@ struct sb_file_t *sb_read_file(const char *filename, bool raw_mode, void *u, | |||
773 | struct crypto_key_t k; | 773 | struct crypto_key_t k; |
774 | char *env = getenv("SB_REAL_KEY"); | 774 | char *env = getenv("SB_REAL_KEY"); |
775 | if(!parse_key(&env, &k) || *env) | 775 | if(!parse_key(&env, &k) || *env) |
776 | bug("Invalid SB_REAL_KEY"); | 776 | bug("Invalid SB_REAL_KEY\n"); |
777 | memcpy(real_key, k.u.key, 16); | 777 | memcpy(real_key, k.u.key, 16); |
778 | } | 778 | } |
779 | 779 | ||
@@ -801,7 +801,7 @@ struct sb_file_t *sb_read_file(const char *filename, bool raw_mode, void *u, | |||
801 | struct sb_section_header_t *sec_hdr = (struct sb_section_header_t *)&buf[ofs]; | 801 | struct sb_section_header_t *sec_hdr = (struct sb_section_header_t *)&buf[ofs]; |
802 | 802 | ||
803 | char name[5]; | 803 | char name[5]; |
804 | fill_section_name(name, sec_hdr->identifier); | 804 | sb_fill_section_name(name, sec_hdr->identifier); |
805 | int pos = sec_hdr->offset * BLOCK_SIZE; | 805 | int pos = sec_hdr->offset * BLOCK_SIZE; |
806 | int size = sec_hdr->size * BLOCK_SIZE; | 806 | int size = sec_hdr->size * BLOCK_SIZE; |
807 | int data_sec = !(sec_hdr->flags & SECTION_BOOTABLE); | 807 | int data_sec = !(sec_hdr->flags & SECTION_BOOTABLE); |
@@ -889,7 +889,7 @@ struct sb_file_t *sb_read_file(const char *filename, bool raw_mode, void *u, | |||
889 | offset += sizeof(struct sb_instruction_tag_t); | 889 | offset += sizeof(struct sb_instruction_tag_t); |
890 | 890 | ||
891 | char name[5]; | 891 | char name[5]; |
892 | fill_section_name(name, tag->identifier); | 892 | sb_fill_section_name(name, tag->identifier); |
893 | int pos = offset; | 893 | int pos = offset; |
894 | int size = tag->len * BLOCK_SIZE; | 894 | int size = tag->len * BLOCK_SIZE; |
895 | int data_sec = !(tag->flags & SECTION_BOOTABLE); | 895 | int data_sec = !(tag->flags & SECTION_BOOTABLE); |
@@ -1004,7 +1004,7 @@ void sb_dump(struct sb_file_t *file, void *u, sb_color_printf cprintf) | |||
1004 | printf(TREE, "+-"); | 1004 | printf(TREE, "+-"); |
1005 | printf(HEADER, "First Boot Section ID: "); | 1005 | printf(HEADER, "First Boot Section ID: "); |
1006 | char name[5]; | 1006 | char name[5]; |
1007 | fill_section_name(name, file->first_boot_sec_id); | 1007 | sb_fill_section_name(name, file->first_boot_sec_id); |
1008 | printf(TEXT, "%08x (%s)\n", file->first_boot_sec_id, name); | 1008 | printf(TEXT, "%08x (%s)\n", file->first_boot_sec_id, name); |
1009 | 1009 | ||
1010 | if(file->real_key) | 1010 | if(file->real_key) |
@@ -1035,7 +1035,7 @@ void sb_dump(struct sb_file_t *file, void *u, sb_color_printf cprintf) | |||
1035 | printf(HEADER, "Section\n"); | 1035 | printf(HEADER, "Section\n"); |
1036 | printf(TREE,"| +-"); | 1036 | printf(TREE,"| +-"); |
1037 | printf(HEADER, "Identifier: "); | 1037 | printf(HEADER, "Identifier: "); |
1038 | fill_section_name(name, sec->identifier); | 1038 | sb_fill_section_name(name, sec->identifier); |
1039 | printf(TEXT, "%08x (%s)\n", sec->identifier, name); | 1039 | printf(TEXT, "%08x (%s)\n", sec->identifier, name); |
1040 | printf(TREE, "| +-"); | 1040 | printf(TREE, "| +-"); |
1041 | printf(HEADER, "Type: "); | 1041 | printf(HEADER, "Type: "); |