17 files changed, 14 insertions(+), 33 deletions(-)

M bitsy/sdata.c
M bitsy/wavelan.c
M ip/igmp.c
M ip/il.c
M ip/rudp.c
M ip/tcp.c
M pc/devfloppy.c
M pc/ether82543gc.c
M pc/ether82557.c
M pc/floppy.h
M pc/sdscsi.c
M pc/wavelan.c
M pc/wavelan.h
M port/devsdp.c
M port/portdat.h
M port/sd.h
M port/swap.c

@@ 1775,7 1775,7 @@ scsirio(SDreq* r)
 
 			while(waserror())
 				;
-			tsleep(&r->unit->rendez, return0, 0, 500);
+			tsleep(&up->sleep, return0, 0, 500);
 			poperror();
 			scsitest(r);
 			return 2;

@@ 679,7 679,7 @@ w_timer(void* arg)
 
 	ctlr->timerproc = up;
 	for(;;){
-		tsleep(&ctlr->timer, return0, 0, MSperTick);
+		tsleep(&up->sleep, return0, 0, MSperTick);
 		ctlr = (Ctlr*)ether->ctlr;
 		if(ctlr == 0)
 			break;

@@ 59,7 59,6 @@ struct IGMP
 {
 	Lock;
 	Rendez	r;
-	Rendez	r0;
 	IGMPrep	*reports;
 };
 


@@ 159,7 158,7 @@ igmpproc(void *a)
 				continue;
 			}
 
-			tsleep(&igmpalloc.r0, return0, 0, MSPTICK);
+			tsleep(&up->sleep, return0, 0, MSPTICK);
 		}
 		unlock(&igmpalloc);
 	}

@@ 195,8 195,6 @@ struct Ilpriv
 	ulong	dup;
 	ulong	dupb;
 
-	Rendez	ilr;
-
 	/* keeping track of the ack kproc */
 	int	ackprocstarted;
 	QLock	apl;


@@ 1127,13 1125,11 @@ ilackproc(void *x)
 	Ilcb *ic;
 	Conv **s, *p;
 	Proto *il;
-	Ilpriv *ipriv;
 
 	il = x;
-	ipriv = il->priv;
 
 loop:
-	tsleep(&ipriv->ilr, return0, 0, Iltickms);
+	tsleep(&up->sleep, return0, 0, Iltickms);
 	for(s = il->conv; s && *s; s++) {
 		p = *s;
 		ic = (Ilcb*)p->ptcl;

@@ 146,7 146,6 @@ struct Rudpstats
 typedef struct Rudppriv Rudppriv;
 struct Rudppriv
 {
-	Rendez	vous;
 	Ipht	ht;
 
 	/* MIB counters */


@@ 766,7 765,7 @@ relackproc(void *a)
 	upriv = rudp->priv;
 
 loop:
-	tsleep(&upriv->vous, return0, 0, Rudptickms);
+	tsleep(&up->sleep, return0, 0, Rudptickms);
 
 	for(s = rudp->conv; *s; s++) {
 		c = *s;

@@ 336,8 336,6 @@ struct Tcppriv
 	QLock 	tl;
 	Tcptimer *timers;
 
-	Rendez	tcpr;			/* used by tcpackproc */
-
 	/* hash table for matching conversations */
 	Ipht	ht;
 


@@ 645,7 643,7 @@ tcpackproc(void *a)
 	priv = tcp->priv;
 
 	for(;;) {
-		tsleep(&priv->tcpr, return0, 0, MSPTICK);
+		tsleep(&up->sleep, return0, 0, MSPTICK);
 
 		qlock(&priv->tl);
 		timeo = nil;

@@ 509,7 509,7 @@ floppykproc(void *)
 				qunlock(&fl);
 			}
 		}
-		tsleep(&fl.kr, return0, 0, 1000);
+		tsleep(&up->sleep, return0, 0, 1000);
 	}
 }
 


