fix a few nits in nix Reference: /n/atom/patch/applied/nixnit20140227 Date: Thu Feb 27 20:57:32 CET 2014 Signed-off-by: quanstro@quanstro.net --- /sys/src/nix/port/usbehci.c Thu Feb 27 20:57:27 2014 +++ /sys/src/nix/port/usbehci.c Thu Feb 27 20:57:27 2014 @@ -29,7 +29,7 @@ #define ddqprint if(ehcidebug>1 || (qh->io && qh->io->debug>1))print #define TRUNC(x, sz) ((x) & ((sz)-1)) -#define LPTR(q) ((ulong*)KADDR((q) & ~0x1F)) +#define LPTR(q) ((u32int*)KADDR((q) & ~0x1F)) typedef struct Ctlio Ctlio; typedef union Ed Ed; @@ -231,7 +231,7 @@ union{ Itd** itdps; /* itdps[i]: ptr to Itd for i-th frame or nil */ Sitd** sitdps; /* sitdps[i]: ptr to Sitd for i-th frame or nil */ - ulong** tdps; /* same thing, as seen by hw */ + u32int** tdps; /* same thing, as seen by hw */ }; }; @@ -1129,7 +1129,7 @@ print(" nqhintr %d nisointr %d\n", ctlr->nqhintr, ctlr->nisointr); print("\tcmd %#ux sts %#ux intr %#ux frno %ud", opio->cmd, opio->sts, opio->intr, opio->frno); - print(" base %#ux link %#ux fr0 %#lux\n", + print(" base %#ux link %#ux fr0 %#ux\n", opio->frbase, opio->link, ctlr->frames[0]); se = buf+sizeof(buf); s = seprint(buf, se, "\t"); @@ -2984,7 +2984,7 @@ cancelisoio(Ctlr *ctlr, Isoio *iso, int pollival, ulong load) { int frno, i, n, t, w, woff; - ulong *lp, *tp; + u32int *lp, *tp; Isoio **il; Itd *td; Sitd *std; --- /sys/src/nix/port/drawalloc.c Thu Feb 27 20:57:27 2014 +++ /sys/src/nix/port/drawalloc.c Thu Feb 27 20:57:27 2014 @@ -20,9 +20,10 @@ int Rfmt(Fmt *f) { - extern int fmtR(Fmt*); + Rectangle r; - return fmtR(f); + r = va_arg(f->args, Rectangle); + return fmtprint(f, "[%d %d] [%d %d]", r.min.x, r.min.y, r.max.x, r.max.y); } void