Remove old fiasco.c code
This commit is contained in:
Pali Rohár committed
1 parent
9baad78435
commit
1b99ad115a
5 files changed
+29
-675
No files matched your search
+1
-1
@@ -1,5 +1,5 @@
|
||||
include ../config.mk
|
||||
OBJ=main.o fiasco.o hexdump.o dump.o flash.o serial.o qmode.o
|
||||
OBJ=main.o hexdump.o dump.o flash.o serial.o qmode.o
|
||||
OBJ+=hash.o fpid.o query.o pieces.o utils.o devices.o console.o
|
||||
OBJ+=squeue/squeue.o
|
||||
BIN=0xFFFF
|
||||
|
||||
-648
@@ -1,648 +0,0 @@
|
||||
/*
|
||||
* 0xFFFF - Open Free Fiasco Firmware Flasher
|
||||
* Copyright (C) 2007-2011 pancake <pancake@youterm.com>
|
||||
* Copyright (C) 2011-2012 Pali Rohár <pali.rohar@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <arpa/inet.h>
|
||||
#include "main.h"
|
||||
#include "hash.h"
|
||||
|
||||
char *strdup(const char *s);
|
||||
|
||||
int (*fiasco_callback)(struct header_t *header) = NULL;
|
||||
|
||||
int openfiasco(const char *name, const char *type, const char *device, const char *hwrev, const char *version, int v)
|
||||
{
|
||||
struct header_t header;
|
||||
unsigned char buf[256];
|
||||
unsigned char data[256];
|
||||
unsigned char *pdata, *pdataend;
|
||||
unsigned int headerlen;
|
||||
unsigned int blockcount;
|
||||
off_t off, here;
|
||||
int subsections;
|
||||
int match;
|
||||
int i;
|
||||
|
||||
memset(&header, 0, sizeof(header));
|
||||
header.fd = open(name, O_RDONLY);
|
||||
|
||||
if (header.fd == -1) {
|
||||
fprintf(stderr, "Cannot open %s\n", name);
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* read header */
|
||||
if (read(header.fd, buf, 5) != 5) {
|
||||
printf("Invalid read of 5 bytes\n");
|
||||
return close(header.fd);
|
||||
}
|
||||
if (buf[0] != 0xb4) {
|
||||
printf("Invalid header\n");
|
||||
return close(header.fd);
|
||||
}
|
||||
|
||||
memcpy(&headerlen,buf+1,4);
|
||||
headerlen = ntohl(headerlen);
|
||||
if (headerlen>128) {
|
||||
printf("Stupid length at header. Is this a joke?\n");
|
||||
return close(header.fd);
|
||||
}
|
||||
|
||||
memset(buf,'\0', 128);
|
||||
if (read(header.fd, buf, headerlen) != headerlen) {
|
||||
printf("Invalid read of %d bytes\n", headerlen);
|
||||
return close(header.fd);
|
||||
}
|
||||
|
||||
memcpy(&blockcount,buf,4);
|
||||
blockcount = ntohl(blockcount);
|
||||
if (blockcount==0) {
|
||||
printf("Error: No block in header\n");
|
||||
return close(header.fd);
|
||||
}
|
||||
if (v) printf("Number of blocks: %d\n", blockcount);
|
||||
|
||||
pdata = buf+4;
|
||||
while (pdata < buf+headerlen-4) {
|
||||
if (pdata[0] == 0xe8) {
|
||||
if (v) printf("Header: %s\n", pdata+2);
|
||||
} else if (pdata[0] == 0x31) {
|
||||
i = pdata[1];
|
||||
if (i >= sizeof(header.swver)) i = sizeof(header.swver)-1;
|
||||
memset(header.swver, 0, sizeof(header.swver));
|
||||
strncpy(header.swver, (char *)pdata+2, i);
|
||||
if (v) printf("SW version: %s\n", header.swver);
|
||||
} else {
|
||||
if (v) printf("Unknown header 0x%x, length %d, data %s\n", pdata[0], pdata[1], pdata+2);
|
||||
}
|
||||
pdata += (int)pdata[1]+2;
|
||||
}
|
||||
|
||||
/* walk the tree */
|
||||
while(1) {
|
||||
here = lseek(header.fd, 0, SEEK_CUR);
|
||||
|
||||
i = 0;
|
||||
while(1) {
|
||||
if (read(header.fd, buf, 7)<7) {
|
||||
printf("Next valid header not found\n");
|
||||
return close(header.fd);
|
||||
}
|
||||
if (buf[0] == 0x54 && buf[2] == 0x2E && buf[3] == 0x19 && buf[4] == 0x01 && buf[5] == 0x01 && buf[6] == 0x00)
|
||||
break;
|
||||
lseek(header.fd, -6, SEEK_CUR);
|
||||
++i;
|
||||
}
|
||||
if (i && v) printf("Skipping %d padding bytes\n", i);
|
||||
|
||||
subsections = buf[1]-1;
|
||||
|
||||
if (read(header.fd, buf+7, 2)<2)
|
||||
break;
|
||||
header.hash = buf[7]<<8|buf[8];
|
||||
|
||||
/* piece name */
|
||||
memset(data, '\0', 13);
|
||||
if (read(header.fd, data, 12)<12)
|
||||
break;
|
||||
|
||||
if (data[0] == 0xff) {
|
||||
printf(" [eof]\n");
|
||||
break;
|
||||
} else if (v) printf(" %s\n", data);
|
||||
memset(header.type, 0, sizeof(header.type));
|
||||
strncpy(header.type, (char *)data, sizeof(header.type)-1);
|
||||
|
||||
if (v) {
|
||||
printf(" header: ");
|
||||
for (i=0; i<7;++i) printf(" 0x%.2X", (unsigned int)buf[i]);
|
||||
printf("\n");
|
||||
}
|
||||
|
||||
if (read(header.fd, buf, 9)<9)
|
||||
return close(header.fd);
|
||||
memcpy(&header.size, buf,4);
|
||||
header.size = ntohl(header.size);
|
||||
if (v) {
|
||||
printf(" offset: 0x%08x\n", (unsigned int)here);
|
||||
printf(" size: %d bytes\n", header.size);
|
||||
printf(" hash: %04x\n", header.hash);
|
||||
printf(" subsections: %d\n", subsections);
|
||||
}
|
||||
|
||||
memset(header.device, 0, sizeof(header.device));
|
||||
memset(header.hwrevs, 0, sizeof(header.hwrevs));
|
||||
memset(header.version, 0, sizeof(header.version));
|
||||
if (header.layout) {
|
||||
free(header.layout);
|
||||
header.layout = NULL;
|
||||
}
|
||||
|
||||
while (subsections > 0) {
|
||||
if (read(header.fd, data, 1)<1)
|
||||
return close(header.fd);
|
||||
i = data[0];
|
||||
if (read(header.fd, data, i)<i)
|
||||
return close(header.fd);
|
||||
{
|
||||
if (v) {
|
||||
printf(" subinfo\n");
|
||||
printf(" type: ");
|
||||
if (buf[8] == '1') printf("version string");
|
||||
else if (buf[8] == '2') printf("hw revision");
|
||||
else if (buf[8] == '3') printf("layout");
|
||||
else printf("unknown (%c:0x%x)", buf[8], buf[8]);
|
||||
printf("\n");
|
||||
printf(" length: %d\n", i);
|
||||
}
|
||||
pdata = data;
|
||||
pdataend = data+i;
|
||||
while(pdata<pdataend) {
|
||||
char buf2[9];
|
||||
if (buf[8] == '2' && pdata != data) {
|
||||
memset(buf2, 0, 9);
|
||||
strncpy(buf2, (char *)pdata, 8);
|
||||
}
|
||||
if (v) {
|
||||
printf(" ");
|
||||
if (buf[8] == '1') printf("version");
|
||||
else if (buf[8] == '2' && pdata == data) printf("device");
|
||||
else if (buf[8] == '2' && pdata != data) printf("hw revision");
|
||||
else if (buf[8] == '3') printf("layout");
|
||||
else printf("data");
|
||||
if (buf[8] == '2' && pdata != data)
|
||||
printf(": %s\n", buf2);
|
||||
else if (buf[8] == '3')
|
||||
printf(": (not printing)\n");
|
||||
else if (buf[8] == '1' || buf[8] == '2')
|
||||
printf(": %s\n", pdata);
|
||||
else {
|
||||
char *buf3 = malloc(i+1);
|
||||
memcpy(buf3, pdata, i);
|
||||
buf3[i] = 0;
|
||||
printf(": (raw) %s\n", buf3);
|
||||
free(buf3);
|
||||
}
|
||||
}
|
||||
if (buf[8] == '1') {
|
||||
strncpy(header.version, (char *)pdata, sizeof(header.version)-1);
|
||||
} else if (buf[8] == '2' && pdata == data) {
|
||||
strncpy(header.device, (char *)pdata, sizeof(header.device)-1);
|
||||
} else if (buf[8] == '2' && pdata != data) {
|
||||
if (header.hwrevs[0] == 0)
|
||||
strncpy(header.hwrevs, buf2, sizeof(header.hwrevs)-1);
|
||||
else {
|
||||
strcat(header.hwrevs, ",");
|
||||
strcat(header.hwrevs, buf2);
|
||||
}
|
||||
} else if (buf[8] == '3') {
|
||||
if (header.layout) free(header.layout);
|
||||
header.layout = malloc(strlen((char*)pdata)+1);
|
||||
if (header.layout) strcpy(header.layout, (char *)pdata);
|
||||
}
|
||||
if (buf[8] == '2' && pdata != data && strlen((char *)pdata) > 8)
|
||||
pdata += 8;
|
||||
else
|
||||
pdata += strlen((char*)pdata)+1;
|
||||
for(;*pdata=='\0' && pdata<pdataend; pdata++);
|
||||
}
|
||||
}
|
||||
if (read(header.fd, buf+8, 1)<1)
|
||||
return close(header.fd);
|
||||
--subsections;
|
||||
}
|
||||
|
||||
header.name = malloc(strlen(header.type)+strlen(header.device)+strlen(header.hwrevs)+strlen(header.version)+4);
|
||||
if (!header.name) {
|
||||
printf("malloc error\n");
|
||||
exit(1);
|
||||
}
|
||||
strcpy(header.name, header.type);
|
||||
if (header.device[0]) {
|
||||
strcat(header.name, "-");
|
||||
strcat(header.name, header.device);
|
||||
}
|
||||
if (header.hwrevs[0]) {
|
||||
strcat(header.name, "-");
|
||||
strcat(header.name, header.hwrevs);
|
||||
}
|
||||
if (header.version[0]) {
|
||||
strcat(header.name, "-");
|
||||
strcat(header.name, header.version);
|
||||
}
|
||||
|
||||
off = lseek(header.fd, 0, SEEK_CUR);
|
||||
if (v) {
|
||||
printf(" version: %s\n", header.version);
|
||||
printf(" device: %s\n", header.device);
|
||||
printf(" hwrevs: %s\n", header.hwrevs);
|
||||
printf(" name: %s\n", header.name);
|
||||
printf(" body-at: 0x%08x\n", (unsigned int)off);
|
||||
}
|
||||
|
||||
match = 1;
|
||||
|
||||
if (match && type && strcmp(header.type, type) != 0)
|
||||
match = 0;
|
||||
|
||||
if (match && device && strcmp(header.device, device) != 0)
|
||||
match = 0;
|
||||
|
||||
if (match && version && strcmp(header.version, version) != 0)
|
||||
match = 0;
|
||||
|
||||
if (match && hwrev) {
|
||||
char *tmp1 = malloc(strlen(header.hwrevs)+3);
|
||||
char *tmp2 = malloc(strlen(hwrev)+3);
|
||||
|
||||
if (!tmp1 || !tmp2) {
|
||||
printf("malloc error\n");
|
||||
return close(header.fd);
|
||||
}
|
||||
|
||||
sprintf(tmp1, ",%s,", header.hwrevs);
|
||||
sprintf(tmp2, ",%s,", hwrev);
|
||||
|
||||
if (!strstr(tmp1, tmp2))
|
||||
match = 0;
|
||||
|
||||
free(tmp1);
|
||||
free(tmp2);
|
||||
}
|
||||
|
||||
/* callback */
|
||||
if (match) {
|
||||
printf("==> %s\n", header.name);
|
||||
if (fiasco_callback != NULL) {
|
||||
fiasco_callback(&header);
|
||||
if (header.layout) {
|
||||
free(header.layout);
|
||||
header.layout = NULL;
|
||||
}
|
||||
free(header.name);
|
||||
free(header.data);
|
||||
continue;
|
||||
} else {
|
||||
// ??huh
|
||||
}
|
||||
} else {
|
||||
printf("ignored %s\n", header.name);
|
||||
}
|
||||
// XXX dup
|
||||
lseek(header.fd, off, SEEK_SET);
|
||||
lseek(header.fd, header.size, SEEK_CUR);
|
||||
if (header.layout) {
|
||||
free(header.layout);
|
||||
header.layout = NULL;
|
||||
}
|
||||
free(header.name);
|
||||
}
|
||||
return close(header.fd);
|
||||
}
|
||||
|
||||
void fiasco_data_read(struct header_t *header)
|
||||
{
|
||||
header->data = (unsigned char *)malloc(header->size);
|
||||
if (header->data == NULL) {
|
||||
printf("Cannot alloc %d bytes\n", header->size);
|
||||
return;
|
||||
}
|
||||
if (read (header->fd, header->data, header->size) != header->size) {
|
||||
printf("Cannot read %d bytes\n", header->size);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
/* fiasco writer */
|
||||
int fiasco_new(const char *filename, const char *swver)
|
||||
{
|
||||
int fd;
|
||||
unsigned int len;
|
||||
unsigned char len8;
|
||||
const char *str = "OSSO UART+USB";
|
||||
|
||||
if (swver && strlen(swver)+1 > UINT8_MAX) {
|
||||
printf("SW version is too long\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
fd = open(filename, O_RDWR|O_CREAT|O_TRUNC, 0644);
|
||||
if (fd == -1)
|
||||
return -1;
|
||||
|
||||
printf("Writing header\n");
|
||||
|
||||
write(fd, "\xb4", 1); //signature
|
||||
|
||||
len = 4;
|
||||
len += strlen(str) + 3;
|
||||
if (swver)
|
||||
len += strlen(swver) + 3;
|
||||
len = htonl(len);
|
||||
write(fd, &len, 4);
|
||||
|
||||
if (swver)
|
||||
len = htonl(2);
|
||||
else
|
||||
len = htonl(1);
|
||||
write(fd, &len, 4);
|
||||
|
||||
// header
|
||||
len = strlen(str)+1;
|
||||
len8 = len;
|
||||
write(fd, "\xe8", 1);
|
||||
write(fd, &len8, 1);
|
||||
write(fd, str, len);
|
||||
|
||||
// sw version
|
||||
if (swver) {
|
||||
printf("Writing SW version: %s\n", swver);
|
||||
len = strlen(swver)+1;
|
||||
len8 = len;
|
||||
write(fd, "\x31", 1);
|
||||
write(fd, &len8, 1);
|
||||
write(fd, swver, len);
|
||||
};
|
||||
|
||||
return fd;
|
||||
}
|
||||
|
||||
int fiasco_add(int fd, const char *name, const char *file, const char *layout, const char *device, const char *hwrevs, const char *version)
|
||||
{
|
||||
int i;
|
||||
int gd,ret;
|
||||
int size;
|
||||
int align;
|
||||
unsigned int sz;
|
||||
unsigned char len;
|
||||
unsigned short hash;
|
||||
unsigned char *ptr = (unsigned char *)&hash;
|
||||
char buf[4096];
|
||||
char bname[32];
|
||||
|
||||
if (fd == -1)
|
||||
return -1;
|
||||
if (file == NULL)
|
||||
return -1;
|
||||
gd = open(file, O_RDONLY);
|
||||
if (gd == -1)
|
||||
return -1;
|
||||
|
||||
sz = lseek(gd, 0, SEEK_END);
|
||||
if (name) {
|
||||
if (strcmp(name, "mmc") == 0) // align mmc
|
||||
sz = ((sz >> 8) + 1) << 8;
|
||||
else if (strcmp(name, "kernel") == 0) // align kernel
|
||||
sz = ((sz >> 7) + 1) << 7;
|
||||
}
|
||||
|
||||
printf(" size: %d\n", sz);
|
||||
sz = htonl((unsigned int) sz);
|
||||
|
||||
lseek(gd, 0, SEEK_SET);
|
||||
|
||||
write(fd, "T", 1);
|
||||
|
||||
/* number of subsections */
|
||||
len = 1;
|
||||
if (version)
|
||||
++len;
|
||||
if (device)
|
||||
++len;
|
||||
if (layout)
|
||||
++len;
|
||||
write(fd, &len, 1);
|
||||
|
||||
write(fd, "\x2e\x19\x01\x01\x00", 5);
|
||||
|
||||
/* checksum */
|
||||
hash = do_hash_file(file, name);
|
||||
ptr[0]^=ptr[1]; ptr[1]=ptr[0]^ptr[1]; ptr[0]^=ptr[1];
|
||||
write(fd, &hash, 2);
|
||||
printf(" hash: %04x\n", hash);
|
||||
|
||||
/* image type name */
|
||||
memset(bname, '\0', 13);
|
||||
if (name == NULL)
|
||||
name = fpid_file(file);
|
||||
/* failback */
|
||||
if (name == NULL)
|
||||
name = file;
|
||||
|
||||
strncpy(bname, name, 12);
|
||||
write(fd, bname, 12);
|
||||
write(fd, &sz, 4);
|
||||
write(fd, "\x00\x00\x00\x00", 4);
|
||||
|
||||
/* append version subsection */
|
||||
if (version) {
|
||||
write(fd, "1", 1); /* 1 - version */
|
||||
len = strlen(version)+1;
|
||||
write(fd, &len, 1);
|
||||
write(fd, version, len);
|
||||
}
|
||||
|
||||
|
||||
/* append device & hwrevs subsection */
|
||||
if (device) {
|
||||
const char *ptr = hwrevs;
|
||||
const char *oldptr = hwrevs;
|
||||
write(fd, "2", 1); /* 2 - device & hwrevs */
|
||||
len = 16;
|
||||
if (hwrevs) {
|
||||
i = 1;
|
||||
while ((ptr = strchr(ptr, ','))) { i++; ptr++; }
|
||||
if ((int)len + i*8 > 255) {
|
||||
printf("Device string and HW revisions are too long\n");
|
||||
return -1;
|
||||
}
|
||||
len += i*8;
|
||||
}
|
||||
write(fd, &len, 1);
|
||||
len = strlen(device);
|
||||
if (len > 15) len = 15;
|
||||
write(fd, device, len);
|
||||
for (i=0; i<16-len; ++i)
|
||||
write(fd, "\x00", 1);
|
||||
if (hwrevs) {
|
||||
ptr = hwrevs;
|
||||
oldptr = hwrevs;
|
||||
while ((ptr = strchr(ptr, ','))) {
|
||||
len = ptr-oldptr;
|
||||
if (len > 8) len = 8;
|
||||
write(fd, oldptr, len);
|
||||
for (i=0; i<8-len; ++i)
|
||||
write(fd, "\x00", 1);
|
||||
++ptr;
|
||||
oldptr = ptr;
|
||||
}
|
||||
len = strlen(oldptr);
|
||||
if (len > 8) len = 8;
|
||||
write(fd, oldptr, len);
|
||||
for (i=0; i<8-len; ++i)
|
||||
write(fd, "\x00", 1);
|
||||
}
|
||||
}
|
||||
|
||||
/* append layout subsection */
|
||||
if (layout) {
|
||||
int lfd = open(layout, O_RDONLY);
|
||||
if (lfd >= 0) {
|
||||
len = read(lfd, buf, sizeof(buf));
|
||||
if (len > 0) {
|
||||
write(fd, "3", 1); /* 3 - layout */
|
||||
write(fd, &len, 1);
|
||||
write(fd, buf, len);
|
||||
}
|
||||
close(lfd);
|
||||
} else {
|
||||
printf("Cannot open layout file %s\n", layout);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
/* dummy byte - end of all subsections */
|
||||
write(fd, "\x00", 1);
|
||||
|
||||
size = 0;
|
||||
while(1) {
|
||||
ret = read(gd, buf, 4096);
|
||||
size += ret;
|
||||
if (ret<1)
|
||||
break;
|
||||
if (write(fd, buf, ret) != ret) {
|
||||
fprintf (stderr, "Cannot write %d bytes\n", ret);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
/* align mmc and kernel (fill with 0xff) */
|
||||
align = 0;
|
||||
if (name) {
|
||||
if (strcmp(name, "mmc") == 0)
|
||||
align = ((size >> 8) + 1) << 8;
|
||||
else if (strcmp(name, "kernel") == 0)
|
||||
align = ((size >> 7) + 1) << 7;
|
||||
}
|
||||
if (align) {
|
||||
while (size < align) {
|
||||
write(fd, "\xff", 1);
|
||||
++size;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int fiasco_pack(int optind, char *argv[])
|
||||
{
|
||||
char *file = argv[optind];
|
||||
int fd, ret, i;
|
||||
|
||||
char *ptr;
|
||||
char *arg;
|
||||
char *type;
|
||||
char *device;
|
||||
char *hwrevs;
|
||||
char *version;
|
||||
char *layout;
|
||||
|
||||
char *swver = NULL;
|
||||
|
||||
i = optind;
|
||||
while((arg=argv[++i])) {
|
||||
if (strncmp(arg, "version:", strlen("version:"))==0) {
|
||||
swver = arg+strlen("version:");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
printf("Package: %s\n", file);
|
||||
fd = fiasco_new(file, swver);
|
||||
if (fd == -1)
|
||||
return 1;
|
||||
|
||||
while((arg=argv[++optind])) {
|
||||
|
||||
if (strncmp(arg, "version:", strlen("version:"))==0)
|
||||
continue;
|
||||
|
||||
// format: [[[[dev:[hw:]]ver:]type:]file[%layout]
|
||||
ptr = strdup(arg);
|
||||
layout = strchr(ptr, '%');
|
||||
if (layout) {
|
||||
*(layout++) = 0;
|
||||
}
|
||||
|
||||
type = NULL;
|
||||
device = NULL;
|
||||
hwrevs = NULL;
|
||||
version = NULL;
|
||||
|
||||
file = strrchr(ptr, ':');
|
||||
if (file) {
|
||||
*(file++) = 0;
|
||||
type = strrchr(ptr, ':');
|
||||
if (type) {
|
||||
*(type++) = 0;
|
||||
version = strrchr(ptr, ':');
|
||||
if (version) {
|
||||
*(version++) = 0;
|
||||
hwrevs = strchr(ptr, ':');
|
||||
if (hwrevs)
|
||||
*(hwrevs++) = 0;
|
||||
device = ptr;
|
||||
} else {
|
||||
version = ptr;
|
||||
}
|
||||
} else {
|
||||
type = ptr;
|
||||
}
|
||||
} else {
|
||||
file = ptr;
|
||||
}
|
||||
|
||||
if (!type)
|
||||
type = (char *)fpid_file(file);
|
||||
|
||||
printf("Adding file: %s\n", file);
|
||||
printf(" type: %s\n", type);
|
||||
if (device) printf(" device: %s\n", device);
|
||||
if (hwrevs) printf(" hw revisions: %s\n", hwrevs);
|
||||
if (version) printf(" version: %s\n", version);
|
||||
if (layout) printf(" layout file: %s\n", layout);
|
||||
|
||||
ret = fiasco_add(fd, type, file, layout, device, hwrevs, version);
|
||||
free(ptr);
|
||||
if (ret<0) {
|
||||
printf("Error\n");
|
||||
close(fd);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
printf("Done!\n");
|
||||
close(fd);
|
||||
return 0;
|
||||
}
|
||||
+2
-2
@@ -96,12 +96,12 @@ void flash_image(const char *filename, const char *piece, const char *device, co
|
||||
printf("Piece type: %s\n", piece);
|
||||
}
|
||||
|
||||
if (piece != NULL) {
|
||||
/* if (piece != NULL) {
|
||||
if (!strcmp(piece, "fiasco")) {
|
||||
fiasco_flash(filename);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}*/
|
||||
|
||||
if (version)
|
||||
vlen = strlen(version)+1;
|
||||
|
||||
+24
-24
@@ -29,7 +29,7 @@
|
||||
struct usb_device *device = NULL;
|
||||
struct usb_dev_handle *dev = NULL;
|
||||
#endif
|
||||
char *fiasco_image = NULL;
|
||||
//char *fiasco_image = NULL;
|
||||
char *boot_cmdline = NULL;
|
||||
char *reverseto = NULL;
|
||||
char *subverstr = NULL;
|
||||
@@ -40,7 +40,7 @@ int root_device = -1;
|
||||
int verbose = 0;
|
||||
int identify = 0;
|
||||
int moboreboot = 0;
|
||||
int unpack = 0;
|
||||
//int unpack = 0;
|
||||
int qmode = 0;
|
||||
int info = 0;
|
||||
int nomode = 0;
|
||||
@@ -205,12 +205,12 @@ void show_usage()
|
||||
" -n do not flash or write to disk (simulation)\n"
|
||||
" -C [/dev/mtd] check bad blocks on mtd\n"
|
||||
" -e [path] dump/extract pieces to path\n"
|
||||
" -F [fiasco] flash a fiasco firmware image\n"
|
||||
// " -F [fiasco] flash a fiasco firmware image\n"
|
||||
" -H [file] calculate hash for file\n"
|
||||
" -I [piece] identify a firmware piece\n"
|
||||
" -P [new-fiasco] creates a new fiasco package, pieces as arguments\n"
|
||||
" optional argument 'version:<version>'\n"
|
||||
" -u [fiasco] unpack target fiasco image\n"
|
||||
// " -P [new-fiasco] creates a new fiasco package, pieces as arguments\n"
|
||||
// " optional argument 'version:<version>'\n"
|
||||
// " -u [fiasco] unpack target fiasco image\n"
|
||||
" -v be verbose and noisy\n"
|
||||
" -V show 0xFFFF version information\n"
|
||||
" -x extract configuration entries from /dev/mtd1\n"
|
||||
@@ -222,7 +222,7 @@ void show_usage()
|
||||
exit(0);
|
||||
}
|
||||
|
||||
int unpack_callback(struct header_t *header)
|
||||
/*int unpack_callback(struct header_t *header)
|
||||
{
|
||||
FILE *fd;
|
||||
|
||||
@@ -323,7 +323,7 @@ int fiasco_flash(const char *file)
|
||||
openfiasco(file, "rootfs", NULL, NULL, NULL, 0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
}*/
|
||||
|
||||
#if HAVE_USB
|
||||
int connect_via_usb()
|
||||
@@ -436,9 +436,9 @@ int main(int argc, char **argv)
|
||||
case 'U':
|
||||
usb_mode = atoi(optarg);
|
||||
break;
|
||||
case 'F':
|
||||
fiasco_image = optarg;
|
||||
break;
|
||||
// case 'F':
|
||||
// fiasco_image = optarg;
|
||||
// break;
|
||||
case 'd':
|
||||
sscanf(optarg, "%04hx:%04hx",
|
||||
&supported_devices[SUPPORTED_DEVICES-2].vendor_id,
|
||||
@@ -481,20 +481,20 @@ int main(int argc, char **argv)
|
||||
break;
|
||||
case 's':
|
||||
return console(optarg);
|
||||
case 'u':
|
||||
fiasco_image = optarg;
|
||||
unpack = 1;
|
||||
break;
|
||||
// case 'u':
|
||||
// fiasco_image = optarg;
|
||||
// unpack = 1;
|
||||
// break;
|
||||
case 'Q':
|
||||
qmode = 1;
|
||||
break;
|
||||
case 'P':
|
||||
return fiasco_pack(optind, argv);
|
||||
// case 'P':
|
||||
// return fiasco_pack(optind, argv);
|
||||
case 'I':
|
||||
type = fpid_file(optarg);
|
||||
printf("%s: %s\n", type, optarg);
|
||||
if (type && strcmp(type, "fiasco") == 0)
|
||||
openfiasco(optarg, NULL, NULL, NULL, NULL, 1);
|
||||
// if (type && strcmp(type, "fiasco") == 0)
|
||||
// openfiasco(optarg, NULL, NULL, NULL, NULL, 1);
|
||||
identify = 1;
|
||||
break;
|
||||
case 'C':
|
||||
@@ -514,14 +514,14 @@ int main(int argc, char **argv)
|
||||
if (qmode)
|
||||
return queue_mode();
|
||||
|
||||
if (!unpack && fiasco_image)
|
||||
return fiasco_flash(fiasco_image);
|
||||
// if (!unpack && fiasco_image)
|
||||
// return fiasco_flash(fiasco_image);
|
||||
|
||||
if (identify)
|
||||
return 0;
|
||||
|
||||
// flags ok?
|
||||
if ( (fiasco_image == NULL)
|
||||
if ( /*(fiasco_image == NULL)*/ 1
|
||||
&& (boot_cmdline == NULL)
|
||||
&& (reverseto == NULL)
|
||||
&& (pcs_n == 0)
|
||||
@@ -540,7 +540,7 @@ int main(int argc, char **argv)
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (unpack) {
|
||||
/* if (unpack) {
|
||||
if (reverseto) {
|
||||
if (chdir(reverseto) < 0) {
|
||||
printf("Error: Cannot change directory to %s\n", reverseto);
|
||||
@@ -549,7 +549,7 @@ int main(int argc, char **argv)
|
||||
}
|
||||
unpack_fiasco_image(fiasco_image);
|
||||
return 0;
|
||||
}
|
||||
}*/
|
||||
|
||||
if (reverseto) {
|
||||
reverse_extract_pieces(reverseto);
|
||||
|
||||
@@ -119,12 +119,14 @@ extern char *modes[];
|
||||
extern char *root_devices[];
|
||||
|
||||
// fiasco
|
||||
/*
|
||||
int openfiasco(const char *name, const char *type, const char *device, const char *hwrev, const char *version, int v);
|
||||
int fiasco_new(const char *filename, const char *name);
|
||||
void fiasco_data_read(struct header_t *header);
|
||||
extern int (*fiasco_callback)(struct header_t *header);
|
||||
int fiasco_add(int fd, const char *name, const char *file, const char *layout, const char *device, const char *hwrevs, const char *version);
|
||||
int fiasco_pack(int optind, char *argv[]);
|
||||
*/
|
||||
int nanddump(char *mtddev, unsigned long start_addr, unsigned long length, char *dumpfile, int isbl, int ioob);
|
||||
|
||||
//
|
||||
|
||||
Reference in new issue
Block a user