X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=second%2Ffs_of.c;h=77113b14ed8bb68f1f8e83a8aacda769c2510d74;hp=bd481e43ed66007b2430f63348a029e519bf1d75;hb=62a97dcb9075e6ad3e30a60235254927f3aca2b2;hpb=d8ea971a7f1c29e384c813773331c7148e5a18aa diff --git a/second/fs_of.c b/second/fs_of.c index bd481e4..77113b1 100644 --- a/second/fs_of.c +++ b/second/fs_of.c @@ -44,7 +44,6 @@ #include "errors.h" #include "debug.h" -#define LOAD_BUFFER_POS 0x1000000 #define LOAD_BUFFER_SIZE 0x1800000 static int of_open(struct boot_file_t* file, @@ -58,6 +57,7 @@ static int of_net_open(struct boot_file_t* file, struct partition_t* part, struct boot_fspec_t* fspec); static int of_net_read(struct boot_file_t* file, unsigned int size, void* buffer); static int of_net_seek(struct boot_file_t* file, unsigned int newpos); +static unsigned int of_net_ino_size(struct boot_file_t* file); struct fs_t of_filesystem = @@ -75,7 +75,8 @@ struct fs_t of_net_filesystem = of_net_open, of_net_read, of_net_seek, - of_close + of_close, + of_net_ino_size, }; static int @@ -92,8 +93,9 @@ of_open(struct boot_file_t* file, strncpy(buffer, fspec->dev, 768); strcat(buffer, ":"); if (part) { - if (part->sys_ind == LINUX_RAID) { - DEBUG_F("skipping because partition is marked LINUX_RAID\n"); + if (part->sys_ind == LINUX_RAID || part->sys_ind == LINUX_NATIVE) { + DEBUG_F("skipping because partition is tagged %08x\n", + part->sys_ind ); DEBUG_LEAVE(FILE_ERR_BAD_FSYS); return FILE_ERR_BAD_FSYS; } @@ -205,8 +207,7 @@ of_net_open(struct boot_file_t* file, } - file->buffer = prom_claim_chunk((void *)LOAD_BUFFER_POS, - LOAD_BUFFER_SIZE, 0); + file->buffer = prom_claim_chunk_top(LOAD_BUFFER_SIZE, 0); if (file->buffer == (void *)-1) { prom_printf("Can't claim memory for TFTP download\n"); prom_close(file->of_device); @@ -282,6 +283,12 @@ of_close(struct boot_file_t* file) return 0; } +static unsigned int +of_net_ino_size(struct boot_file_t* file) +{ + return file->len; +} + /* * Local variables: * c-file-style: "k&r"