X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/rsbs2/blobdiff_plain/68fc92b2ed0f55eb5451ccab6722ff8e9a4d0d70..8658e9676d6d4923546f0eab70a4e4527d5fcde0:/firmware.c

diff --git a/firmware.c b/firmware.c
index 0595bd9..e73d7cc 100644
--- a/firmware.c
+++ b/firmware.c
@@ -8,6 +8,7 @@
 #include <string.h>
 #include <strings.h>
 #include "rsb-crc.h"
+#include "extract.h"
 
 #define FINDSTR(addr, str) (!strncmp((char*)addr, str, strlen(str)))
 
@@ -75,13 +76,13 @@ void show_properties(unsigned char *fw, int len)
 			}
 
 			if (prop->right_rw == 0x00 && prop->rw_mask == 0x00) {
-				printf("(R-) ");
+				printf("(R-)");
 			} else if (prop->right_rw == 0x01) {
-				printf("(RW mask: 0x%02x) ", prop->rw_mask);
+				printf("(RW mask: 0x%02x)", prop->rw_mask);
 			} else {
-				printf("(UNK 0x%02x 0x%02x) ", prop->right_rw, prop->rw_mask);
+				printf("(UNK 0x%02x 0x%02x)", prop->right_rw, prop->rw_mask);
 			}
-			printf("\n");
+			printf(", length: %d\n", *((unsigned int*)(fw + i - 4)));
 		}
 	}
 }
@@ -236,13 +237,8 @@ void handle_boarddescription(unsigned char *fw, int len, int patch)
 			}
 
 			if (patch) {
-				/* Enable ATX and relay power switching */
-				BD_SET(pos, PWRATX);
+				/* Enable relay power switching */
 				BD_SET(pos, PWRRELAY);
-				/* Serial */
-				BD_SET(pos, SERIAL2);
-				/* ATX standby */
-				BD_SET(pos, STANDBY);
 			}
 			printf("0x%08x: BOARD_DESCRIPTION: ", pos-fw);
 			print_boarddescription(pos);
@@ -259,6 +255,7 @@ void syntax(char *name)
 	fprintf(stderr,"\t-d\t\tdisplay all properties of the image\n");
 	fprintf(stderr,"\t-u\t\tupdate checksum of the image\n");
 	fprintf(stderr,"\t-b\t\tmodify BOARD_DESCRIPTION for more power-switch options\n");
+	fprintf(stderr,"\t-e\t\textract files in firmware\n");
 	fprintf(stderr,"\t-t property\tset 'property' to true\n");
 	fprintf(stderr,"\t-f property\tset 'property' to false\n");
 	fprintf(stderr,"\t-w property\tallow read-write access to 'property'\n");
@@ -356,11 +353,12 @@ int main(int argc, char **argv)
 	int update_crc = 0;
 	int patch_bd = 0;
 	int patch_fw = 0;
+	int extract = 0;
 
 	if (argc < 2)
 		syntax(argv[0]);
 
-	while ((opt = getopt(argc, argv, "dubt:f:w:r:")) != -1) {
+	while ((opt = getopt(argc, argv, "dubet:f:w:r:")) != -1) {
 		switch(opt) {
 			case 'd':
 				showall = 1;
@@ -371,6 +369,9 @@ int main(int argc, char **argv)
 			case 'b':
 				patch_bd = 1;
 				break;
+			case 'e':
+				extract = 1;
+				break;
 			case 't':
 			case 'f':
 			case 'w':
@@ -422,6 +423,7 @@ int main(int argc, char **argv)
 	ret = check_crc(fw, statbuf.st_size);
 	if ((ret != 0) && (!update_crc)) {
 		fprintf(stderr,"Checksum incorrect, aborting...\n");
+		exit(1);
 	}
 
 	if (patch_fw) {
@@ -459,7 +461,25 @@ int main(int argc, char **argv)
 		handle_boarddescription(fw, statbuf.st_size -4, 0);
 	}
 
+	if (extract) {
+		extract_files(fw, statbuf.st_size - 4);
+	}
+
 	if (update_crc || patch_fw || patch_bd) {
+		struct file_entry *fent;
+		char *last_name = NULL;
+
+		fent = get_next_file(fw, statbuf.st_size - 4);
+		while (fent != NULL) {
+			last_name = fent->name;
+			fent = get_next_file(NULL, 0);
+		}
+
+		if (strcmp(last_name, "pdata")) {
+			fprintf(stderr, "corrupt firmware image found (pdata is not last entry, aborting!\n");
+			exit(1);
+		}
+
 		ret = rsb_crc2(fw, statbuf.st_size, 0x55335053, &crc);
 		if (ret == 4) {
 			*((unsigned int*)(fw + statbuf.st_size - 4)) = crc;