From 0458899b887d66906b52673a9a7c8e89be08b4df Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Mon, 7 Apr 2003 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 2003-04-07

---
 bitsy/sdata.c     | 2 +-
 bitsy/wavelan.c   | 2 +-
 ip/igmp.c         | 3 +--
 ip/il.c           | 6 +-----
 ip/rudp.c         | 3 +--
 ip/tcp.c          | 4 +---
 pc/devfloppy.c    | 4 ++--
 pc/ether82543gc.c | 4 +---
 pc/ether82557.c   | 4 +---
 pc/floppy.h       | 3 ---
 pc/sdscsi.c       | 2 +-
 pc/wavelan.c      | 2 +-
 pc/wavelan.h      | 1 -
 port/devsdp.c     | 3 +--
 port/portdat.h    | 1 -
 port/sd.h         | 1 -
 port/swap.c       | 2 +-
 17 files changed, 14 insertions(+), 33 deletions(-)

diff --git a/bitsy/sdata.c b/bitsy/sdata.c
index 1977b98eca8367857418e609f4990faf146b4932..565bea5c438a42938c2f208f0b551a0b9e84d37b 100644
--- a/bitsy/sdata.c
+++ b/bitsy/sdata.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;
diff --git a/bitsy/wavelan.c b/bitsy/wavelan.c
index 1f2ded63898d1b6755cc0967e4dd725cc6eb48c7..7035f5756e1d2f09febbd96a49d6663059dc963a 100644
--- a/bitsy/wavelan.c
+++ b/bitsy/wavelan.c
@@ -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;
diff --git a/ip/igmp.c b/ip/igmp.c
index 19e6481865d533bf341c756458fc50fb27b15b4c..78a25769de23fb2276079a44f2e574ec49f10934 100644
--- a/ip/igmp.c
+++ b/ip/igmp.c
@@ -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);
 	}
diff --git a/ip/il.c b/ip/il.c
index 8ee59a10516dc5a6822572df01f43d743d5dc8da..ca6c4a0d6cec2a6b1b5114f7d50c7321cffdf03f 100644
--- a/ip/il.c
+++ b/ip/il.c
@@ -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;
diff --git a/ip/rudp.c b/ip/rudp.c
index cd01904aa6bb7b31fc2551524f573af4311a246f..6381d2f03f5e2528ae24f8ae9458cf32064ab817 100644
--- a/ip/rudp.c
+++ b/ip/rudp.c
@@ -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;
diff --git a/ip/tcp.c b/ip/tcp.c
index 107b258b7412d638289f8d785661afed58c68f22..e03dff90861aabfc56cf96ddb5f8e6bcc4b075c2 100644
--- a/ip/tcp.c
+++ b/ip/tcp.c
@@ -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;
diff --git a/pc/devfloppy.c b/pc/devfloppy.c
index 806b4546d35e5d52b5ec02c74497e57f34a4ff76..7bd5e698bf5f5a1edfb5e13a1bab0ebd0d6aad85 100644
--- a/pc/devfloppy.c
+++ b/pc/devfloppy.c
@@ -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();
diff --git a/pc/ether82543gc.c b/pc/ether82543gc.c
index 4f1c0ebbb532fc9c48627fccb86cbfc06cb0b5ee..7ceca53be443f269f3d0f08fd4e12c85f131de78 100644
--- a/pc/ether82543gc.c
+++ b/pc/ether82543gc.c
@@ -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){
diff --git a/pc/ether82557.c b/pc/ether82557.c
index 960d3f4e715ca6dc11d8cea8540ae11b488cc257..66eab17416f56c9658362b69dd8851be00201240 100644
--- a/pc/ether82557.c
+++ b/pc/ether82557.c
@@ -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
diff --git a/pc/floppy.h b/pc/floppy.h
index 898ab74742791532a6616d1096a2a7f56906c86b..f84c9eae715dee0e71b16debe0c93f35b91de345 100644
--- a/pc/floppy.h
+++ b/pc/floppy.h
@@ -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 */
 };
 
 /*
diff --git a/pc/sdscsi.c b/pc/sdscsi.c
index e98b4b0260e4d2a64c4a35ede3da7664ab842829..1b0634354c996786a32a92e79855d487f7b6dbda 100644
--- a/pc/sdscsi.c
+++ b/pc/sdscsi.c
@@ -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;
diff --git a/pc/wavelan.c b/pc/wavelan.c
index 65887ad85f94c26fd441974264abaaadb66e8e57..c589d9f527c31c3fffe04cb3b1aafa459f11c373 100644
--- a/pc/wavelan.c
+++ b/pc/wavelan.c
@@ -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;
diff --git a/pc/wavelan.h b/pc/wavelan.h
index 1e055b42a848bba1bf4fe6b907ea5c694ce4ba66..4ad6bd398d81afbf80e66f59d5bc47da55f75b14 100644
--- a/pc/wavelan.h
+++ b/pc/wavelan.h
@@ -261,7 +261,6 @@ enum {
 struct Ctlr
 {
 	Lock;
-	Rendez	timer;
 
 	int	state;	// Attached | Power
 	int	slot;
diff --git a/port/devsdp.c b/port/devsdp.c
index 2de711ec437dfa2bb41c7065898361444a62af86..5e0af0319d37b6060cbfcbf29ba27ba08952d1e8 100644
--- a/port/devsdp.c
+++ b/port/devsdp.c
@@ -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++) {
diff --git a/port/portdat.h b/port/portdat.h
index cc340406a4443e6ca560a5e287de5b1795cc2350..706cae378c34b2a6fad37d1f21516047c9f910f2 100644
--- a/port/portdat.h
+++ b/port/portdat.h
@@ -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;
diff --git a/port/sd.h b/port/sd.h
index f71d13e80c1804b6b0785fafff3429f35e2ebe4d..9357287251f9b515c8949dca29811e5748844e89 100644
--- a/port/sd.h
+++ b/port/sd.h
@@ -47,7 +47,6 @@ struct SDunit {
 	int	subno;
 	uchar	inquiry[256];		/* format follows SCSI spec */
 	SDperm;
-	Rendez	rendez;
 
 	QLock	ctl;
 	ulong	sectors;
diff --git a/port/swap.c b/port/swap.c
index 4699b12ba419eaa459bd7348b89ca1017b4e84dc..8f3a7c95f4b9365ba8fa59cc666ddd765152fe39 100644
--- a/port/swap.c
+++ b/port/swap.c
@@ -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);
 		}
 	}