7 files changed, 17 insertions(+), 17 deletions(-)

M carrera/clock.c
M carrera/fns.h
M carrera/fptrap.c
M carrera/main.c
M carrera/trap.c
M port/pgrp.c
M port/portfns.h

@@ 54,9 54,9 @@ clock(Ureg *ur)
 		m->proc->pc = ur->pc;
 
 	accounttime();
-
+/*
 	ifjab();
-
+*/
 	kproftimer(ur->pc);
 
 	kmapinval();

@@ 84,7 84,7 @@ void*		pxspanalloc(ulong, int, ulong);
 void		rdbginit(void);
 ulong		rdcount(void);
 int		readlog(ulong, char*, ulong);
-long*		reg(Ureg*, int);
+ulong*		reg(Ureg*, int);
 void		restfpregs(FPsave*, ulong);
 void		screeninit(void);
 void		screenputs(char*, int);

@@ 174,19 174,19 @@ fpunimp(ulong iw)
 	return 0;
 }
 
-long*
+ulong*
 reg(Ureg *ur, int regno)
 {
 	/* regs go from R31 down in ureg, R29 is missing */
 	switch(regno) {
 	case 31:
-		return &ur->r31;
+		return (ulong*)&ur->r31;
 	case 30:
-		return &ur->r30;
+		return (ulong*)&ur->r30;
 	case 29:
-		return &ur->sp;
+		return (ulong*)&ur->sp;
 	}
-	return (&ur->r28) + (28-regno)*(&ur->r27-&ur->r28);
+	return (ulong*)((&ur->r28) + (28-regno)*(&ur->r27-&ur->r28));
 }
 
 static ulong

@@ 402,7 402,7 @@ userinit(void)
 }
 
 void
-exit(long type)
+exit(int type)
 {
 	uchar *vec;
 

@@ 335,9 335,11 @@ intr(Ureg *ur)
 		case 0x24:		/* Serial 2 */
 			ns16552intr(1);
 			break;
+/*
 		case 0x10:
 			fiberint(0);
 			break;
+ */
 		case 0x14:
 			etherintr();
 			break;

@@ 93,24 93,22 @@ closepgrp(Pgrp *p)
 void
 pgrpinsert(Mount **order, Mount *m)
 {
-	Mount *f, **l;
+	Mount *f;
 
 	m->order = 0;
-	if(*order == nil) {
+	if(*order == 0) {
 		*order = m;
 		return;
 	}
-
-	l = order;
 	for(f = *order; f; f = f->order) {
 		if(m->mountid < f->mountid) {
 			m->order = f;
-			*l = f;
+			*order = m;
 			return;
 		}
-		l = &f->order;
+		order = &f->order;
 	}
-	*l = m->order;
+	*order = m;
 }
 
 /*

@@ 309,4 309,4 @@ void		hnputl(void*, ulong);
 void		hnputs(void*, ushort);
 ulong		nhgetl(void*);
 ushort		nhgets(void*);
-void		filsetalloc(void* (*)(long), void* (*)(long));
+void		filsetalloc(void* (*)(int), void* (*)(int));