X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=include%2Ffile.h;h=b2d9c63a71d9082f499382c877fdb3ee074883d5;hp=c68d84f66eeec8e0cbd08efd7806fc2923450a79;hb=8aef1508bddad47681e258e9f2eaa7987cbd8a32;hpb=f4ebbd9f7ea23e3f0fcbe098754580c220894628

diff --git a/include/file.h b/include/file.h
index c68d84f..b2d9c63 100644
--- a/include/file.h
+++ b/include/file.h
@@ -1,23 +1,28 @@
 /*
-    Definitions for talking to the Open Firmware PROM on
-    Power Macintosh computers.
-
-    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
-*/
+ *  file.h - Filesystem related interfaces
+ *
+ *  Copyright (C) 2001 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.
+ */
 
 #ifndef FILE_H
 #define FILE_H
@@ -31,26 +36,22 @@ struct boot_file_t;
 
 #define FILE_MAX_PATH		1024
 
-/* Simple error codes */
-#define FILE_ERR_OK		0
-#define FILE_ERR_EOF		-1
-#define FILE_ERR_NOTFOUND	-2
-#define FILE_CANT_SEEK		-3
-#define FILE_IOERR		-4
-#define FILE_BAD_PATH		-5
-#define FILE_ERR_BAD_TYPE       -6
-#define FILE_ERR_BAD_FSYS       -7
-#define FILE_ERR_SYMLINK_LOOP   -8
-#define FILE_ERR_LENGTH         -9
-
-/* Device kind */
-#define FILE_DEVICE_BLOCK	1
-#define FILE_DEVICE_NET		2
-
 struct boot_fspec_t {
 	char*	dev;		/* OF device path */
 	int	part;		/* Partition number or -1 */
+	char*	siaddr;		/* Server address */
 	char*	file;		/* File path */
+	char*	ciaddr;		/* Client address */
+	char*	giaddr;		/* Gateway address */
+	char*	bootp_retries;	/* Bootp retries */
+	char*	tftp_retries;	/* TFTP retries */
+	char*	subnetmask;	/* Subnet mask */
+	char*	addl_params;	/* copy all additional parameters */
+
+	/* Following fields are used only in ipv6 format */
+	int	is_ipv6;	/* is ipv6 specified ? */
+	char*	dhcpv6;		/* dhcpv6 string */
+	char*	blksize;	/* blksize string */
 };
 
 struct boot_file_t {
@@ -73,18 +74,13 @@ struct boot_file_t {
 //	unsigned int	part_count;
 };
 
-extern int open_file(	const struct boot_fspec_t*	spec,
-			struct boot_file_t*		file);
-
-extern int validate_fspec(
-			struct boot_fspec_t*	spec,
-			char*			default_device,
-			int			default_part);
-extern char *parse_device_path(
-			char*			of_device,
-			char**			file_spec,
-			int*			partition);
+extern int
+open_file(struct boot_fspec_t*	spec,
+	  struct boot_file_t*		file);
 
+extern int
+parse_device_path(char *imagepath, char *defdevice, int defpart,
+		  char *deffile, struct boot_fspec_t *result);
 
 
 #endif