From 0dd7af76f012e9a02182ed37b7cb0be3dcd55fed Mon Sep 17 00:00:00 2001 From: James Date: Mon, 5 May 2014 17:54:12 +0100 Subject: indent --- libdpf/fwload.c | 201 +++++++++++++++++++++++++++++++------------------------- 1 file changed, 110 insertions(+), 91 deletions(-) (limited to 'libdpf/fwload.c') diff --git a/libdpf/fwload.c b/libdpf/fwload.c index 2b98762..90ec961 100644 --- a/libdpf/fwload.c +++ b/libdpf/fwload.c @@ -13,19 +13,25 @@ // Demo stuff: -void memory_dump(unsigned char *buf, unsigned int n) +void +memory_dump (unsigned char *buf, unsigned int n) { - int i = 0; - int c = 0; - - while (i < n) { - printf("%02x ", buf[i]); - c++; - if (c == 16) { c = 0; printf("\n"); } - i++; - } - if (c) - printf("\n"); + int i = 0; + int c = 0; + + while (i < n) + { + printf ("%02x ", buf[i]); + c++; + if (c == 16) + { + c = 0; + printf ("\n"); + } + i++; + } + if (c) + printf ("\n"); } //////////////////////////////////////////////////////////////////////////// @@ -33,89 +39,102 @@ void memory_dump(unsigned char *buf, unsigned int n) #if EXPERIMENTAL -int xmain(int argc, char **argv) +int +xmain (int argc, char **argv) { - int ret; - int i; - struct banktable *bt; - - // flash offset, offset after jump table - unsigned int offset = 0x80000 + 0x200; - - - static unsigned char buf[0x10000]; - unsigned int len = sizeof(buf); - ret = load_ihx(argv[1], buf, &len, 0x127c, g_banktab); - if (ret < 0) { - fprintf(stderr, "Failed to load HEX file\n"); - return ret; - } else { - printf("Read %d banks\n", ret); - for (i = 0; i < ret; i++) { - bt = &g_banktab[i]; - printf(" { XADDR(0x%04x), XADDR(0x%04x), FOFFS(0x%06x) },\n", - bt->reloc, bt->reloc + bt->len, offset + bt->offset); - - } - } - return 0; + int ret; + int i; + struct banktable *bt; + + // flash offset, offset after jump table + unsigned int offset = 0x80000 + 0x200; + + + static unsigned char buf[0x10000]; + unsigned int len = sizeof (buf); + ret = load_ihx (argv[1], buf, &len, 0x127c, g_banktab); + if (ret < 0) + { + fprintf (stderr, "Failed to load HEX file\n"); + return ret; + } + else + { + printf ("Read %d banks\n", ret); + for (i = 0; i < ret; i++) + { + bt = &g_banktab[i]; + printf (" { XADDR(0x%04x), XADDR(0x%04x), FOFFS(0x%06x) },\n", + bt->reloc, bt->reloc + bt->len, offset + bt->offset); + + } + } + return 0; } #endif -int main(int argc, char **argv) +int +main (int argc, char **argv) { - int ret; - DPFHANDLE h; - - int i = 2; - - if (argc < 2 || argc > 3) { - fprintf(stderr, "Usage:\n" - "%s <.ihx file>\n" - "or in USB mode:\n" - "%s <.ihx file>\n", - argv[0], argv[0]); - return -1; - } - - if (argc == 2) { - ret = dpf_open(NULL, &h); - i--; - } else - if (argc == 3) { - ret = dpf_open(argv[1], &h); - } - - if (ret < 0) { - perror("opening DPF device:"); - return ret; - } - -// This patches a module to init the relocated jump table on a certain -// menu action: -// ret = patch_sector(h, 0x1330, 0x4af7a, "hack2.ihx"); - - -// patch_sector(h, 0x0, 0x100000, "jumptbl.ihx"); - - if (0) { - patch_sector(h, 0x0, 0x100000, "jumptbl.ihx"); - ret = patch_sector(h, 0x1330, 0x110000, "hack.ihx"); - ret = patch_sector(h, 0x132a, 0x120000, "main.ihx"); - if (ret < 0) printf("Failed.\n"); - } else { - // demo0(h); - - } - ret = load_hexfile(h, argv[i]); - code_go(h, 0x18a0); - if (ret < 0) printf("Failed.\n"); - - // unsigned char buf[256]; - // ret = read_mem(h, buf, 0x18a0, 64); - // memory_dump(buf, 64); - - dpf_close(h); - return ret; + int ret; + DPFHANDLE h; + + int i = 2; + + if (argc < 2 || argc > 3) + { + fprintf (stderr, "Usage:\n" + "%s <.ihx file>\n" + "or in USB mode:\n" "%s <.ihx file>\n", argv[0], argv[0]); + return -1; + } + + if (argc == 2) + { + ret = dpf_open (NULL, &h); + i--; + } + else if (argc == 3) + { + ret = dpf_open (argv[1], &h); + } + + if (ret < 0) + { + perror ("opening DPF device:"); + return ret; + } + +// This patches a module to init the relocated jump table on a certain +// menu action: +// ret = patch_sector(h, 0x1330, 0x4af7a, "hack2.ihx"); + + +// patch_sector(h, 0x0, 0x100000, "jumptbl.ihx"); + + if (0) + { + patch_sector (h, 0x0, 0x100000, "jumptbl.ihx"); + ret = patch_sector (h, 0x1330, 0x110000, "hack.ihx"); + ret = patch_sector (h, 0x132a, 0x120000, "main.ihx"); + if (ret < 0) + printf ("Failed.\n"); + } + else + { + // demo0(h); + + } + ret = load_hexfile (h, argv[i]); + code_go (h, 0x18a0); + if (ret < 0) + printf ("Failed.\n"); + + // unsigned char buf[256]; + // ret = read_mem(h, buf, 0x18a0, 64); + // memory_dump(buf, 64); + + dpf_close (h); + return ret; } -- cgit v1.2.3