sbinfo: move sb specific bits of its own header

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29722 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 100 insertions, 42 deletions

diff --git a/utils/sbinfo/sb.h b/utils/sbinfo/sb.h
new file mode 100644
index 0000000000..c4d705c14b
--- /dev/null
+++ b/utils/sbinfo/sb.h
@@ -0,0 +1,99 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2011 Amaury Pouly
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+#define _ISOC99_SOURCE /* snprintf() */
+#include <sys/types.h>
+#include <sys/stat.h>
+
+struct sb_version_t
+{
+    uint16_t major;
+    uint16_t pad0;
+    uint16_t minor;
+    uint16_t pad1;
+    uint16_t revision;
+    uint16_t pad2;
+};
+
+struct sb_header_t
+{
+    uint8_t sha1_header[20]; /* SHA-1 of the rest of the header */
+    uint8_t signature[4]; /* Signature "STMP" */
+    uint8_t major_ver; /* Should be 1 */
+    uint8_t minor_ver; /* Should be 1 */
+    uint16_t flags;
+    uint32_t image_size; /* In blocks (=16bytes) */
+    uint32_t first_boot_tag_off; /* Offset in blocks */
+    uint32_t first_boot_sec_id; /* First bootable section ID */
+    uint16_t nr_keys; /* Number of encryption keys */
+    uint16_t key_dict_off; /* Offset to key dictionary (in blocks) */
+    uint16_t header_size; /* In blocks */
+    uint16_t nr_sections; /* Number of sections */
+    uint16_t sec_hdr_size; /* Section header size (in blocks) */
+    uint8_t rand_pad0[6]; /* Random padding */
+    uint64_t timestamp; /* In microseconds since 2000/1/1 00:00:00 */
+    struct sb_version_t product_ver;
+    struct sb_version_t component_ver;
+    uint16_t drive_tag; /* Unknown meaning */
+    uint8_t rand_pad1[6]; /* Random padding */
+} __attribute__((packed));
+
+#define SB_INST_NOP     0x0
+#define SB_INST_TAG     0x1
+#define SB_INST_LOAD    0x2
+#define SB_INST_FILL    0x3
+#define SB_INST_JUMP    0x4
+#define SB_INST_CALL    0x5
+#define SB_INST_MODE    0x6
+
+#define ROM_SECTION_BOOTABLE    (1 << 0)
+#define ROM_SECTION_CLEARTEXT   (1 << 1)
+
+struct sb_instruction_header_t
+{
+    uint8_t checksum;
+    uint8_t opcode;
+    uint16_t zero_except_for_tag;
+} __attribute__((packed));
+
+struct sb_instruction_load_t
+{
+    struct sb_instruction_header_t hdr;
+    uint32_t addr;
+    uint32_t len;
+    uint32_t crc;
+} __attribute__((packed));
+
+struct sb_instruction_fill_t
+{
+    struct sb_instruction_header_t hdr;
+    uint32_t addr;
+    uint32_t len;
+    uint32_t pattern;
+} __attribute__((packed));
+
+struct sb_instruction_call_t
+{
+    struct sb_instruction_header_t hdr;
+    uint32_t addr;
+    uint32_t zero;
+    uint32_t arg;
+} __attribute__((packed));
diff --git a/utils/sbinfo/sbinfo.c b/utils/sbinfo/sbinfo.c
index 351847f19b..d6bab4addc 100644
--- a/utils/sbinfo/sbinfo.c
+++ b/utils/sbinfo/sbinfo.c
@@ -41,6 +41,7 @@
 
 #include "crypto.h"
 #include "elf.h"
+#include "sb.h"
 
 #if 1 /* ANSI colors */
 
@@ -80,48 +81,6 @@ uint8_t *g_buf; /* file content */
 char out_prefix[PREFIX_SIZE];
 const char *key_file;
 
-#define SB_INST_NOP     0x0
-#define SB_INST_TAG     0x1
-#define SB_INST_LOAD    0x2
-#define SB_INST_FILL    0x3
-#define SB_INST_JUMP    0x4
-#define SB_INST_CALL    0x5
-#define SB_INST_MODE    0x6
-
-#define ROM_SECTION_BOOTABLE    (1 << 0)
-#define ROM_SECTION_CLEARTEXT   (1 << 1)
-
-struct sb_instruction_header_t
-{
-    uint8_t checksum;
-    uint8_t opcode;
-    uint16_t zero_except_for_tag;
-} __attribute__((packed));
-
-struct sb_instruction_load_t
-{
-    struct sb_instruction_header_t hdr;
-    uint32_t addr;
-    uint32_t len;
-    uint32_t crc;
-} __attribute__((packed));
-
-struct sb_instruction_fill_t
-{
-    struct sb_instruction_header_t hdr;
-    uint32_t addr;
-    uint32_t len;
-    uint32_t pattern;
-} __attribute__((packed));
-
-struct sb_instruction_call_t
-{
-    struct sb_instruction_header_t hdr;
-    uint32_t addr;
-    uint32_t zero;
-    uint32_t arg;
-} __attribute__((packed));
-
 void *xmalloc(size_t s) /* malloc helper, used in elf.c */
 {
         void * r = malloc(s);