From eb1c13a2b27abb84c53cfa9a88d67df0f353f8fa Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Mon, 22 Oct 2001 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 2001-10-22

---
 pc/etherif.h |  1 -
 port/sd.h    | 31 ++++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pc/etherif.h b/pc/etherif.h
index 33a5ad045f1779142b925decdd3535a093134002..5af59e14629aa7a477e37d4e7114b5c506400fc5 100644
--- a/pc/etherif.h
+++ b/pc/etherif.h
@@ -13,7 +13,6 @@ struct Ether {
 	int	minmtu;
 	int 	maxmtu;
 	uchar	ea[Eaddrlen];
-	int	encry;
 
 	void	(*attach)(Ether*);	/* filled in by reset routine */
 	void	(*transmit)(Ether*);
diff --git a/port/sd.h b/port/sd.h
index f779c256a3ae7802d6b7ab2713d23b8017c76f4d..696b9f2810e92bfddb88efde38ced991102dd067 100644
--- a/port/sd.h
+++ b/port/sd.h
@@ -9,8 +9,8 @@ typedef struct SDreq SDreq;
 typedef struct SDunit SDunit;
 
 typedef struct SDperm {
-	char	*name;
-	char	*user;
+	char*	name;
+	char*	user;
 	ulong	perm;
 } SDperm;
 
@@ -37,33 +37,34 @@ typedef struct SDunit {
 	ulong	vers;
 	SDperm	ctlperm;
 
-	QLock	raw;		/* raw read or write in progress */
+	QLock	raw;			/* raw read or write in progress */
 	Lock	rawinuse;		/* really just a test-and-set */
 	int	state;
 	SDreq*	req;
 	SDperm	rawperm;
 
-	Log log;
+	Log	log;
 } SDunit;
 
 /* 
-  * Each controller is represented by a SDev, each controller is responsible
-  * for allocating its unit structures.
-  */ 
+ * Each controller is represented by a SDev.
+ * Each controller is responsible for allocating its unit structures.
+ * Each controller has at least one unit.
+ */ 
 typedef struct SDev {
-	Ref		r;			/* Number of callers using device */
+	Ref	r;			/* Number of callers using device */
 	SDifc*	ifc;			/* pnp/legacy */
-	void	*ctlr;
+	void*	ctlr;
 	int	idno;
-	char	*name;
+	char*	name;
 	SDev*	next;
 
 	QLock;				/* enable/disable */
 	int	enabled;
-	int		nunit;		/* Number of units */
+	int	nunit;			/* Number of units */
 	QLock	unitlock;		/* `Loading' of units */
-	int		*unitflg;		/* Unit flags */
-	SDunit	**unit;		/* Each controller has at least one unit */
+	int*	unitflg;		/* Unit flags */
+	SDunit**unit;
 } SDev;
 
 typedef struct SDifc {
@@ -82,8 +83,8 @@ typedef struct SDifc {
 	int	(*wctl)(SDunit*, Cmdbuf*);
 
 	long	(*bio)(SDunit*, int, int, void*, long, long);
-	SDev*	(*probe)(DevConf *);
-	void		(*clear)(SDev *);
+	SDev*	(*probe)(DevConf*);
+	void	(*clear)(SDev*);
 	char*	(*stat)(SDev*, char*, char*);
 } SDifc;