From e0a2b8d82a5521d9391ca8c6f055777954c76c2f Mon Sep 17 00:00:00 2001
From: "Charles.Forsyth" <devnull@localhost>
Date: Wed, 25 Mar 2009 16:37:32 +0000
Subject: x20090315-1636

---
 emu/port/dat.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'emu/port/dat.h')

diff --git a/emu/port/dat.h b/emu/port/dat.h
index b245b61c..90df4b87 100644
--- a/emu/port/dat.h
+++ b/emu/port/dat.h
@@ -108,8 +108,8 @@ struct Chan
 	Chan*	next;			/* allocation */
 	Chan*	link;
 	vlong	offset;			/* in file */
-	ushort	type;
-	ulong	dev;
+	Dev*	dev;
+	uint	devno;
 	ushort	mode;			/* read/write */
 	ushort	flag;
 	Qid	qid;
@@ -142,7 +142,9 @@ struct Dev
 	int	dc;
 	char*	name;
 
+	void	(*reset)(void);
 	void	(*init)(void);
+	void	(*shutdown)(void);
 	Chan*	(*attach)(char*);
 	Walkqid*	(*walk)(Chan*, Chan*, char**, int);
 	int	(*stat)(Chan*, uchar*, int);
@@ -150,18 +152,16 @@ struct Dev
 	void	(*create)(Chan*, char*, int, ulong);
 	void	(*close)(Chan*);
 	long	(*read)(Chan*, void*, long, vlong);
-	Block*	(*bread)(Chan*, long, ulong);
+	Block*	(*bread)(Chan*, long, vlong);
 	long	(*write)(Chan*, void*, long, vlong);
-	long	(*bwrite)(Chan*, Block*, ulong);
+	long	(*bwrite)(Chan*, Block*, vlong);
 	void	(*remove)(Chan*);
 	int	(*wstat)(Chan*, uchar*, int);
 };
 
 enum
 {
-	BINTR		=	(1<<0),
-	BFREE		=	(1<<1),
-	BMORE		=	(1<<2)		/* continued in next block */
+	BINTR		=	(1<<0)
 };
 
 struct Block
@@ -333,8 +333,8 @@ struct Skeyset
 struct Uqid
 {
 	Ref	r;
-	int	type;
-	int	dev;
+	int	dc;
+	int	devno;
 	vlong	oldpath;
 	vlong	newpath;
 	Uqid*	next;
-- 
cgit v1.2.3