@@ 531,7 531,7 @@ floppyon(FDrive *dp)
 	outb(Pdor, fl.motor | Fintena | Fena | dp->dev);
 	if(!alreadyon){
 		/* wait for drive to spin up */
-		tsleep(&dp->r, return0, 0, 750);
+		tsleep(&up->sleep, return0, 0, 750);
 
 		/* clear any pending interrupts */
 		floppysense();

@@ 377,7 377,6 @@ typedef struct Ctlr {
 	Block*	tb[Ntdesc];		/* transmit buffers */
 	int	tdh;			/* transmit descriptor head */
 	int	tdt;			/* transmit descriptor tail */
-	Rendez	timer;			/* watchdog timer */
 	int	txstalled;		/* count of times unable to send */
 
 	int	txcw;


@@ 1228,8 1227,7 @@ gc82543watchdog(void* arg)
 
 	edev = arg;
 	for(;;){
-		ctlr = edev->ctlr;
-		tsleep(&ctlr->timer, return0, 0, 1000);
+		tsleep(&up->sleep, return0, 0, 1000);
 
 		ctlr = edev->ctlr;
 		if(ctlr == nil){

@@ 198,7 198,6 @@ typedef struct Ctlr {
 
 	Lock	miilock;
 
-	Rendez	timer;			/* watchdog timer for receive lockup errata */
 	int	tick;
 
 	Lock	rlock;			/* registers */


@@ 349,8 348,7 @@ watchdog(void* arg)
 
 	ether = arg;
 	for(;;){
-		ctlr = ether->ctlr;
-		tsleep(&ctlr->timer, return0, 0, 4000);
+		tsleep(&up->sleep, return0, 0, 4000);
 
 		/*
 		 * Hmmm. This doesn't seem right. Currently

@@ 30,8 30,6 @@ struct FDrive
 	uchar	*cache;		/* track cache */
 	int	ccyl;
 	int	chead;
-
-	Rendez	r;		/* waiting here for motor to spin up */
 };
 
 /*


@@ 52,7 50,6 @@ struct FController
 	int	confused;	/* controler needs to be reset */
 	Rendez	r;		/* wait here for command termination */
 	int	motor;		/* bit mask of spinning disks */
-	Rendez	kr;		/* for motor watcher */
 };
 
 /*

@@ 157,7 157,7 @@ scsirio(SDreq* r)
 
 			while(waserror())
 				;
-			tsleep(&r->unit->rendez, return0, 0, 500);
+			tsleep(&up->sleep, return0, 0, 500);
 			poperror();
 			scsitest(r);
 			return 2;

@@ 690,7 690,7 @@ w_timer(void* arg)
 
 	ctlr->timerproc = up;
 	for(;;){
-		tsleep(&ctlr->timer, return0, 0, MSperTick);
+		tsleep(&up->sleep, return0, 0, MSperTick);
 		ctlr = (Ctlr*)ether->ctlr;
 		if(ctlr == 0)
 			break;

@@ 261,7 261,6 @@ enum {
 struct Ctlr
 {
 	Lock;
-	Rendez	timer;
 
 	int	state;	// Attached | Power
 	int	slot;

@@ 160,7 160,6 @@ struct Conv {
 struct Sdp {
 	QLock;
 	Log;
-	Rendez	vous;			/* used by sdpackproc */
 	int	nconv;
 	Conv *conv[Maxconv];
 	int ackproc;


@@ 909,7 908,7 @@ sdpackproc(void *a)
 	Conv *c;
 
 	for(;;) {
-		tsleep(&sdp->vous, return0, 0, 1000);
+		tsleep(&up->sleep, return0, 0, 1000);
 		sec = TK2SEC(m->ticks);
 		qlock(sdp);
 		for(i=0; i<sdp->nconv; i++) {

@@ 329,7 329,6 @@ struct Swapalloc
 	uchar*	last;			/* Speed swap allocation */
 	uchar*	top;			/* Top of swap map */
 	Rendez	r;			/* Pager kproc idle sleep */
-	Rendez	pause;
 	ulong	highwater;		/* Pager start threshold */
 	ulong	headroom;		/* Space pager frees under highwater */
 }swapalloc;

@@ 47,7 47,6 @@ struct SDunit {
 	int	subno;
 	uchar	inquiry[256];		/* format follows SCSI spec */
 	SDperm;
-	Rendez	rendez;
 
 	QLock	ctl;
 	ulong	sectors;

@@ 167,7 167,7 @@ loop:
 
 			/* Emulate the old system if no swap channel */
 			print("no physical memory\n");
-			tsleep(&swapalloc.pause, return0, 0, 5000);
+			tsleep(&up->sleep, return0, 0, 5000);
 			wakeup(&palloc.r);
 		}
 	}