Prepaired new code for fiasco images
This commit is contained in:
Pali Rohár committed
1 parent
f62628bf29
commit
f8d3fa0ecd
4 files changed
+306
No files matched your search
@@ -0,0 +1,72 @@
|
||||
|
||||
struct fiasco * fiasco_alloc_empty(void) {
|
||||
|
||||
struct fiasco * fiasco = calloc(1, sizeof(struct fiasco));
|
||||
if ( ! fiasco ) {
|
||||
perror("Cannot allocate memory");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
fiasco->fd = -1;
|
||||
return fiasco;
|
||||
|
||||
}
|
||||
|
||||
struct fiasco * fiasco_alloc_from_file(const char * file) {
|
||||
|
||||
struct fiasco * fiasco = fiasco_alloc_empty();
|
||||
if ( ! fiasco )
|
||||
return NULL;
|
||||
|
||||
fiasco->fd = open(file, O_RDONLY);
|
||||
if ( fiasco->fd < 0 ) {
|
||||
perror("Cannot open file");
|
||||
free(image);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* TODO: Read from file */
|
||||
|
||||
/* use: image_from_fiasco */
|
||||
|
||||
}
|
||||
|
||||
void fiasco_free(struct fiasco * fiasco) {
|
||||
|
||||
struct image_list * list = fiasco->first;
|
||||
|
||||
while ( list ) {
|
||||
struct image_list * next = list->next;
|
||||
image_list_del(list);
|
||||
list = next;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
int fiasco_add_image(struct fiasco * fiasco, struct image * image) {
|
||||
|
||||
if ( fiasco->fd >= 0 ) {
|
||||
fprintf(stderr, "Fiasco image is on disk\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
if ( ! fiasco->first ) {
|
||||
fiasco->first = calloc(1, sizeof(struct image_list));
|
||||
fiasco->image = image;
|
||||
} else {
|
||||
image_list_add(&fiasco->first, image);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
int fiasco_write_to_file(struct fiasco * fiasco, const char * file) {
|
||||
|
||||
/* TODO: Write fiasco image to file */
|
||||
|
||||
}
|
||||
|
||||
int fiasco_unpack(struct fiasco * fiasco, const char * dir) {
|
||||
|
||||
/* TODO: Unpack fiasco image to dir */
|
||||
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
|
||||
#include "image.h"
|
||||
|
||||
struct fiasco {
|
||||
char swver[12];
|
||||
int fd;
|
||||
struct image_list * first;
|
||||
}
|
||||
|
||||
struct fiasco * fiasco_alloc_empty(void);
|
||||
struct fiasco * fiasco_alloc_from_file(const char * file);
|
||||
void fiasco_free(struct fiasco * fiasco);
|
||||
int fiasco_add_image(struct fiasco * fiasco, struct image * image);
|
||||
int fiasco_write_to_file(struct fiasco * fiasco, const char * file);
|
||||
int fiasco_unpack(struct fiasco * fiasco, const char * dir);
|
||||
+165
@@ -0,0 +1,165 @@
|
||||
|
||||
#define IMAGE_CHECK(image) do { if ( ! image || image->fd < 0 ) return; } while (0)
|
||||
#define IMAGE_STORE_CUR(image) do { if ( shared_fd ) image->cur = lseek(image->fd, 0, SEEK_CUR) - image->offset; } while (0)
|
||||
#define IMAGE_RESTORE_CUR(image) do { if ( shared_fd ) lseek(image->fd, image->offset + image->cur, SEEK_SET); } while (0)
|
||||
|
||||
static void image_append(struct image * image, enum image_type type, enum device device, const char * hwrevs, const char * version, const char * layout) {
|
||||
|
||||
image->hash = image_hash(image);
|
||||
image->device = device;
|
||||
|
||||
if ( type )
|
||||
image->type = type;
|
||||
else
|
||||
image->type = image_type(image);
|
||||
|
||||
if ( hwrevs )
|
||||
image->hwrevs = strdup(hwrevs);
|
||||
|
||||
if ( version )
|
||||
image->version = strdup(version);
|
||||
|
||||
if ( layout )
|
||||
image->layout = strdup(layout);
|
||||
|
||||
}
|
||||
|
||||
static struct image * image_alloc(void) {
|
||||
|
||||
struct image * image = calloc(1, sizeof(struct image));
|
||||
if ( ! image ) {
|
||||
perror("Cannot allocate memory");
|
||||
return NULL;
|
||||
}
|
||||
return image;
|
||||
|
||||
}
|
||||
|
||||
struct image * image_alloc_from_file(const char * file, const char * type, const char * device, const char * hwrevs, const char * version, const char * layout) {
|
||||
|
||||
struct image * image = image_alloc();
|
||||
if ( ! image )
|
||||
return NULL;
|
||||
|
||||
image->shared_fd = 0;
|
||||
image->fd = open(file, O_RDONLY);
|
||||
if ( image->fd < 0 ) {
|
||||
perror("Cannot open file");
|
||||
free(image);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
image->size = lseek(image->fd, 0, SEEK_END);
|
||||
image->offset = 0;
|
||||
image->cur = 0;
|
||||
|
||||
image_append(image, type, device, hwrevs, version, layout);
|
||||
return image;
|
||||
|
||||
}
|
||||
|
||||
struct image * image_alloc_from_fiasco(struct image * image, int fd, size_t size, size_t offset, const char * type, const char * device, const char * hwrevs, const char * version, const char * layout) {
|
||||
|
||||
struct image * image = image_alloc();
|
||||
if ( ! image )
|
||||
return NULL;
|
||||
|
||||
image->shared_fd = 1;
|
||||
image->fd = fd;
|
||||
image->size = size;
|
||||
image->offset = offset;
|
||||
image->cur = 0;
|
||||
|
||||
image_append(image, type, device, hwrevs, version, layout);
|
||||
return image;
|
||||
|
||||
}
|
||||
|
||||
void image_free(struct image * image) {
|
||||
|
||||
IMAGE_CHECK(image);
|
||||
|
||||
if ( image->shared_fd ) {
|
||||
close(image->fd);
|
||||
image->fd = -1;
|
||||
}
|
||||
|
||||
free(image->type);
|
||||
free(image->device);
|
||||
free(image->hwrevs);
|
||||
free(image->version);
|
||||
free(image->layout);
|
||||
|
||||
free(image);
|
||||
|
||||
}
|
||||
|
||||
void image_seek(struct image * image, whence) {
|
||||
|
||||
IMAGE_CHECK(image);
|
||||
lseek(image->fd, image->offset + whence, SEEK_SET);
|
||||
IMAGE_STORE_CUR(image)
|
||||
|
||||
}
|
||||
|
||||
size_t image_read(struct image * image, void * buf, size_t count) {
|
||||
|
||||
IMAGE_CHECK(image);
|
||||
IMAGE_RESTORE_CUR(image);
|
||||
|
||||
if ( image->cur + count > image->size )
|
||||
count = image->size - image->cur;
|
||||
|
||||
count = read(image->fd, buf, count);
|
||||
|
||||
IMAGE_STORE_CUR(image);
|
||||
return count;
|
||||
|
||||
}
|
||||
|
||||
size_t image_write(struct image * image, void * buf, size_t count) {
|
||||
|
||||
IMAGE_CHECK(image);
|
||||
IMAGE_RESTORE_CUR(image);
|
||||
count = write(image->fd, buf, count);
|
||||
IMAGE_STORE_CUR(image);
|
||||
return count;
|
||||
|
||||
}
|
||||
|
||||
|
||||
void image_list_add(struct image_list ** list, struct image * image) {
|
||||
|
||||
struct image_list * first = calloc(1, sizeof(struct image_list));
|
||||
if ( ! next )
|
||||
return;
|
||||
|
||||
first->image = image;
|
||||
first->next = *list;
|
||||
|
||||
if ( *list ) {
|
||||
first->prev = *list->prev;
|
||||
if ( *list->prev )
|
||||
*list->prev->next = first;
|
||||
*list->prev = first;
|
||||
} else {
|
||||
*list = first;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void image_list_del(struct image_list * list) {
|
||||
|
||||
if ( ! list )
|
||||
return;
|
||||
|
||||
if ( list->prev )
|
||||
list->prev->next = list->next;
|
||||
|
||||
if ( list->next )
|
||||
list->next->prev = list->prev;
|
||||
|
||||
image_free(list->image);
|
||||
free(list);
|
||||
|
||||
}
|
||||
+54
@@ -0,0 +1,54 @@
|
||||
|
||||
enum image_type {
|
||||
IMAGE_UNKNOWN = 0,
|
||||
IMAGE_XLOADER,
|
||||
IMAGE_2ND,
|
||||
IMAGE_SECONDARY,
|
||||
IMAGE_KERNEL,
|
||||
IMAGE_INITFS,
|
||||
IMAGE_ROOTFS,
|
||||
IMAGE_OMAPNAND,
|
||||
IMAGE_MMC,
|
||||
IMAGE_CMT_2ND,
|
||||
IMAGE_CMT_ALGO,
|
||||
IMAGE_CMT_MCUSW,
|
||||
};
|
||||
|
||||
enum device {
|
||||
DEVICE_UNKNOWN = 0,
|
||||
DEVICE_SU_18, /* Nokia 770 */
|
||||
DEVICE_RX_34, /* Nokia N800 */
|
||||
DEVICE_RX_44, /* Nokia N810 */
|
||||
DEVICE_RX_48, /* Nokia N810 WiMax */
|
||||
DEVICE_RX_51, /* Nokia N900 */
|
||||
};
|
||||
|
||||
struct image {
|
||||
enum image_type type;
|
||||
enum device device;
|
||||
char * hwrevs;
|
||||
char * version;
|
||||
char * layout;
|
||||
uint16_t hash;
|
||||
uint32_t size;
|
||||
|
||||
int fd;
|
||||
int shared_fd;
|
||||
off_t offset;
|
||||
off_t cur;
|
||||
}
|
||||
|
||||
struct image_list {
|
||||
struct image * image;
|
||||
struct image_list * prev;
|
||||
struct image_list * next;
|
||||
}
|
||||
|
||||
struct image * image_alloc_from_file(const char * file, const char * type, const char * device, const char * hwrevs, const char * version, const char * layout);
|
||||
struct image * image_alloc_from_fiasco(struct image * image, int fd, size_t size, size_t offset, const char * type, const char * device, const char * hwrevs, const char * version, const char * layout);
|
||||
void image_free(struct image * image);
|
||||
void image_seek(struct image * image, whence);
|
||||
size_t image_read(struct image * image, void * buf, size_t count);
|
||||
size_t image_write(struct image * image, void * buf, size_t count);
|
||||
void image_list_add(struct image_list ** list, struct image * image);
|
||||
void image_list_del(struct image_list * list);
|
||||
Reference in new issue
Block a user