clean up screen/vga/mouse related types in k10 directory.

Reference: /n/atom/patch/applied/nixvga
Date: Tue Mar 11 01:55:35 CET 2014
Signed-off-by: quanstro@quanstro.net

--- /sys/src/nix/k10/vgavesa.c	Tue Mar 11 01:55:14 2014
+++ /sys/src/nix/k10/vgavesa.c	Tue Mar 11 01:55:15 2014
@@ -115,7 +115,7 @@
 	int i, mode, size;
 	char *s;
 	uchar *p;
-	ulong paddr;
+	uintmem pa;
 	Pcidev *pci;
 
 	if(hardscreen) {
@@ -138,7 +138,7 @@
 	if(!(WORD(p+0) & (1<<7)))
 		error("not in linear graphics mode");
 
-	paddr = LONG(p+40);
+	pa = LONG(p+40);
 	size = WORD(p+20)*WORD(p+16);
 	size = ROUNDUP(size, PGSZ);
 
@@ -152,7 +152,7 @@
 		if(pci->ccrb != Pcibcdisp)
 			continue;
 		for(i=0; i<nelem(pci->mem); i++)
-			if(paddr == (pci->mem[i].bar&~(uintmem)0xf)){
+			if(pa == (pci->mem[i].bar&~(uintmem)0xf)){
 				if(pci->mem[i].size > size)
 					size = pci->mem[i].size;
 				goto havesize;
@@ -166,7 +166,7 @@
 		size = ROUNDUP(size, 1024*1024);
 
 havesize:
-	vgalinearaddr(scr, paddr, size);
+	vgalinearaddr(scr, pa, size);
 	if(scr->apsize)
 		addvgaseg("vesascreen", scr->paddr, scr->apsize);
 
@@ -182,13 +182,13 @@
 vesaflush(VGAscr *scr, Rectangle r)
 {
 	int t, w, wid, off;
-	ulong *hp, *sp, *esp;
+	u32int *hp, *sp, *esp;
 
 	if(hardscreen == nil)
 		return;
 	if(rectclip(&r, scr->gscreen->r) == 0)
 		return;
-	sp = (ulong*)(scr->gscreendata->bdata + scr->gscreen->zero);
+	sp = (u32int*)(scr->gscreendata->bdata + scr->gscreen->zero);
 	t = (r.max.x * scr->gscreen->depth + 2*BI2WD-1) / BI2WD;
 	w = (r.min.x * scr->gscreen->depth) / BI2WD;
 	w = (t - w) * BY2WD;
--- /sys/src/nix/k10/screen.h	Tue Mar 11 01:55:17 2014
+++ /sys/src/nix/k10/screen.h	Tue Mar 11 01:55:18 2014
@@ -94,7 +94,7 @@
 	Pcidev*	pci;
 
 	VGAcur*	cur;
-	ulong	storage;
+	uintptr	storage;
 	Cursor;
 
 	int	useflush;
@@ -103,7 +103,7 @@
 	void*	vaddr;
 	int	apsize;
 
-	ulong	io;				/* device specific registers */
+	uintmem	io;				/* device specific registers */
 	u32int	*mmio;
 	
 	ulong	colormap[Pcolours][3];
--- /sys/src/nix/k10/mouse.c	Tue Mar 11 01:55:21 2014
+++ /sys/src/nix/k10/mouse.c	Tue Mar 11 01:55:22 2014
@@ -185,7 +185,7 @@
 		}
 		dx = scale(msg[1]);
 		dy = -scale(msg[2]);
-		mousetrack(dx, dy, buttons, TK2MS(MACHP(0)->ticks));
+		mousetrack(dx, dy, buttons, TK2MS(sys->ticks));
 	}
 }
 
--- /sys/src/nix/k10/devvga.c	Tue Mar 11 01:55:25 2014
+++ /sys/src/nix/k10/devvga.c	Tue Mar 11 01:55:26 2014
@@ -105,7 +105,7 @@
 	static char *openctl = "openctl\n";
 
 	scr = &vgascreen[0];
-	if ((ulong)c->qid.path == Qvgaovlctl) {
+	if ((uint)c->qid.path == Qvgaovlctl) {
 		if (scr->dev && scr->dev->ovlctl)
 			scr->dev->ovlctl(scr, c, openctl, strlen(openctl));
 		else 
@@ -121,7 +121,7 @@
 	static char *closectl = "closectl\n";
 
 	scr = &vgascreen[0];
-	if((ulong)c->qid.path == Qvgaovlctl)
+	if((uint)c->qid.path == Qvgaovlctl)
 		if(scr->dev && scr->dev->ovlctl){
 			if(waserror()){
 				print("ovlctl error: %s\n", up->errstr);