6 files changed, 11 insertions(+), 9 deletions(-)

M boot/boot.h
M boot/doauthenticate.c
M pc/devata.c
M port/devsd.c
M port/portfns.h
M port/qio.c

@@ 43,7 43,7 @@ extern int	nop(int);
 extern int	outin(char*, char*, int);
 extern int	plumb(char*, char*, int*, char*);
 extern int	readfile(char*, char*, int);
-extern int	readn(int, char*, int);
+extern long	readn(int, void*, long);
 extern int	sendmsg(int, char*);
 extern void	setenv(char*, char*);
 extern void	settime(int);

@@ 6,13 6,15 @@
 static char *pbmsg = "AS protocol botch";
 static char *ccmsg = "can't connect to AS";
 
-int
-readn(int fd, char *buf, int len)
+long
+readn(int fd, void *buf, long len)
 {
 	int m, n;
+	char *p;
 
+	p = buf;
 	for(n = 0; n < len; n += m){
-		m = read(fd, buf+n, len-n);
+		m = read(fd, p+n, len-n);
 		if(m <= 0)
 			return -1;
 	}

@@ 203,7 203,7 @@ static void	atapipart(Drive*);
 static void	atapiintr(Controller*);
 
 static int
-atagen(Chan *c, Dirtab*, long, long s, Dir *dirp)
+atagen(Chan *c, Dirtab*, int, int s, Dir *dirp)
 {
 	Qid qid;
 	int drive;

@@ 69,7 69,7 @@ static int types[] =
 };
 
 static int
-sdgen(Chan *c, Dirtab*, long, long s, Dir *dirp)
+sdgen(Chan *c, Dirtab*, int, int s, Dir *dirp)
 {
 	Qid qid;
 	Disk *d;

@@ 70,7 70,7 @@ void		duppage(Page*);
 void		dupswap(Page*);
 int		encrypt(void*, void*, int);
 void		envcpy(Egrp*, Egrp*);
-int		eqchan(Chan*, Chan*, long);
+int		eqchan(Chan*, Chan*, int);
 int		eqqid(Qid, Qid);
 void		error(char*);
 long		execregs(ulong, ulong, ulong);


@@ 197,7 197,7 @@ void		putpage(Page*);
 void		putseg(Segment*);
 void		putstr(char*);
 void		putstr(char*);
-void		putstrn(char*, long);
+void		putstrn(char*, int);
 void		putswap(Page*);
 ulong		pwait(Waitmsg*);
 Block*		qbread(Queue*, int);

@@ 589,7 589,7 @@ qwrite(Queue *q, void *vp, int len)
  *  used by print() to write to a queue.  Since we may be splhi or not in
  *  a process, don't qlock.
  */
-int
+long
 qiwrite(Queue *q, void *vp, int len)
 {
 	int n, sofar, dowakeup;