8 files changed, 0 insertions(+), 60 deletions(-)

M carrera/dat.h
M carrera/main.c
M pc/dat.h
M pc/main.c
M port/page.c
M port/portdat.h
M port/portfns.h
M port/proc.c

@@ 113,11 113,6 @@ struct Mach
 	Schedq	hiq;
 	Schedq	loq;
 
-	Callbk*	cbin;
-	Callbk*	cbout;
-	Callbk*	cbend;
-	Callbk	calls[NCALLBACK];
-
 	int	pfault;
 	int	cs;
 	int	syscall;

@@ 155,11 155,6 @@ machinit(void)
 
 	active.exiting = 0;
 	active.machs = 1;
-
-	/* Setup call back ring buffer */
-	m->cbin = m->calls;
-	m->cbout = m->calls;
-	m->cbend = &m->calls[NCALLBACK];
 }
 
 /*

@@ 128,11 128,6 @@ struct Mach
 	Schedq	hiq;
 	Schedq	loq;
 
-	Callbk*	cbin;
-	Callbk*	cbout;
-	Callbk*	cbend;
-	Callbk	calls[NCALLBACK];
-
 	int	tlbfault;
 	int	tlbpurge;
 	int	pfault;

@@ 91,11 91,6 @@ machinit(void)
 	memset(m, 0, sizeof(Mach));
 	m->machno = n;
 	m->mmask = 1<<m->machno;
-
-	/* Setup call back ring buffer */
-	m->cbin = m->calls;
-	m->cbout = m->calls;
-	m->cbend = &m->calls[NCALLBACK];
 }
 
 void

@@ 118,7 118,6 @@ retry:
 			break;
 
 	if(p == 0) {
-print("! ");
 		p = palloc.head;
 		memset(p->cachectl, PG_NEWCOL, sizeof(p->cachectl));
 		p->color = color;

@@ 599,15 599,6 @@ struct Schedq
 	int	n;
 };
 
-#define NCALLBACK	32
-
-typedef struct Callbk Callbk;
-struct Callbk
-{
-	void	(*func)(void*);
-	void*	arg;
-};
-
 enum
 {
 	PRINTSIZE =	256,

@@ 15,8 15,6 @@ Page*		auxpage(void);
 void		buzz(int, int);
 void		cachedel(Image*, ulong);
 void		cachepage(Page*, Image*);
-void		callbacks(void);
-void		newcallback(void (*)(void*), void*);
 int		cangetc(void*);
 int		canlock(Lock*);
 int		canpage(Proc*);

@@ 87,7 87,6 @@ sched(void)
 		procsave(up);
 		if(setlabel(&up->sched)) {
 			procrestore(up);
-			callbacks();
 			spllo();
 			return;
 		}


@@ 108,33 107,6 @@ anyready(void)
 }
 
 void
-newcallback(void (*func)(void*), void *a)
-{
-	Callbk *c;
-
-	c = m->cbin;
-	if(++m->cbin >= m->cbend)
-		m->cbin = m->calls;
-
-	c->func = func;
-	c->arg = a;
-}
-
-void
-callbacks(void)
-{
-	Callbk *c;
-
-	while(m->cbin != m->cbout) {
-		c = m->cbout;
-		if(++m->cbout >= m->cbend)
-			m->cbout = m->calls;
-
-		c->func(c->arg);
-	}
-}
-
-void
 ready(Proc *p)
 {
 	int s;