3 files changed, 16 insertions(+), 18 deletions(-)

M pc/clock.c
M pc/devvga.c
M pc/kbd.c

@@ 47,14 47,15 @@ clock(Ureg *ur, void *arg)
 {
 	Proc *p;
 	int nrun = 0;
+	extern int hwcursor;
 
 	USED(arg);
 
 	m->ticks++;
 
+	uartclock();
 	checkalarms();
 	hardclock();
-	uartclock();
 
 	/*
 	 *  process time accounting


@@ 80,7 81,13 @@ clock(Ureg *ur, void *arg)
 	}
 
 	/* last because it could spllo() */
-	mouseclock();
+	if(hwcursor)
+		mouseclock();
+	else {
+		spllo();
+		mouseclock();
+		splhi();
+	}
 }
 
 /*

@@ 111,7 111,7 @@ Vgacard vgachips[] =
 };
 
 Vgacard	*vgacard;	/* current vga card */
-static int hwcursor;
+int hwcursor;
 
 /*
  *  work areas for bitblting screen characters, scrolling, and cursor redraw


@@ 1325,7 1325,7 @@ setcursor(ulong *setbits, ulong *clrbits, int offx, int offy)
 void
 cursoron(int dolock)
 {
-	int xoff, yoff, s;
+	int xoff, yoff;
 	Rectangle r;
 	uchar *a;
 	struct {


@@ 1338,11 1338,8 @@ cursoron(int dolock)
 
 	if(cursor.disable)
 		return;
-	if(dolock){
-		s = 0;		/* to avoid compiler warning */
+	if(dolock)
 		lock(&cursor);
-	} else
-		s = spllo();	/* to avoid freezing out the eia ports */
 
 	if(hwcursor)
 		(*vgacard->mvcursor)(mousexy());


@@ 1394,30 1391,23 @@ cursoron(int dolock)
 
 	if(dolock)
 		unlock(&cursor);
-	else
-		splx(s);
 }
 
 void
 cursoroff(int dolock)
 {
-	int s;
-
 	if(hwcursor)
 		return;
 	if(cursor.disable)
 		return;
-	if(dolock){
-		s = 0;		/* to avoid a compiler warning */
+	if(dolock)
 		lock(&cursor);
-	} else
-		s = spllo();	/* to avoid freezing out the eia ports */
+
 	if(--cursor.visible == 0 && cursor.tl > 0)
 		screenload(cursor.clipr, (uchar*)backbits, cursor.tl, cursor.l, 0);
+
 	if(dolock)
 		unlock(&cursor);
-	else
-		splx(s);
 }
 
 static void

@@ 225,6 225,7 @@ i8042reset(void)
 	outready();
 	outb(Cmd, 0xD1);
 	outready();
+	delay(100);
 	outb(Data, 0xDE);	/* set reset line high */
 	outready();
 }