Merge pull request #108 from igoropaniuk/vip_table_generation

VIP table generation

Author: lumag

Makefile

@@ -6,7 +6,7 @@ CFLAGS += -O2 -Wall -g `pkg-config --cflags libxml-2.0 libusb-1.0`
 LDFLAGS += `pkg-config --libs libxml-2.0 libusb-1.0`
 prefix := /usr/local
 
-QDL_SRCS := firehose.c io.c qdl.c sahara.c util.c patch.c program.c read.c sim.c ufs.c usb.c ux.c oscompat.c
+QDL_SRCS := firehose.c io.c qdl.c sahara.c util.c patch.c program.c read.c sha2.c sim.c ufs.c usb.c ux.c oscompat.c vip.c
 QDL_OBJS := $(QDL_SRCS:.c=.o)
 
 RAMDUMP_SRCS := ramdump.c sahara.c io.c sim.c usb.c util.c ux.c oscompat.c

firehose.c

@@ -50,6 +50,7 @@
 #include "qdl.h"
 #include "ufs.h"
 #include "oscompat.h"
+#include "vip.h"
 
 enum {
 	FIREHOSE_ACK = 0,
@@ -183,9 +184,11 @@ static int firehose_write(struct qdl_device *qdl, xmlDoc *doc)
 
 	xmlDocDumpMemory(doc, &s, &len);
 
+	vip_gen_chunk_init(qdl);
+
 	for (;;) {
 		ux_debug("FIREHOSE WRITE: %s\n", s);
-
+		vip_gen_chunk_update(qdl, s, len);
 		ret = qdl_write(qdl, s, len);
 		saved_errno = errno;
 
@@ -202,6 +205,7 @@ static int firehose_write(struct qdl_device *qdl, xmlDoc *doc)
 		}
 	}
 	xmlFree(s);
+	vip_gen_chunk_store(qdl);
 	return ret < 0 ? -saved_errno : 0;
 }
 
@@ -423,7 +427,16 @@ static int firehose_program(struct qdl_device *qdl, struct program *program, int
 
 	lseek(fd, (off_t) program->file_offset * program->sector_size, SEEK_SET);
 	left = num_sectors;
+
+	ux_debug("FIREHOSE RAW BINARY WRITE: %s, %d bytes\n",
+		 program->filename, program->sector_size * num_sectors);
+
 	while (left > 0) {
+		/*
+		 * We should calculate hash for every raw packet sent,
+		 * not for the whole binary.
+		 */
+		vip_gen_chunk_init(qdl);
 		chunk_size = MIN(max_payload_size / program->sector_size, left);
 
 		n = read(fd, buf, chunk_size * program->sector_size);
@@ -435,6 +448,7 @@ static int firehose_program(struct qdl_device *qdl, struct program *program, int
 		if (n < max_payload_size)
 			memset(buf + n, 0, max_payload_size - n);
 
+		vip_gen_chunk_update(qdl, buf, chunk_size * program->sector_size);
 		n = qdl_write(qdl, buf, chunk_size * program->sector_size);
 		if (n < 0) {
 			ux_err("USB write failed for data chunk\n");
@@ -448,6 +462,7 @@ static int firehose_program(struct qdl_device *qdl, struct program *program, int
 		}
 
 		left -= chunk_size;
+		vip_gen_chunk_store(qdl);
 
 		ux_progress("%s", num_sectors - left, num_sectors, program->label);
 	}

qdl.c

@@ -43,6 +43,7 @@
 #include "program.h"
 #include "ufs.h"
 #include "oscompat.h"
+#include "vip.h"
 
 #ifdef _WIN32
 const char *__progname = "qdl";
@@ -107,7 +108,7 @@ static void print_usage(void)
 {
 	extern const char *__progname;
 	fprintf(stderr,
-		"%s [--debug] [--dry-run] [--version] [--allow-missing] [--storage <emmc|nand|ufs>] [--finalize-provisioning] [--include <PATH>] [--serial <NUM>] [--out-chunk-size <SIZE>] <prog.mbn> [<program> <patch> ...]\n",
+		"%s [--debug] [--dry-run] [--version] [--allow-missing] [--storage <emmc|nand|ufs>] [--finalize-provisioning] [--include <PATH>] [--serial <NUM>] [--out-chunk-size <SIZE>] [--create-digests <PATH>] <prog.mbn> [<program> <patch> ...]\n",
 		__progname);
 }
 
@@ -120,6 +121,7 @@ int main(int argc, char **argv)
 	char *prog_mbn, *storage="ufs";
 	char *incdir = NULL;
 	char *serial = NULL;
+	const char *vip_generate_dir= NULL;
 	int type;
 	int ret;
 	int opt;
@@ -141,6 +143,7 @@ int main(int argc, char **argv)
 		{"allow-missing", no_argument, 0, 'f'},
 		{"allow-fusing", no_argument, 0, 'c'},
 		{"dry-run", no_argument, 0, 'n'},
+		{"create-digests", required_argument, 0, 't'},
 		{0, 0, 0, 0}
 	};
 
@@ -152,6 +155,11 @@ int main(int argc, char **argv)
 		case 'n':
 			qdl_dev_type = QDL_DEVICE_SIM;
 			break;
+		case 't':
+			vip_generate_dir = optarg;
+			/* we also enforce dry-run mode */
+			qdl_dev_type = QDL_DEVICE_SIM;
+			break;
 		case 'v':
 			print_version();
 			return 0;
@@ -197,6 +205,12 @@ int main(int argc, char **argv)
 	if (out_chunk_size)
 		qdl_set_out_chunk_size(qdl, out_chunk_size);
 
+	if (vip_generate_dir) {
+		ret = vip_gen_init(qdl, vip_generate_dir);
+		if (ret)
+			goto out_cleanup;
+	}
+
 	ux_init();
 
 	if (qdl_debug)
@@ -254,6 +268,9 @@ int main(int argc, char **argv)
 		goto out_cleanup;
 
 out_cleanup:
+	if (vip_generate_dir)
+		vip_gen_finalize(qdl);
+
 	qdl_close(qdl);
 	free_programs();
 	free_patches();

qdl.h

@@ -8,12 +8,16 @@
 #include "read.h"
 #include <libxml/tree.h>
 
+#define container_of(ptr, typecast, member) ({                  \
+	void *_ptr = (void *)(ptr);		                \
+	((typecast *)(_ptr - offsetof(typecast, member))); })
+
 #define MAPPING_SZ 64
 
 enum QDL_DEVICE_TYPE
 {
 	QDL_DEVICE_USB,
-        QDL_DEVICE_SIM,
+	QDL_DEVICE_SIM,
 };
 
 struct qdl_device