#include <string.h>
#include <strings.h>
#include "rsb-crc.h"
+#include "extract.h"
#define FINDSTR(addr, str) (!strncmp((char*)addr, str, strlen(str)))
}
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)));
}
}
}
}
}
+#define BD_SERIAL1 0x14,0x02
+#define BD_ICMB 0x14,0x04
+#define BD_LAN 0x14,0x08
+#define BD_SERIAL2 0x14,0x10
+#define BD_SERIAL3 0x14,0x20
+#define BD_USB 0x14,0x40
+#define BD_PCI 0x15,0x03
+#define BD_LPC 0x15,0x04
+#define BD_VGA 0x15,0x08
+#define BD_BATTERY 0x15,0x10
+#define BD_ACDC 0x15,0x20
+#define BD_STANDBY 0x15,0x40
+#define BD_POWERCONN 0x15,0x70
+#define BD_DVI 0x15,0x80
+#define BD_PWRATX 0x16,0x01
+#define BD_PWRRELAY 0x16,0x02
+#define BD_PS2A 0x19,0xff
+
+#define MAGIC(fn, args...) fn(args)
+
+#define _BD_IS_SET(bd, byte, bits) (bd[byte] & bits)
+#define BD_IS_SET(bd, ident) MAGIC(_BD_IS_SET, bd, BD_##ident)
+#define BD_TEXT(bd, ident) (BD_IS_SET(bd, ident) ? "TRUE" : "FALSE")
+
+#define _BD_SET(bd, byte, bits) (bd[byte] |= bits)
+#define BD_SET(bd, ident) MAGIC(_BD_SET, bd, BD_##ident)
+
void print_boarddescription(unsigned char *bd)
{
int j;
* com/agilent/rmc/mgui/panels/PowerMgmtConf.jad
* com/agilent/rmc/mgui/panels/RemoteDiskConf.jad
*/
- printf("\tserial1Present\t\t: %s\n", ((bd[20] & 2) ? "TRUE" : "FALSE"));
- printf("\ticmbPresent\t\t: %s\n", ((bd[20] & 4) ? "TRUE" : "FALSE"));
- printf("\tlanPresent\t\t: %s\n", ((bd[20] & 8) ? "TRUE" : "FALSE"));
- printf("\tserial2Present\t\t: %s\n", ((bd[20] & 0x10) ? "TRUE" : "FALSE"));
- printf("\tserial3Present\t\t: %s\n", ((bd[20] & 0x20) ? "TRUE" : "FALSE"));
- printf("\tusbPresent\t\t: %s\n", ((bd[20] & 0x40) ? "TRUE" : "FALSE"));
- printf("\tpciPresent\t\t: %s\n", ((bd[21] & 3) ? "TRUE" : "FALSE"));
- printf("\tlpcPresent\t\t: %s\n", ((bd[21] & 4) ? "TRUE" : "FALSE"));
- printf("\tvgaPresent\t\t: %s\n", ((bd[21] & 8) ? "TRUE" : "FALSE"));
- printf("\tbatteryPresent\t\t: %s\n", ((bd[21] & 0x10) ? "TRUE" : "FALSE"));
- printf("\tacdcPresent\t\t: %s\n", ((bd[21] & 0x20) ? "TRUE" : "FALSE"));
- printf("\tstandbyPresent\t\t: %s\n", ((bd[21] & 0x40) ? "TRUE" : "FALSE"));
- printf("\thasPowerConnectors\t: %s\n", ((bd[21] & 0x70) ? "TRUE" : "FALSE"));
- printf("\tdviPresent\t\t: %s\n", ((bd[21] & 0x80) ? "TRUE" : "FALSE"));
- printf("\tpowerSwitchATX\t\t: %s\n", ((bd[22] & 1) ? "TRUE" : "FALSE"));
- printf("\tpowerSwitchRelay\t: %s\n", ((bd[22] & 2) ? "TRUE" : "FALSE"));
+ printf("\tserial1Present\t\t: %s\n", BD_TEXT(bd, SERIAL1));
+ printf("\ticmbPresent\t\t: %s\n", BD_TEXT(bd, ICMB));
+ printf("\tlanPresent\t\t: %s\n", BD_TEXT(bd, LAN));
+ printf("\tserial2Present\t\t: %s\n", BD_TEXT(bd, SERIAL2));
+ printf("\tserial3Present\t\t: %s\n", BD_TEXT(bd, SERIAL3));
+ printf("\tusbPresent\t\t: %s\n", BD_TEXT(bd, USB));
+ printf("\tpciPresent\t\t: %s\n", BD_TEXT(bd, PCI));
+ printf("\tlpcPresent\t\t: %s\n", BD_TEXT(bd, LPC));
+ printf("\tvgaPresent\t\t: %s\n", BD_TEXT(bd, VGA));
+ printf("\tbatteryPresent\t\t: %s\n", BD_TEXT(bd, BATTERY));
+ printf("\tacdcPresent\t\t: %s\n", BD_TEXT(bd, ACDC));
+ printf("\tstandbyPresent\t\t: %s\n", BD_TEXT(bd, STANDBY));
+ printf("\thasPowerConnectors\t: %s\n", BD_TEXT(bd, POWERCONN));
+ printf("\tdviPresent\t\t: %s\n", BD_TEXT(bd, DVI));
+ printf("\tpowerSwitchATX\t\t: %s\n", BD_TEXT(bd, PWRATX));
+ printf("\tpowerSwitchRelay\t: %s\n", BD_TEXT(bd, PWRRELAY));
/* 22 & 4 */
- printf("\tps2aPresent\t\t: %s\n", ((bd[25]) ? "TRUE" : "FALSE"));
+ printf("\tps2aPresent\t\t: %s\n", BD_TEXT(bd, PS2A));
}
void handle_boarddescription(unsigned char *fw, int len, int patch)
}
if (patch) {
- /* Enable ATX and relay power switching */
- pos[22] |= 0x03;
+ /* Enable relay power switching */
+ BD_SET(pos, PWRRELAY);
}
printf("0x%08x: BOARD_DESCRIPTION: ", pos-fw);
print_boarddescription(pos);
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");
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;
case 'b':
patch_bd = 1;
break;
+ case 'e':
+ extract = 1;
+ break;
case 't':
case 'f':
case 'w':
ret = check_crc(fw, statbuf.st_size);
if ((ret != 0) && (!update_crc)) {
fprintf(stderr,"Checksum incorrect, aborting...\n");
+ exit(1);
}
if (patch_fw) {
handle_boarddescription(fw, statbuf.st_size -4, 0);
}
+ if (extract) {
+ extract_files(fw, statbuf.st_size - 4);
+ }
+
if (update_crc || patch_fw || patch_bd) {
ret = rsb_crc2(fw, statbuf.st_size, 0x55335053, &crc);
if (ret == 4) {
projects / rsbs2 / blobdiff