3 files changed, 12 insertions(+), 11 deletions(-)

M carrera/devrtc.c
M ip/udp.c
M port/taslock.c

@@ 175,6 175,7 @@ _rtctime(void)
 long
 rtctime(void)
 {
+#ifdef notdef
 	int i;
 	long t, ot;
 


@@ 191,6 192,11 @@ rtctime(void)
 	iunlock(&rtclock);
 
 	return t;
+#else
+	extern ulong boottime;
+
+	return boottime+TK2SEC(MACHP(0)->ticks);
+#endif /* notdef */
 }
 
 static long	 

@@ 81,8 81,13 @@ udpstate(char **s, Conv *c)
 }
 
 static char*
-udpannounce(Conv *c, char**, int)
+udpannounce(Conv *c, char** argv, int argc)
 {
+	char *e;
+
+	e = Fsstdannounce(c, argv, argc);
+	if(e != nil)
+		return e;
 	Fsconnected(&fs, c, nil);
 
 	return nil;

@@ 69,18 69,8 @@ ilock(Lock *l)
 	}
 
 	for(;;){
-#ifdef notdef
 		while(l->key)
 			;
-#else
-{   int i;
-    i = 0;
-    while(l->key){
-	if(i++ > 100000000)
-	    panic("ilock loop: caller pc %luX, held by %luX\n", pc, l->pc);
-    }
-}
-#endif /* notdef */
 		if(tas(&l->key) == 0){
 			l->sr = x;
 			l->pc = pc;