delongify devaoe

Reference: /n/atom/patch/applied/aoetypes
Date: Thu Mar 27 06:46:37 CET 2014
Signed-off-by: quanstro@quanstro.net

--- /sys/src/nix/port/devaoe.c	Thu Mar 27 06:46:29 2014
+++ /sys/src/nix/port/devaoe.c	Thu Mar 27 06:46:32 2014
@@ -36,9 +36,9 @@
 	Nnetlink	= 6,
 };
 
-#define TYPE(q)		((ulong)(q).path & Maxtype)
-#define UNIT(q)		(((ulong)(q).path>>Typebits) & Maxunits)
-#define L(q)		(((ulong)(q).path>>Typebits+Unitbits) & Maxl3)
+#define TYPE(q)		((uint)(q).path & Maxtype)
+#define UNIT(q)		(((uint)(q).path>>Typebits) & Maxunits)
+#define L(q)		(((uint)(q).path>>Typebits+Unitbits) & Maxl3)
 #define QID(u, t) 	((u)<<Typebits | (t))
 #define Q3(l, u, t)	((l)<<Typebits+Unitbits | QID(u, t))
 #define UP(d)		((d)->flag & Dup)
@@ -131,11 +131,11 @@
 typedef struct {
 	Netlink	*nl;
 	int	nea;
-	ulong	eaidx;
+	uint	eaidx;
 	uchar	eatab[Nea][Eaddrlen];
 	int	datamtu;
-	ulong	npkt;
-	ulong	resent;
+	uvlong	npkt;
+	uvlong	resent;
 	uchar	flag;
 
 	ulong	rttavg;
@@ -148,7 +148,7 @@
 	uint	state;
 	Srb	*next;
 	ulong	ticksent;
-	ulong	len;
+	uint	len;
 	vlong	sector;
 	short	write;
 	short	nout;
@@ -159,8 +159,8 @@
 
 typedef struct {
 	int	tag;
-	ulong	bcnt;
-	ulong	dlen;
+	uint	bcnt;
+	uint	dlen;
 	vlong	lba;
 	ulong	ticksent;
 	int	nhdr;
@@ -168,7 +168,7 @@
 	void	*dp;
 	Devlink	*dl;
 	Netlink	*nl;
-	int	eaidx;
+	uint	eaidx;
 	Srb	*srb;
 } Frame;
 
@@ -177,10 +177,10 @@
 	QLock;
 	Aoedev	*next;
 
-	ulong	vers;
+	uint	vers;
 
 	int	ndl;
-	ulong	dlidx;
+	uint	dlidx;
 	Devlink	*dl;
 	Devlink	dltab[Ndevlink];
 
@@ -198,7 +198,7 @@
 
 	uint	maxbcnt;
 	uint	maxmtu;
-	ulong	lostjumbo;
+	uint	lostjumbo;
 	ushort	nout;
 	ushort	maxout;
 	ulong	lastwadj;
@@ -249,7 +249,7 @@
 extern	char	Echange[]	= "media or partition has changed";
 
 static Srb*
-srballoc(ulong sz)
+srballoc(usize sz)
 {
 	Srb *srb;
 
@@ -261,7 +261,7 @@
 }
 
 static Srb*
-srbkalloc(void *db, ulong)
+srbkalloc(void *db, usize)
 {
 	Srb *srb;
 
@@ -497,7 +497,7 @@
 static Devlink*
 pickdevlink(Aoedev *d)
 {
-	ulong i, n;
+	uint i, n;
 	Devlink *l;
 
 	for(i = 0; i < d->ndl; i++){
@@ -570,7 +570,7 @@
 static int
 resend(Aoedev *d, Frame *f)
 {
-	ulong n;
+	uint n;
 	Aoeata *a;
 	Aoehdr *h;
 
@@ -802,7 +802,7 @@
 
 /* locking not right.  should return locked d; requires rwlock. */
 static Aoedev*
-unit2dev(ulong unit)
+unit2dev(uint unit)
 {
 	Aoedev *d;
 
@@ -818,10 +818,10 @@
 }
 
 static int
-unitgen(Chan *c, ulong type, Dir *dp)
+unitgen(Chan *c, uint type, Dir *dp)
 {
 	int perm, t;
-	ulong vers;
+	uint vers;
 	vlong size;
 	char *p;
 	Aoedev *d;
@@ -867,7 +867,7 @@
 }
 
 static int
-topgen(Chan *c, ulong type, Dir *d)
+topgen(Chan *c, uint type, Dir *d)
 {
 	int perm;
 	vlong size;
@@ -937,7 +937,7 @@
 	case Qunitdir:
 		if(s == DEVDOTDOT){
 			mkqid(&q, QID(0, Qtopdir), 0, QTDIR);
-			uprint("%uld", UNIT(c->qid));
+			uprint("%ud", UNIT(c->qid));
 			devdir(c, q, up->genbuf, 0, eve, 0555, dp);
 			return 1;
 		}
@@ -1026,7 +1026,7 @@
 static void
 atarw(Aoedev *d, Frame *f)
 {
-	ulong bcnt;
+	uint bcnt;
 	char extbit, writebit;
 	Aoeata *ah;
 	Aoehdr *h;
@@ -1251,7 +1251,7 @@
 }
 
 static long
-readmem(ulong off, void *dst, long n, void *src, long size)
+readmem(usize off, void *dst, long n, void *src, long size)
 {
 	if(off >= size)
 		return 0;
@@ -1371,8 +1371,8 @@
 	for(i = 0; i < l->nea; i++)
 		p = seprint(p, e, "%E ", l->eatab[i]);
 	p = seprint(p, e, "\n");
-	p = seprint(p, e, "npkt: %uld\n", l->npkt);
-	p = seprint(p, e, "resent: %uld\n", l->resent);
+	p = seprint(p, e, "npkt: %llud\n", l->npkt);
+	p = seprint(p, e, "resent: %llud\n", l->resent);
 	p = seprint(p, e, "flag: ");
 	p = aoeflag(p, e, l->flag);
 	p = seprint(p, e, "rttavg: %uld\n", Tk2ms(l->rttavg));