small formatting & nits

Reference: /n/atom/patch/applied/nixclean20140226
Date: Thu Mar 27 04:48:49 CET 2014
Signed-off-by: quanstro@quanstro.net

--- /sys/src/nix/k10/wifi.c	Thu Mar 27 04:48:23 2014
+++ /sys/src/nix/k10/wifi.c	Thu Mar 27 04:48:24 2014
@@ -124,7 +124,7 @@
 		return nil;
 	if((wn = wifi->bss) != nil){
 		if(memcmp(wn->bssid, bssid, Eaddrlen) == 0){
-			wn->lastseen = MACHP(0)->ticks;
+			wn->lastseen = sys->ticks;
 			return wn;
 		}
 	}
@@ -134,7 +134,7 @@
 		if(wn == wifi->bss)
 			continue;
 		if(memcmp(wn->bssid, bssid, Eaddrlen) == 0){
-			wn->lastseen = MACHP(0)->ticks;
+			wn->lastseen = sys->ticks;
 			return wn;
 		}
 		if(wn->lastseen < nn->lastseen)
@@ -148,7 +148,7 @@
 	nn->cap = 0;
 	nn->aid = 0;
 	nn->channel = 0;
-	nn->lastseen = MACHP(0)->ticks;
+	nn->lastseen = sys->ticks;
 	return nn;
 }
 
--- /sys/src/nix/k10/uartpci.c	Thu Mar 27 04:48:26 2014
+++ /sys/src/nix/k10/uartpci.c	Thu Mar 27 04:48:26 2014
@@ -103,7 +103,7 @@
 }
 
 static void
-ultraport16si(Pcidev *p, ulong freq)
+ultraport16si(Pcidev *p, uint freq)
 {
 	int io, i;
 	char *name;
@@ -128,7 +128,7 @@
 {
 	char *name;
 	int subid;
-	ulong freq;
+	uint freq;
 	Pcidev *p;
 
 	memmove(&pciphysuart, &p8250physuart, sizeof(PhysUart));
--- /sys/src/nix/k10/sdodin.c	Thu Mar 27 04:48:30 2014
+++ /sys/src/nix/k10/sdodin.c	Thu Mar 27 04:48:32 2014
@@ -20,7 +20,7 @@
 #define	idprint(...)	if(idebug)	print(__VA_ARGS__); else USED(idebug)
 #define	aprint(...)	if(adebug)	print(__VA_ARGS__); else USED(adebug)
 #define	Pciw64(x)	(uvlong)PCIWADDR(x)
-#define	Ticks		MACHP(0)->ticks
+#define	Ticks		sys->ticks
 
 /* copied from sdiahci */
 enum {
@@ -422,10 +422,10 @@
 
 /* following ahci */
 typedef struct {
-	ulong	dba;
-	ulong	dbahi;
-	ulong	pad;
-	ulong	count;
+	u32int	dba;
+	u32int	dbahi;
+	u32int	pad;
+	u32int	count;
 } Aprdt;
 
 typedef struct {
--- /sys/src/nix/k10/pci.c	Thu Mar 27 04:48:34 2014
+++ /sys/src/nix/k10/pci.c	Thu Mar 27 04:48:35 2014
@@ -389,8 +389,8 @@
 	r = (Router *)p;
 
 	if(0)
-		print("PCI interrupt routing table version %d.%d at %.6llux\n",
-			r->version[0], r->version[1], (uintptr)r & 0xfffff);
+		print("PCI interrupt routing table version %d.%d at %#.6ux\n",
+			r->version[0], r->version[1], (uint)PTR2UINT(r) & 0xfffff);
 
 	tbdf = (BusPCI << 24)|(r->bus << 16)|(r->devfn << 8);
 	sbpci = pcimatchtbdf(tbdf);
--- /sys/src/nix/k10/i8259.c	Thu Mar 27 04:48:36 2014
+++ /sys/src/nix/k10/i8259.c	Thu Mar 27 04:48:37 2014
@@ -129,31 +129,3 @@
 
 	return vectorbase;
 }
-
-int
-i8259isr(int vno)
-{
-	int irq, isr;
-
-	if(vno < IdtPIC || vno > IdtPIC+15)
-		return 0;
-	irq = vno-IdtPIC;
-
-	/*
-	 * Collect the interrupt status,
-	 * acknowledge the interrupt and return whether
-	 * the acknowledged interrupt was the correct
-	 * one (this could be better but it's not really
-	 * used).
-	 */
-	ilock(&i8259lock);
-	isr = inb(Cntrl1+Isr);
-	outb(Cntrl1+Ocw2, Ocw2sel|Eoi);
-	if(irq >= 8){
-		isr |= inb(Cntrl2+Isr)<<8;
-		outb(Cntrl2+Ocw2, Ocw2sel|Eoi);
-	}
-	iunlock(&i8259lock);
-
-	return isr & (1<<irq);
-}