X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=second%2Ffile.c;h=b5763a235f6d5db62ad5fb1b4c92254b89775270;hp=e4c379f4900b94c8c7a15c7807fa49afc68f343a;hb=e80797f9e8b7a05aeb239ca9087ba57e7641a231;hpb=4b9f2eb054f5f0975eef271e87ded51d6b697d9f diff --git a/second/file.c b/second/file.c index e4c379f..b5763a2 100644 --- a/second/file.c +++ b/second/file.c @@ -1,20 +1,28 @@ -/* File related stuff - - Copyright (C) 1999 Benjamin Herrenschmidt - - 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 2 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, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +/* + * file.c - Filesystem related interfaces + * + * Copyright (C) 2001, 2002 Ethan Benson + * + * parse_device_path() + * + * Copyright (C) 2001 Colin Walters + * + * Copyright (C) 1999 Benjamin Herrenschmidt + * + * 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 2 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, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ #include "ctype.h" #include "types.h" @@ -26,39 +34,77 @@ #include "partition.h" #include "fs.h" #include "errors.h" +#include "debug.h" extern char bootdevice[1024]; /* This function follows the device path in the devtree and separates the device name, partition number, and other datas (mostly file name) the string passed in parameters is changed since 0 are put in place - of some separators to terminate the various strings - */ + of some separators to terminate the various strings. + + when a default device is supplied imagepath will be assumed to be a + plain filename unless it contains a : otherwise if defaultdev is + NULL imagepath will be assumed to be a device path. + + returns 1 on success 0 on failure. + + Supported examples: + - /pci@80000000/pci-bridge@d/ADPT,2930CU@2/@1:4 + - /pci@80000000/pci-bridge@d/ADPT,2930CU@2/@1:4,/boot/vmlinux + - hd:3,/boot/vmlinux + - enet:10.0.0.1,/tftpboot/vmlinux + - enet:,/tftpboot/vmlinux + - enet:bootp + - enet:0 + Supported only if defdevice == NULL + - disc + - any other device path lacking a : + Unsupported examples: + - hd:2,\\:tbxi <- no filename will be detected due to the extra : + - enet:192.168.2.1,bootme,c-iaddr,g-iaddr,subnet-mask,bootp-retries,tftp-retries */ int parse_device_path(char *imagepath, char *defdevice, int defpart, char *deffile, struct boot_fspec_t *result) { char *ptr; - char *ipath = strdup(imagepath); - char *defdev = strdup(defdevice); + char *ipath = NULL; + char *defdev = NULL; result->dev = NULL; result->part = -1; result->file = NULL; - if (!strstr(defdev, "ethernet") && !strstr(defdev, "enet")) { - if ((ptr = strrchr(defdev, ':')) != NULL) - *ptr = 0; /* remove trailing : from defdevice if necessary */ - } - if (!imagepath) - goto punt; + return 0; + else + ipath = strdup(imagepath); - if ((ptr = strrchr(ipath, ',')) != NULL) { - result->file = strdup(ptr+1); - /* Trim the filename off */ - *ptr = 0; + if (defdevice) + defdev = strdup(defdevice); + + if (defdev) { + if (!strstr(defdev, "ethernet") && !strstr(defdev, "enet")) { + if ((ptr = strrchr(defdev, ':')) != NULL) + *ptr = 0; /* remove trailing : from defdevice if necessary */ + } + } + + /* if there is no : then there is no filename or partition. must + use strrchr() since enet:,10.0.0.1,file is legal */ + + if (strchr(ipath, ':') != NULL) { + if ((ptr = strrchr(ipath, ',')) != NULL) { + char *colon = strrchr(ipath, ':'); + /* If a ':' occurs *after* a ',', then we assume that there is + no filename */ + if (!colon || colon < ptr) { + result->file = strdup(ptr+1); + /* Trim the filename off */ + *ptr = 0; + } + } } if (strstr(ipath, "ethernet") || strstr(ipath, "enet")) @@ -66,20 +112,21 @@ parse_device_path(char *imagepath, char *defdevice, int defpart, *ptr = 0; result->dev = strdup(ipath); } else - result->dev = strdup(ipath); + result->dev = strdup(ipath); else if ((ptr = strchr(ipath, ':')) != NULL) { *ptr = 0; result->dev = strdup(ipath); if (*(ptr+1)) result->part = simple_strtol(ptr+1, NULL, 10); + } else if (!defdev) { + result->dev = strdup(ipath); } else if (strlen(ipath)) { result->file = strdup(ipath); } else { return 0; } - - punt: - if (!result->dev) + + if (!result->dev && defdev) result->dev = strdup(defdev); if (result->part < 0) @@ -87,80 +134,13 @@ parse_device_path(char *imagepath, char *defdevice, int defpart, if (!result->file) result->file = strdup(deffile); + free(ipath); + if (defdev) + free(defdev); return 1; } -#if 0 -char * -parse_device_path(char *of_device, char **file_spec, int *partition) -{ - char *p, *last; - - if (file_spec) - *file_spec = NULL; - if (partition) - *partition = -1; - - DEBUG_F("of_device before parsing: %s\n", of_device); - p = strchr(of_device, ':'); - DEBUG_F("of_device after parsing: %s\n", p); - - if (!p) { /* if null terminated we are finished */ - DEBUG_F("of_device: %s\n", of_device); - return of_device; - } -#if 0 /* this is broken crap, breaks netboot entirely */ - else if (strstr(of_device, "ethernet") != NULL) - p = strchr(of_device, ','); /* skip over ip all the way to the ',' */ - else if (strstr(of_device, "enet") != NULL) - p = strchr(of_device, ','); /* skip over ip all the way to the ',' */ -#endif - *p = 0; - last = ++p; /* sets to start of second part */ - while(*p && *p != ',') { - if (!isdigit (*p)) { - p = last; - break; - } - ++p; - } - if (p != last) { - *(p++) = 0; - if (partition) - *partition = simple_strtol(last, NULL, 10); - } - if (*p && file_spec) - *file_spec = p; - - DEBUG_F("of_device: %s\n", of_device); - strcat(of_device, ":"); - DEBUG_F("of_device after strcat: %s\n", of_device); - return of_device; -} - -int -validate_fspec( struct boot_fspec_t* spec, - char* default_device, - int default_part) -{ - if (!spec->file) { - spec->file = spec->dev; - spec->dev = NULL; - } - if (spec->part == -1) - spec->part = default_part; - if (!spec->dev) - spec->dev = default_device; - if (!spec->file) - return FILE_BAD_PATH; - else if (spec->file[0] == ',') - spec->file++; - - return FILE_ERR_OK; -} - -#endif static int file_block_open( struct boot_file_t* file, @@ -168,46 +148,50 @@ file_block_open( struct boot_file_t* file, const char* file_name, int partition) { - struct partition_t* parts; - struct partition_t* p; - struct partition_t* found; + struct partition_t* parts; + struct partition_t* p; + struct partition_t* found; - parts = partitions_lookup(dev_name); - found = NULL; + parts = partitions_lookup(dev_name); + found = NULL; #if DEBUG - if (parts) - prom_printf("partitions:\n"); - else - prom_printf("no partitions found.\n"); + if (parts) + prom_printf("partitions:\n"); + else + prom_printf("no partitions found.\n"); #endif - for (p = parts; p && !found; p=p->next) { - DEBUG_F("number: %02d, start: 0x%08lx, length: 0x%08lx\n", - p->part_number, p->part_start, p->part_size ); - if (partition == -1) { - file->fs = fs_open( file, dev_name, p, file_name ); - if (file->fs != NULL) - goto bail; - } - if ((partition >= 0) && (partition == p->part_number)) - found = p; + for (p = parts; p && !found; p=p->next) { + DEBUG_F("number: %02d, start: 0x%08lx, length: 0x%08lx\n", + p->part_number, p->part_start, p->part_size ); + if (partition == -1) { + file->fs = fs_open( file, dev_name, p, file_name ); + if (file->fs == NULL || fserrorno != FILE_ERR_OK) + continue; + else { + partition = p->part_number; + goto done; + } + } + if ((partition >= 0) && (partition == p->part_number)) + found = p; #if DEBUG - if (found) - prom_printf(" (match)\n"); + if (found) + prom_printf(" (match)\n"); #endif - } + } - /* Note: we don't skip when found is NULL since we can, in some - * cases, let OF figure out a default partition. - */ - DEBUG_F( "Using OF defaults.. (found = %p)\n", found ); - file->fs = fs_open( file, dev_name, found, file_name ); + /* Note: we don't skip when found is NULL since we can, in some + * cases, let OF figure out a default partition. + */ + DEBUG_F( "Using OF defaults.. (found = %p)\n", found ); + file->fs = fs_open( file, dev_name, found, file_name ); -bail: - if (parts) - partitions_free(parts); +done: + if (parts) + partitions_free(parts); - return fserrorno; + return fserrorno; } static int @@ -215,8 +199,8 @@ file_net_open( struct boot_file_t* file, const char* dev_name, const char* file_name) { - file->fs = fs_of_netboot; - return fs_of_netboot->open(file, dev_name, NULL, file_name); + file->fs = fs_of_netboot; + return fs_of_netboot->open(file, dev_name, NULL, file_name); } static int @@ -224,110 +208,65 @@ default_read( struct boot_file_t* file, unsigned int size, void* buffer) { - prom_printf("WARNING ! default_read called !\n"); - return FILE_ERR_EOF; + prom_printf("WARNING ! default_read called !\n"); + return FILE_ERR_EOF; } static int default_seek( struct boot_file_t* file, unsigned int newpos) { - prom_printf("WARNING ! default_seek called !\n"); - return FILE_ERR_EOF; + prom_printf("WARNING ! default_seek called !\n"); + return FILE_ERR_EOF; } static int default_close( struct boot_file_t* file) { - prom_printf("WARNING ! default_close called !\n"); - return FILE_ERR_OK; + prom_printf("WARNING ! default_close called !\n"); + return FILE_ERR_OK; } static struct fs_t fs_default = { - "defaults", - NULL, - default_read, - default_seek, - default_close + "defaults", + NULL, + default_read, + default_seek, + default_close }; -int open_file( const struct boot_fspec_t* spec, - struct boot_file_t* file) +int open_file(const struct boot_fspec_t* spec, struct boot_file_t* file) { -// static char temp[1024]; - static char temps[64]; -// char *dev_name; -// char *file_name = NULL; - phandle dev; - int result; - int partition; + int result; - memset(file, 0, sizeof(struct boot_file_t*)); - file->fs = &fs_default; - - /* Lookup the OF device path */ - /* First, see if a device was specified for the kernel - * if not, we hope that the user wants a kernel on the same - * drive and partition as yaboot itself */ -#if 0 /* this is crap */ - if (!spec->dev) - strcpy(spec->dev, bootdevice); - strncpy(temp,spec->dev,1024); - dev_name = parse_device_path(temp, &file_name, &partition); - if (file_name == NULL) - file_name = (char *)spec->file; - if (file_name == NULL) { - prom_printf("Configuration error: null filename\n"); - return FILE_ERR_NOTFOUND; - } - if (partition == -1) -#endif - partition = spec->part; + memset(file, 0, sizeof(struct boot_file_t*)); + file->fs = &fs_default; + DEBUG_F("dev_path = %s\nfile_name = %s\npartition = %d\n", + spec->dev, spec->file, spec->part); - DEBUG_F("dev_path = %s\nfile_name = %s\npartition = %d\n", - spec->dev, spec->file, partition); - - /* Find OF device phandle */ - dev = prom_finddevice(spec->dev); - if (dev == PROM_INVALID_HANDLE) { - return FILE_ERR_BADDEV; - } - - DEBUG_F("dev_phandle = %p\n", dev); - - /* Check the kind of device */ - result = prom_getprop(dev, "device_type", temps, 63); - if (result == -1) { - prom_printf("can't get for device\n"); - return FILE_ERR_BADDEV; - } - temps[result] = 0; - if (!strcmp(temps, "block")) - file->device_kind = FILE_DEVICE_BLOCK; - else if (!strcmp(temps, "network")) - file->device_kind = FILE_DEVICE_NET; - else { - prom_printf("Unkown device type <%s>\n", temps); - return FILE_ERR_BADDEV; - } + result = prom_get_devtype(spec->dev); + if (result > 0) + file->device_kind = result; + else + return result; - switch(file->device_kind) { - case FILE_DEVICE_BLOCK: - DEBUG_F("device is a block device\n"); - return file_block_open(file, spec->dev, spec->file, partition); - case FILE_DEVICE_NET: - DEBUG_F("device is a network device\n"); - return file_net_open(file, spec->dev, spec->file); - } - return 0; + switch(file->device_kind) { + case FILE_DEVICE_BLOCK: + DEBUG_F("device is a block device\n"); + return file_block_open(file, spec->dev, spec->file, spec->part); + case FILE_DEVICE_NET: + DEBUG_F("device is a network device\n"); + return file_net_open(file, spec->dev, spec->file); + } + return 0; } /* * Local variables: - * c-file-style: "K&R" + * c-file-style: "k&r" * c-basic-offset: 5 * End: */