rt2x00 still needs some patching as the radio doesn't come to life.
Installation via webflash.
Signed-off-by: Mikko Hissa <mikko.hi...@uta.fi>
Index: trunk/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-615-h1.c
===================================================================
--- trunk/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-615-h1.c
(revision 0)
+++ trunk/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-615-h1.c
(revision 0)
@@ -0,0 +1,113 @@
+/*
+ * D-Link DIR-615 H1
+ *
+ * Copyright (C) 2012 Mikko Hissa <mikko.hi...@uta.fi>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/flash.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/physmap.h>
+
+#include <asm/mach-ralink/machine.h>
+#include <asm/mach-ralink/dev-gpio-buttons.h>
+#include <asm/mach-ralink/dev-gpio-leds.h>
+#include <asm/mach-ralink/rt305x.h>
+#include <asm/mach-ralink/rt305x_regs.h>
+
+#include "devices.h"
+
+#define DIR_615_H1_GPIO_LED_WAN_AMBER 12 /* active low */
+#define DIR_615_H1_GPIO_LED_WAN_GREEN 13 /* active low */
+#define DIR_615_H1_GPIO_LED_WPS_BLUE 14 /* active low */
+
+#define DIR_615_H1_GPIO_LED_STATUS_AMBER 7
+#define DIR_615_H1_GPIO_LED_STATUS_GREEN 9
+
+#define DIR_615_H1_GPIO_BUTTON_RESET 10 /* active low */
+#define DIR_615_H1_GPIO_BUTTON_WPS 0 /* active low */
+
+#define DIR_615_H1_KEYS_POLL_INTERVAL 20
+#define DIR_615_H1_KEYS_DEBOUNCE_INTERVAL (3 * DIR_615_H1_KEYS_POLL_INTERVAL)
+
+static struct gpio_led dir_615_h1_leds_gpio[] __initdata = {
+ {
+ .name = "d-link:amber:status",
+ .gpio = DIR_615_H1_GPIO_LED_STATUS_AMBER,
+ }, {
+ .name = "d-link:green:status",
+ .gpio = DIR_615_H1_GPIO_LED_STATUS_GREEN,
+ }, {
+ .name = "d-link:amber:wan",
+ .gpio = DIR_615_H1_GPIO_LED_WAN_AMBER,
+ .active_low = 1,
+ }, {
+ .name = "d-link:green:wan",
+ .gpio = DIR_615_H1_GPIO_LED_WAN_GREEN,
+ .active_low = 1,
+ }, {
+ .name = "d-link:blue:wps",
+ .gpio = DIR_615_H1_GPIO_LED_WPS_BLUE,
+ .active_low = 1,
+ }
+};
+
+static struct gpio_keys_button dir_615_h1_gpio_buttons[] __initdata = {
+ {
+ .desc = "reset",
+ .type = EV_KEY,
+ .code = KEY_RESTART,
+ .debounce_interval = DIR_615_H1_KEYS_DEBOUNCE_INTERVAL,
+ .gpio = DIR_615_H1_GPIO_BUTTON_RESET,
+ .active_low = 1,
+ }, {
+ .desc = "wps",
+ .type = EV_KEY,
+ .code = KEY_WPS_BUTTON,
+ .debounce_interval = DIR_615_H1_KEYS_DEBOUNCE_INTERVAL,
+ .gpio = DIR_615_H1_GPIO_BUTTON_WPS,
+ .active_low = 1,
+ }
+};
+
+const struct flash_platform_data dir615h1_flash = {
+ .type = "mx25l3205d",
+};
+
+struct spi_board_info dir615h1_spi_slave_info[] __initdata = {
+ {
+ .modalias = "m25p80",
+ .platform_data = &dir615h1_flash,
+ .irq = -1,
+ .max_speed_hz = 10000000,
+ .bus_num = 0,
+ .chip_select = 0,
+ },
+};
+
+static void __init dir615h1_init(void)
+{
+ rt305x_gpio_init(RT305X_GPIO_MODE_GPIO << RT305X_GPIO_MODE_UART0_SHIFT);
+ rt305x_register_spi(dir615h1_spi_slave_info,
+ ARRAY_SIZE(dir615h1_spi_slave_info));
+ rt305x_esw_data.vlan_config = RT305X_ESW_VLAN_CONFIG_LLLLW;
+ rt305x_register_ethernet();
+ ramips_register_gpio_leds(-1, ARRAY_SIZE(dir_615_h1_leds_gpio),
+ dir_615_h1_leds_gpio);
+ ramips_register_gpio_buttons(-1, DIR_615_H1_KEYS_POLL_INTERVAL,
+ ARRAY_SIZE(dir_615_h1_gpio_buttons),
+ dir_615_h1_gpio_buttons);
+ rt305x_register_wifi();
+ rt305x_register_wdt();
+ rt305x_register_usb();
+}
+
+MIPS_MACHINE(RAMIPS_MACH_DIR_615_H1, "DIR-615-H1", "D-Link DIR-615 H1",
+ dir615h1_init);
Index: trunk/target/linux/ramips/files/arch/mips/ralink/rt305x/Makefile
===================================================================
--- trunk/target/linux/ramips/files/arch/mips/ralink/rt305x/Makefile
(revision 33076)
+++ trunk/target/linux/ramips/files/arch/mips/ralink/rt305x/Makefile
(working copy)
@@ -17,6 +17,7 @@
obj-$(CONFIG_RT305X_MACH_ALL0256N) += mach-all0256n.o
obj-$(CONFIG_RT305X_MACH_ALL5002) += mach-all5002.o
obj-$(CONFIG_RT305X_MACH_DIR_300_REVB) += mach-dir-300-revb.o
+obj-$(CONFIG_RT305X_MACH_DIR_615_H1) += mach-dir-615-h1.o
obj-$(CONFIG_RT305X_MACH_DAP_1350) += mach-dap-1350.o
obj-$(CONFIG_RT305X_MACH_ESR_9753) += mach-esr-9753.o
obj-$(CONFIG_RT305X_MACH_F5D8235_V2) += mach-f5d8235-v2.o
Index: trunk/target/linux/ramips/files/arch/mips/ralink/rt305x/Kconfig
===================================================================
--- trunk/target/linux/ramips/files/arch/mips/ralink/rt305x/Kconfig
(revision 33076)
+++ trunk/target/linux/ramips/files/arch/mips/ralink/rt305x/Kconfig
(working copy)
@@ -71,6 +71,11 @@
select RALINK_DEV_GPIO_BUTTONS
select RALINK_DEV_GPIO_LEDS
+config RT305X_MACH_DIR_615_H1
+ bool "D-Link DIR-615 H1 board support"
+ select RALINK_DEV_GPIO_BUTTONS
+ select RALINK_DEV_GPIO_LEDS
+
config RT305X_MACH_DAP_1350
bool "D-Link DAP-1350 board support"
select RALINK_DEV_GPIO_BUTTONS
Index:
trunk/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h
===================================================================
--- trunk/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h
(revision 33076)
+++ trunk/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h
(working copy)
@@ -62,6 +62,7 @@
/* RT3352 based machines */
RAMIPS_MACH_ALL5002, /* Allnet ALL5002 */
+ RAMIPS_MACH_DIR_615_H1,
/* RT3662 based machines */
RAMIPS_MACH_RT_N56U, /* Asus RT-N56U */
Index: trunk/target/linux/ramips/image/Makefile
===================================================================
--- trunk/target/linux/ramips/image/Makefile (revision 33076)
+++ trunk/target/linux/ramips/image/Makefile (working copy)
@@ -182,6 +182,17 @@
$(call BuildFirmware/Generic/initramfs,$(1),$(2),$(call
mkcmdline,$(3),ttyS1,57600) $(call
mkmtd/phys,$(mtdlayout_dir300b1)),$(mtd_dir300b1_kernel_part_size),$(mtd_dir300b1_rootfs_part_size))
endef
+mtdlayout_dir615h1=192k(u-boot)ro,64k(u-boot-env)ro,64k(factory)ro,896k(kernel),2880k(rootfs),3776k@0x50000(firmware)
+define BuildFirmware/DIR615H1
+ $(call BuildFirmware/Generic,$(1),$(2),$(call
mkcmdline,$(3),$(4),$(5)) $(call
mkmtd/$(6),$(mtdlayout_dir615h1)),917504,2949120)
+ mkdir615h1 -e $(call sysupname,$(1),$(2)) \
+ -o $(call imgname,$(1),$(2))-factory.bin
+endef
+
+define BuildFirmware/DIR615H1/initramfs
+ $(call BuildFirmware/Generic/initramfs,$(1),$(2),$(call
mkcmdline,$(3),$(4),$(5)) $(call mkmtd/$(6),$(mtdlayout_dir615h1)))
+endef
+
mtdlayout_dap1350=192k(u-boot)ro,64k(devdata)ro,192k(devconf)ro,256k(devlang)ro,1088k(kernel),6400k(rootfs),7488k@0xb0000(firmware)
mtd_dap1350_kernel_part_size=1114112
mtd_dap1350_rootfs_part_size=6553600
@@ -367,6 +378,10 @@
$(call
Image/Build/Template/$(fs_squash)/$(1),DIR300B1,dir-615-d,DIR-615-D,wrgn23_dlwbr_dir615d)
endef
+define Image/Build/Profile/DIR615H1
+ $(call
Image/Build/Template/$(fs_squash)/$(1),DIR615H1,dir-615-h1,DIR-615-H1,ttyS1,57600,spi)
+endef
+
define Image/Build/Profile/DAP1350
$(call
Image/Build/Template/$(fs_squash)/$(1),DAP1350,dap-1350,DAP-1350,RT3052-AP-DAP1350-3)
endef
@@ -490,6 +505,7 @@
$(call Image/Build/Profile/ARGUS_ATP52B,$(1))
$(call Image/Build/Profile/BC2,$(1))
$(call Image/Build/Profile/DIR300B1,$(1))
+ $(call Image/Build/Profile/DIR615H1,$(1))
$(call Image/Build/Profile/DAP1350,$(1))
$(call Image/Build/Profile/ESR9753,$(1))
$(call Image/Build/Profile/F5D8235V2,$(1))
Index: trunk/target/linux/ramips/rt305x/config-3.3
===================================================================
--- trunk/target/linux/ramips/rt305x/config-3.3 (revision 33076)
+++ trunk/target/linux/ramips/rt305x/config-3.3 (working copy)
@@ -93,6 +93,7 @@
CONFIG_RT305X_MACH_ARGUS_ATP52B=y
CONFIG_RT305X_MACH_BC2=y
CONFIG_RT305X_MACH_DIR_300_REVB=y
+CONFIG_RT305X_MACH_DIR_615_H1=y
CONFIG_RT305X_MACH_DAP_1350=y
CONFIG_RT305X_MACH_ESR_9753=y
CONFIG_RT305X_MACH_F5D8235_V2=y
Index: trunk/target/linux/ramips/base-files/lib/ramips.sh
===================================================================
--- trunk/target/linux/ramips/base-files/lib/ramips.sh (revision 33076)
+++ trunk/target/linux/ramips/base-files/lib/ramips.sh (working copy)
@@ -80,6 +80,9 @@
*"DIR-600 B2")
name="dir-600-b2"
;;
+ *"DIR-615 H1")
+ name="dir-615-h1"
+ ;;
*"DAP-1350")
name="dap-1350"
;;
Index: trunk/target/linux/ramips/base-files/lib/upgrade/platform.sh
===================================================================
--- trunk/target/linux/ramips/base-files/lib/upgrade/platform.sh
(revision 33076)
+++ trunk/target/linux/ramips/base-files/lib/upgrade/platform.sh
(working copy)
@@ -21,6 +21,7 @@
dir-300-b1 | \
dir-600-b1 | \
dir-600-b2 | \
+ dir-615-h1 | \
dap-1350 | \
esr-9753 | \
fonera20n | \
Index: trunk/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac
===================================================================
--- trunk/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac
(revision 33076)
+++ trunk/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac
(working copy)
@@ -34,7 +34,8 @@
ifconfig eth0 hw ether $mac 2>/dev/null
;;
all0256n |\
- all5002 | \
+ all5002 |\
+ dir-615-h1 |\
fonera20n |\
hw550-3g |\
nbg-419n |\
Index:
trunk/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
===================================================================
---
trunk/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
(revision 33076)
+++
trunk/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
(working copy)
@@ -57,6 +57,7 @@
all5002 | \
argus-atp52b | \
bc2 | \
+ dir-615-h1 | \
esr-9753 | \
fonera20n | \
freestation5 | \
Index: trunk/target/linux/ramips/base-files/etc/uci-defaults/network
===================================================================
--- trunk/target/linux/ramips/base-files/etc/uci-defaults/network
(revision 33076)
+++ trunk/target/linux/ramips/base-files/etc/uci-defaults/network
(working copy)
@@ -18,6 +18,7 @@
case $board in
all0256n | \
all5002 | \
+ dir-615-h1 | \
wl-330n)
ucidef_set_interface_lan "eth0.1"
;;
@@ -89,7 +90,8 @@
case $board in
all0256n | \
- all5002)
+ all5002 | \
+ dir-615-h1)
lan_mac=$(ramips_get_mac_binary factory 40)
;;
3g-6200n | \
Index: trunk/target/linux/ramips/base-files/etc/uci-defaults/leds
===================================================================
--- trunk/target/linux/ramips/base-files/etc/uci-defaults/leds (revision 33076)
+++ trunk/target/linux/ramips/base-files/etc/uci-defaults/leds (working copy)
@@ -30,6 +30,10 @@
# ANDed with vlan switch port 4 led state
ucidef_set_led_default "wan" "WAN LED (amber)"
"d-link:amber:wan" "1"
;;
+ dir-615-h1)
+ ucidef_set_led_default "status" "Status LED (amber)"
"d-link:amber:status" "0"
+ set_wifi_led "rt2800pci-phy0::radio"
+ ;;
esr-9753)
set_wifi_led "rt2800pci-phy0::radio"
;;
Index: trunk/target/linux/ramips/base-files/etc/diag.sh
===================================================================
--- trunk/target/linux/ramips/base-files/etc/diag.sh (revision 33076)
+++ trunk/target/linux/ramips/base-files/etc/diag.sh (working copy)
@@ -36,7 +36,7 @@
argus-atp52b)
status_led="argus-atp52b:green:run"
;;
- dir-300-b1 | dir-600-b1 | dir-600-b2)
+ dir-300-b1 | dir-600-b1 | dir-600-b2 | dir-615-h1)
status_led="d-link:green:status"
;;
dap-1350)
Index: trunk/tools/firmware-utils/Makefile
===================================================================
--- trunk/tools/firmware-utils/Makefile (revision 33076)
+++ trunk/tools/firmware-utils/Makefile (working copy)
@@ -21,6 +21,7 @@
$(call cc,trx)
$(call cc,motorola-bin)
$(call cc,dgfirmware)
+ $(call cc,mkdir615h1 md5)
$(call cc,trx2usr)
$(call cc,ptgen)
$(call cc,airlink)
Index: trunk/tools/firmware-utils/src/mkdir615h1.c
===================================================================
--- trunk/tools/firmware-utils/src/mkdir615h1.c (revision 0)
+++ trunk/tools/firmware-utils/src/mkdir615h1.c (revision 0)
@@ -0,0 +1,410 @@
+/*
+ *
+ * Copyright (C) 2012 OpenWrt.org
+ * Copyright (C) 2012 Mikko Hissa <mikko.hi...@uta.fi>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <libgen.h>
+#include <errno.h>
+#include <arpa/inet.h>
+#include <unistd.h>
+#include "md5.h"
+
+#define HDR_LEN 0x60
+#define BUF_SIZE 0x200
+#define VERSION_SIZE 0x10
+#define MD5_SIZE 0x10
+#define PAD_SIZE 0x20
+#define DEFAULT_MAGIC 305419896
+#define DEFAULT_VERSION "123"
+#define DEFAULT_VENDOR_ID 536
+#define DEFAULT_HEAD_VALUE 0x0
+#define DEFAULT_BLOCK_SIZE 65535
+#define DEFAULT_PRODUCT_ID 48
+#define DEFAULT_FIRMWARE_TYPE 0x03
+
+typedef struct {
+ uint32_t head;
+ uint32_t vendor_id;
+ uint32_t product_id;
+ uint8_t version[VERSION_SIZE];
+ uint32_t firmware_type;
+ uint32_t filesize;
+ uint32_t zero;
+ uint8_t md5sum[MD5_SIZE];
+ uint8_t pad[PAD_SIZE];
+ uint32_t chksum;
+ uint32_t magic;
+} img_header;
+
+typedef struct {
+ uint8_t id;
+ char * name;
+} firmware_type;
+
+typedef enum {
+ NONE, ENCODE, DECODE
+} op_mode;
+
+static firmware_type FIRMWARE_TYPES[] = {
+ { 0x01, "bootloader" },
+ { 0x02, "kernel" },
+ { 0x03, "kernelapp" },
+ { 0x04, "apps" },
+ { 0x05, "littleapps" },
+ { 0x06, "sounds" },
+ { 0x07, "userconfig" },
+ { 0x0a, "factoryapps" },
+ { 0x0b, "odmapps" },
+ { 0x0c, "langpack" }
+};
+
+static long get_file_size(const char *filename)
+{
+ FILE *fp_file;
+ long result;
+
+ fp_file = fopen(filename, "r");
+ if (!fp_file)
+ return -1;
+ fseek(fp_file, 0, SEEK_END);
+ result = ftell(fp_file);
+ fclose(fp_file);
+ return result;
+}
+
+static int header_checksum(void *data, int len)
+{
+ int i;
+ int sum;
+
+ sum = 0;
+ if (data != NULL && len >= 0) {
+ for (i = 0; i < len; ++i)
+ sum += *(unsigned char *) (data + i);
+ return sum;
+ }
+
+ return -1;
+}
+
+static int md5_file(const char *filename, uint8_t *dst)
+{
+ FILE *fp_src;
+ MD5_CTX ctx;
+ char buf[BUF_SIZE];
+ size_t bytes_read;
+
+ MD5_Init(&ctx);
+
+ fp_src = fopen(filename, "r+b");
+ if (!fp_src) {
+ return -1;
+ }
+ while (!feof(fp_src)) {
+ bytes_read = fread(&buf, 1, BUF_SIZE, fp_src);
+ MD5_Update(&ctx, &buf, bytes_read);
+ }
+ fclose(fp_src);
+
+ MD5_Final(dst, &ctx);
+
+ return 0;
+}
+
+static int encode_image(const char *input_file_name,
+ const char *output_file_name, img_header *header, int
block_size)
+{
+ char buf[BUF_SIZE];
+ size_t bytes_read;
+ size_t pad_len = 0;
+ size_t bytes_avail;
+
+ FILE *fp_input;
+ FILE *fp_output;
+
+ int i;
+ long magic;
+
+ fp_input = fopen(input_file_name, "r+b");
+ if (!fp_input) {
+ fprintf(stderr, "Cannot open %s !!\n", input_file_name);
+ return -1;
+ }
+
+ fp_output = fopen(output_file_name, "w+b");
+ if (!fp_output) {
+ fprintf(stderr, "Cannot open %s !!\n", output_file_name);
+ fclose(fp_input);
+ return -1;
+ }
+
+ header->filesize = get_file_size(input_file_name);
+ if (!header->filesize) {
+ fprintf(stderr, "File %s open/size error!\n", input_file_name);
+ fclose(fp_input);
+ fclose(fp_output);
+ return -1;
+ }
+ /*
+ * Zero padding
+ */
+ if (block_size > 0) {
+ pad_len = block_size - (header->filesize % block_size);
+ }
+
+ if (md5_file(input_file_name, (uint8_t *) &header->md5sum) < 0) {
+ fprintf(stderr, "Md5 failed on file %s\n", input_file_name);
+ fclose(fp_input);
+ fclose(fp_output);
+ return -1;
+ }
+ header->zero = 0;
+ header->chksum = header_checksum(header, HDR_LEN);
+ header->head = htonl(header->head);
+ header->vendor_id = htonl(header->vendor_id);
+ header->product_id = htonl(header->product_id);
+ header->firmware_type = htonl(header->firmware_type);
+ header->filesize = htonl(header->filesize);
+ header->chksum = htonl(header->chksum);
+ magic = header->magic;
+ header->magic = htonl(header->magic);
+
+ fwrite(header, HDR_LEN, 1, fp_output);
+
+ while (!feof(fp_input) || pad_len > 0) {
+
+ if (!feof(fp_input))
+ bytes_read = fread(&buf, 1, BUF_SIZE, fp_input);
+ else
+ bytes_read = 0;
+
+ /*
+ * No more bytes read, start padding
+ */
+ if (bytes_read < BUF_SIZE && pad_len > 0) {
+ bytes_avail = BUF_SIZE - bytes_read;
+ memset( &buf[bytes_read], 0, bytes_avail);
+ bytes_read += bytes_avail < pad_len ? bytes_avail :
pad_len;
+ pad_len -= bytes_avail < pad_len ? bytes_avail :
pad_len;
+ }
+
+ for (i = 0; i < bytes_read; i++)
+ buf[i] ^= magic >> ((((i >> 60) + i) & 7) - (i >> 60));
+ fwrite(&buf, bytes_read, 1, fp_output);
+ }
+
+ fclose(fp_input);
+ fclose(fp_output);
+ return 1;
+}
+
+int decode_image(const char *input_file_name, const char *output_file_name)
+{
+ img_header header;
+ char buf[512];
+
+ FILE *fp_input;
+ FILE *fp_output;
+ unsigned int i;
+
+ size_t bytes_read;
+ size_t bytes_written;
+
+ fp_input = fopen(input_file_name, "r+b");
+ if (!fp_input) {
+ fprintf(stderr, "Cannot open %s !!\n", input_file_name);
+ fclose(fp_input);
+ return -1;
+ }
+
+ fp_output = fopen(output_file_name, "w+b");
+ if (!fp_output) {
+ fprintf(stderr, "Cannot open %s !!\n", output_file_name);
+ fclose(fp_output);
+ return -1;
+ }
+
+ if (fread(&header, 1, HDR_LEN, fp_input) != HDR_LEN) {
+ fprintf(stderr, "Incorrect header size!!");
+ fclose(fp_input);
+ fclose(fp_output);
+ return -1;
+ }
+
+ header.head = ntohl(header.head);
+ header.vendor_id = ntohl(header.vendor_id);
+ header.product_id = ntohl(header.product_id);
+ header.firmware_type = ntohl(header.firmware_type);
+ header.filesize = ntohl(header.filesize);
+ header.chksum = ntohl(header.chksum);
+ header.magic = ntohl(header.magic);
+
+ bytes_written = 0;
+ while (!feof(fp_input)) {
+
+ bytes_read = fread(&buf, 1, BUF_SIZE, fp_input);
+ for (i = 0; i < bytes_read; i++)
+ buf[i] ^= header.magic >> ((((i >> 60) + i) & 7) - (i
>> 60));
+
+ /*
+ * Handle padded source file
+ */
+ if (bytes_written + bytes_read > header.filesize) {
+ bytes_read = header.filesize - bytes_written;
+ if (bytes_read > 0)
+ fwrite(&buf, bytes_read, 1, fp_output);
+ break;
+ }
+
+ fwrite(&buf, bytes_read, 1, fp_output);
+ bytes_written += bytes_read;
+ }
+
+ fclose(fp_input);
+ fclose(fp_output);
+
+ return 1;
+}
+
+static void usage(const char *progname, int status)
+{
+ FILE *stream = (status != EXIT_SUCCESS) ? stderr : stdout;
+ int i;
+
+ fprintf(stream, "Usage: %s [OPTIONS...]\n", progname);
+ fprintf(stream, "\n"
+ "Options:\n"
+ " -e <file> encode image file <file>\n"
+ " -d <file> decode image file <file>\n"
+ " -o <file> write output to the file
<file>\n"
+ " -t <type> set image type to <type>,
defaults to 3\n"
+ " valid image <type> values:\n");
+ for (i = 0; i < sizeof(FIRMWARE_TYPES) / sizeof(firmware_type); i++) {
+ fprintf(stream, " %-5i= %s\n",
FIRMWARE_TYPES[i].id,
+ FIRMWARE_TYPES[i].name);
+ }
+ fprintf(stream, " -v <version> set image version to
<version>\n"
+ " -r <vendor> set image vendor id to
<vendor>\n"
+ " -p <product> set image product id to
<product>\n"
+ " -m <magic> set encoding magic <magic>\n"
+ " -z enable image padding to
<blocksize>\n"
+ " -b <blocksize> set image <blocksize>, defaults
to 65535\n"
+ " -h show this screen\n");
+ exit(status);
+}
+
+int main(int argc, char *argv[])
+{
+ int opt;
+ char *input_file, *output_file, *progname = NULL;
+ op_mode mode = NONE;
+ int tmp, i, pad = 0;
+ int block_size;
+ img_header header;
+
+ block_size = DEFAULT_BLOCK_SIZE;
+ progname = basename(argv[0]);
+
+ memset(&header, 0, sizeof( img_header ));
+ header.magic = DEFAULT_MAGIC;
+ header.head = DEFAULT_HEAD_VALUE;
+ header.vendor_id = DEFAULT_VENDOR_ID;
+ header.product_id = DEFAULT_PRODUCT_ID;
+ header.firmware_type = DEFAULT_FIRMWARE_TYPE;
+ strncpy( (char*)&header.version, DEFAULT_VERSION, VERSION_SIZE - 1);
+
+ while ((opt = getopt(argc, argv, ":o:e:d:t:v:r:p:m:b:h?z")) != -1) {
+ switch (opt) {
+ case 'e':
+ input_file = optarg;
+ mode = ENCODE;
+ break;
+ case 'd':
+ input_file = optarg;
+ mode = DECODE;
+ break;
+ case 'o':
+ output_file = optarg;
+ break;
+ case 't':
+ tmp = strtol(optarg, 0, 10);
+ for (i = 0; i < sizeof(FIRMWARE_TYPES) /
sizeof(firmware_type);
+ i++) {
+ if (FIRMWARE_TYPES[i].id == tmp) {
+ header.firmware_type =
FIRMWARE_TYPES[i].id;
+ break;
+ }
+ }
+ if (header.firmware_type == 0) {
+ fprintf(stderr, "Invalid firmware <type>!\n");
+ usage(progname, EXIT_FAILURE);
+ }
+ break;
+ case 'v':
+ strncpy( (char*)&header.version, optarg,
+ VERSION_SIZE - 1);
+ break;
+ case 'r':
+ header.vendor_id = strtol(optarg, 0, 10);
+ break;
+ case 'p':
+ header.product_id = strtol(optarg, 0, 10);
+ break;
+ case 'm':
+ header.magic = strtoul(optarg, 0, 16);
+ break;
+ case 'z':
+ pad = 1;
+ break;
+ case 'b':
+ block_size = strtol(optarg, 0, 10);
+ break;
+ case 'h':
+ usage(progname, EXIT_SUCCESS);
+ break;
+ case ':':
+ fprintf(stderr, "Option -%c requires an operand\n",
optopt);
+ usage(progname, EXIT_FAILURE);
+ break;
+ case '?':
+ fprintf(stderr, "Unrecognized option: -%c\n", optopt);
+ usage(progname, EXIT_FAILURE);
+ break;
+ default:
+ usage(progname, EXIT_FAILURE);
+ break;
+ }
+ }
+
+ if (input_file == NULL || output_file == NULL ) {
+ fprintf(stderr, "Input and output files must be defined\n");
+ usage(progname, EXIT_FAILURE);
+ }
+
+ switch (mode) {
+ case NONE:
+ usage(progname, EXIT_FAILURE);
+ break;
+ case ENCODE:
+ if (encode_image(input_file, output_file, &header, pad ?
block_size : 0)
+ < 0)
+ return EXIT_FAILURE;
+ break;
+ case DECODE:
+ if (decode_image(input_file, output_file) < 0)
+ return EXIT_FAILURE;
+ break;
+ }
+
+ return EXIT_SUCCESS;
+}
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
