Fix the uxxint types from plan 9 to standard types

I missed these old ones last time. This should be the last
type fix.

Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>

sys/src/9/386/ether8169.c

@@ -166,10 +166,10 @@ enum {					/* Cplusc */
 
 typedef struct D D;			/* Transmit/Receive Descriptor */
 struct D {
-	u32int	control;
-	u32int	vlan;
-	u32int	addrlo;
-	u32int	addrhi;
+	uint32_t	control;
+	uint32_t	vlan;
+	uint32_t	addrlo;
+	uint32_t	addrhi;
 };
 
 enum {					/* Transmit Descriptor control */
@@ -218,19 +218,19 @@ enum {					/* Ring sizes  (<= 1024) */
 
 typedef struct Dtcc Dtcc;
 struct Dtcc {
-	u64int	txok;
-	u64int	rxok;
-	u64int	txer;
-	u32int	rxer;
-	u16int	misspkt;
-	u16int	fae;
-	u32int	tx1col;
-	u32int	txmcol;
-	u64int	rxokph;
-	u64int	rxokbrd;
-	u32int	rxokmu;
-	u16int	txabt;
-	u16int	txundrn;
+	uint64_t	txok;
+	uint64_t	rxok;
+	uint64_t	txer;
+	uint32_t	rxer;
+	uint16_t	misspkt;
+	uint16_t	fae;
+	uint32_t	tx1col;
+	uint32_t	txmcol;
+	uint64_t	rxokph;
+	uint64_t	rxokbrd;
+	uint32_t	rxokmu;
+	uint16_t	txabt;
+	uint16_t	txundrn;
 };
 
 enum {						/* Variants */
@@ -308,8 +308,8 @@ static Ctlr* rtl8169ctlrtail;
 #define csr16r(c, r)	(ins((c)->port+(r)))
 #define csr32r(c, r)	(inl((c)->port+(r)))
 #define csr8w(c, r, b)	(outb((c)->port+(r), (u8int)(b)))
-#define csr16w(c, r, w)	(outs((c)->port+(r), (u16int)(w)))
-#define csr32w(c, r, l)	(outl((c)->port+(r), (u32int)(l)))
+#define csr16w(c, r, w)	(outs((c)->port+(r), (uint16_t)(w)))
+#define csr32w(c, r, l)	(outl((c)->port+(r), (uint32_t)(l)))
 
 static int
 rtl8169miimir(Ctlr* ctlr, int pa, int ra)
@@ -576,7 +576,7 @@ rtl8169halt(Ctlr* ctlr)
 static int
 rtl8169reset(Ctlr* ctlr)
 {
-	u32int r;
+	uint32_t r;
 	int timeo;
 
 	/*
@@ -632,10 +632,10 @@ static int
 rtl8169init(Ether* edev)
 {
 	int i;
-	u32int r;
+	uint32_t r;
 	Block *bp;
 	Ctlr *ctlr;
-	u8int cplusc;
+	uint8_t cplusc;
 
 	ctlr = edev->ctlr;
 	ilock(&ctlr->ilock);
@@ -953,7 +953,7 @@ rtl8169receive(Ether* edev)
 	int rdh;
 	Block *bp;
 	Ctlr *ctlr;
-	u32int control;
+	uint32_t control;
 
 	ctlr = edev->ctlr;
 
@@ -1024,7 +1024,7 @@ rtl8169interrupt(Ureg*, void* arg)
 {
 	Ctlr *ctlr;
 	Ether *edev;
-	u32int isr;
+	uint32_t isr;
 
 	edev = arg;
 	ctlr = edev->ctlr;
@@ -1149,7 +1149,7 @@ rtl8169pci(void)
 static int
 rtl8169pnp(Ether* edev)
 {
-	u32int r;
+	uint32_t r;
 	Ctlr *ctlr;
 	uint8_t ea[Eaddrlen];
 

sys/src/9/386/ether82563.c

@@ -332,12 +332,12 @@ enum {					/* Receive Delay Timer Ring */
 };
 
 typedef struct Rd {			/* Receive Descriptor */
-	u32int	addr[2];
-	u16int	length;
-	u16int	checksum;
-	u8int	status;
-	u8int	errors;
-	u16int	special;
+	uint32_t	addr[2];
+	uint16_t	length;
+	uint16_t	checksum;
+	uint8_t	status;
+	uint8_t	errors;
+	uint16_t	special;
 } Rd;
 
 enum {					/* Rd status */
@@ -361,9 +361,9 @@ enum {					/* Rd errors */
 };
 
 typedef struct {			/* Transmit Descriptor */
-	u32int	addr[2];		/* Data */
-	u32int	control;
-	u32int	status;
+	uint32_t	addr[2];		/* Data */
+	uint32_t	control;
+	uint32_t	status;
 } Td;
 
 enum {					/* Tdesc control */
@@ -393,8 +393,8 @@ enum {					/* Tdesc status */
 };
 
 typedef struct {
-	u16int	*reg;
-	u32int	*reg32;
+	uint16_t	*reg;
+	uint32_t	*reg32;
 	int	sz;
 } Flash;
 

sys/src/9/386/etherm10g.c

@@ -107,8 +107,8 @@ typedef union {
 
 typedef uint32_t Slot;
 typedef struct {
-	u16int	cksum;
-	u16int	len;
+	uint16_t	cksum;
+	uint16_t	len;
 } Slotparts;
 
 enum {
@@ -119,10 +119,10 @@ enum {
 };
 
 typedef struct {
-	u32int	high;
-	u32int	low;
-	u16int	hdroff;
-	u16int	len;
+	uint32_t	high;
+	uint32_t	low;
+	uint16_t	hdroff;
+	uint16_t	len;
 	uint8_t	pad;
 	uint8_t	nrdma;
 	uint8_t	chkoff;
@@ -159,7 +159,7 @@ static Bpool	bgpool	= { .size = Maxmtu, };
 
 typedef struct {
 	Bpool	*pool;		/* free buffers */
-	u32int	*lanai;		/* rx ring; we have no permanent host shadow */
+	uint32_t	*lanai;		/* rx ring; we have no permanent host shadow */
 	Block	**host;		/* called "info" in myricom driver */
 //	uchar	*wcfifo;	/* cmd submission fifo */
 	uint	m;
@@ -194,7 +194,7 @@ enum {
 
 typedef struct {
 	Slot 	*entry;
-	u64int	busaddr;
+	uint64_t	busaddr;
 	uint	m;
 	uint	n;
 	uint	i;
@@ -342,7 +342,7 @@ whichfw(Pcidev *p)
 {
 	int8_t *s;
 	int i, off, lanes, ecrc;
-	u32int cap;
+	uint32_t cap;
 
 	/* check the number of configured lanes. */
 	off = pcicap(p, PciCapPCIe);
@@ -412,10 +412,10 @@ parseeprom(Ctlr *c)
 	return 0;
 }
 
-static u16int
-pbit16(u16int i)
+static uint16_t
+pbit16(uint16_t i)
 {
-	u16int j;
+	uint16_t j;
 	uint8_t *p;
 
 	p = (uint8_t*)&j;
@@ -424,20 +424,20 @@ pbit16(u16int i)
 	return j;
 }
 
-static u16int
+static uint16_t
 gbit16(uint8_t i[2])
 {
-	u16int j;
+	uint16_t j;
 
 	j  = i[1];
 	j |= i[0]<<8;
 	return j;
 }
 
-static u32int
-pbit32(u32int i)
+static uint32_t
+pbit32(uint32_t i)
 {
-	u32int j;
+	uint32_t j;
 	uint8_t *p;
 
 	p = (uint8_t*)&j;
@@ -448,10 +448,10 @@ pbit32(u32int i)
 	return j;
 }
 
-static u32int
+static uint32_t
 gbit32(uint8_t i[4])
 {
-	u32int j;
+	uint32_t j;
 
 	j  = i[3];
 	j |= i[2]<<8;
@@ -478,10 +478,10 @@ prepcmd(uint *cmd, int i)
  * 40 byte = 5 int pad.
  */
 
-u32int
-cmd(Ctlr *c, int type, u64int data)
+uint32_t
+cmd(Ctlr *c, int type, uint64_t data)
 {
-	u32int buf[16], i;
+	uint32_t buf[16], i;
 	Cmd *cmd;
 
 	qlock(&c->cmdl);
@@ -517,10 +517,10 @@ cmd(Ctlr *c, int type, u64int data)
 	return ~0;			/* silence! */
 }
 
-u32int
+uint32_t
 maccmd(Ctlr *c, int type, uint8_t *m)
 {
-	u32int buf[16], i;
+	uint32_t buf[16], i;
 	Cmd *cmd;
 
 	qlock(&c->cmdl);
@@ -562,10 +562,10 @@ enum {
 	DMAwrite= 0x1,
 };
 
-u32int
-dmatestcmd(Ctlr *c, int type, u64int addr, int len)
+uint32_t
+dmatestcmd(Ctlr *c, int type, uint64_t addr, int len)
 {
-	u32int buf[16], i;
+	uint32_t buf[16], i;
 
 	memset(buf, 0, sizeof buf);
 	memset(c->cmd, Noconf, sizeof *c->cmd);
@@ -595,10 +595,10 @@ dmatestcmd(Ctlr *c, int type, u64int addr, int len)
 	return ~0;			/* silence! */
 }
 
-u32int
+uint32_t
 rdmacmd(Ctlr *c, int on)
 {
-	u32int buf[16], i;
+	uint32_t buf[16], i;
 
 	memset(buf, 0, sizeof buf);
 	c->cmd->i[0] = 0;
@@ -633,14 +633,14 @@ loadfw(Ctlr *c, int *align)
 	int i;
 
 	if((*align = whichfw(c->pcidev)) == 4*KiB){
-		f = (u32int*)fw4k;
+		f = (uint32_t*)fw4k;
 		sz = sizeof fw4k;
 	}else{
-		f = (u32int*)fw2k;
+		f = (uint32_t*)fw2k;
 		sz = sizeof fw2k;
 	}
 
-	s = (u32int*)(c->ram + Fwoffset);
+	s = (uint32_t*)(c->ram + Fwoffset);
 	for(i = 0; i < sz / 4; i++)
 		s[i] = f[i];
 	return sz & ~3;
@@ -691,7 +691,7 @@ static int
 kickthebaby(Pcidev *p, Ctlr *c)
 {
 	/* don't kick the baby! */
-	u32int code;
+	uint32_t code;
 
 	pcicfgw8(p,  0x10 + c->boot, 0x3);
 	pcicfgw32(p, 0x18 + c->boot, 0xfffffff0);
@@ -721,7 +721,7 @@ enum {
 };
 
 static int8_t *
-fwtype(u32int type)
+fwtype(uint32_t type)
 {
 	switch(type){
 	case Tmx:
@@ -741,12 +741,12 @@ chkfw(Ctlr *c)
 {
 	uintptr off;
 	Fwhdr *h;
-	u32int type;
+	uint32_t type;
 
 	off = gbit32(c->ram+0x3c);
-	dprint("firmware %llux\n", (u64int)off);
+	dprint("firmware %llux\n", (uint64_t)off);
 	if((off&3) || off + sizeof *h > c->ramsz){
-		print("!m10g: bad firmware %llux\n", (u64int)off);
+		print("!m10g: bad firmware %llux\n", (uint64_t)off);
 		return -1;
 	}
 	h = (Fwhdr*)(c->ram + off);
@@ -765,7 +765,7 @@ chkfw(Ctlr *c)
 static int
 reset(Ether *e, Ctlr *c)
 {
-	u32int i, sz;
+	uint32_t i, sz;
 
 	if(waserror()){
 		print("m10g: reset error\n");
@@ -778,11 +778,11 @@ reset(Ether *e, Ctlr *c)
 
 	cmd(c, CSintrqsz, c->done.n * sizeof *c->done.entry);
 	cmd(c, CSintrqdma, c->done.busaddr);
-	c->irqack =   (u32int*)(c->ram + cmd(c, CGirqackoff, 0));
+	c->irqack =   (uint32_t*)(c->ram + cmd(c, CGirqackoff, 0));
 	/* required only if we're not doing msi? */
-	c->irqdeass = (u32int*)(c->ram + cmd(c, CGirqdeassoff, 0));
+	c->irqdeass = (uint32_t*)(c->ram + cmd(c, CGirqdeassoff, 0));
 	/* this is the driver default, why fiddle with this? */
-	c->coal = (u32int*)(c->ram + cmd(c, CGcoaloff, 0));
+	c->coal = (uint32_t*)(c->ram + cmd(c, CGcoaloff, 0));
 	*c->coal = pbit32(25);
 
 	dprint("dma stats:\n");
@@ -823,8 +823,8 @@ ctlrfree(Ctlr *c)
 static int
 setmem(Pcidev *p, Ctlr *c)
 {
-	u32int i;
-	u64int raddr;
+	uint32_t i;
+	uint64_t raddr;
 	Done *d;
 	void *mem;
 
@@ -921,7 +921,7 @@ bgbfree(Block *b)
 static void
 replenish(Rx *rx)
 {
-	u32int buf[16], i, idx, e;
+	uint32_t buf[16], i, idx, e;
 	Bpool *p;
 	Block *b;
 
@@ -935,7 +935,7 @@ replenish(Rx *rx)
 		idx = rx->cnt & rx->m;
 		for(i = 0; i < 8; i++){
 			b = balloc(rx);
-			buf[i*2]   = pbit32((u64int)PCIWADDR(b->wp) >> 32);
+			buf[i*2]   = pbit32((uint64_t)PCIWADDR(b->wp) >> 32);
 			buf[i*2+1] = pbit32(PCIWADDR(b->wp));
 			rx->host[idx+i] = b;
 			assert(b);
@@ -996,7 +996,7 @@ open0(Ether *e, Ctlr *c)
 	entries = cmd(c, CGrxrgsz, 0)/8;
 	c->sm.pool = &smpool;
 	cmd(c, CSsmallsz, c->sm.pool->size);
-	c->sm.lanai = (u32int*)(c->ram + cmd(c, CGsmallrxoff, 0));
+	c->sm.lanai = (uint32_t*)(c->ram + cmd(c, CGsmallrxoff, 0));
 	c->sm.n = entries;
 	c->sm.m = entries-1;
 	c->sm.host = emalign(entries * sizeof *c->sm.host);
@@ -1004,7 +1004,7 @@ open0(Ether *e, Ctlr *c)
 	c->bg.pool = &bgpool;
 	c->bg.pool->size = nextpow(2 + e->maxmtu);  /* 2-byte alignment pad */
 	cmd(c, CSbigsz, c->bg.pool->size);
-	c->bg.lanai = (u32int*)(c->ram + cmd(c, CGbigrxoff, 0));
+	c->bg.lanai = (uint32_t*)(c->ram + cmd(c, CGbigrxoff, 0));
 	c->bg.n = entries;
 	c->bg.m = entries-1;
 	c->bg.host = emalign(entries * sizeof *c->bg.host);
@@ -1035,7 +1035,7 @@ static Block*
 nextblock(Ctlr *c)
 {
 	uint i;
-	u16int l, k;
+	uint16_t l, k;
 	Block *b;
 	Done *d;
 	Rx *rx;
@@ -1113,7 +1113,7 @@ m10rx(void *v)
 }
 
 static void
-txcleanup(Tx *tx, u32int n)
+txcleanup(Tx *tx, uint32_t n)
 {
 	Block *b;
 	uint j, l, m;
@@ -1209,8 +1209,8 @@ nsegments(Block *b, int segsz)
 static void
 m10gtransmit(Ether *e)
 {
-	u16int slen;
-	u32int i, cnt, rdma, nseg, count, end, bus, len, segsz;
+	uint16_t slen;
+	uint32_t i, cnt, rdma, nseg, count, end, bus, len, segsz;
 	uint8_t flags;
 	Block *b;
 	Ctlr *c;
@@ -1268,7 +1268,7 @@ m10gtransmit(Ether *e)
 static void
 checkstats(Ether *e, Ctlr *c, Stats *s)
 {
-	u32int i;
+	uint32_t i;
 
 	if(s->updated == 0)
 		return;

sys/src/9/k10/apic.c

@@ -79,22 +79,22 @@ enum {						/* Tdc */
 	DivX1		= 0x0000000b,		/* Divide by 1 */
 };
 
-static u8int* apicbase;
+static uint8_t* apicbase;
 static int apmachno = 1;
 
 Apic	xlapic[Napic];
 Mach	*xlapicmachptr[Napic];		/* maintained, but unused */
 
-static u32int
+static uint32_t
 apicrget(int r)
 {
-	return *((u32int*)(apicbase+r));
+	return *((uint32_t*)(apicbase+r));
 }
 
 static void
-apicrput(int r, u32int data)
+apicrput(int r, uint32_t data)
 {
-	*((u32int*)(apicbase+r)) = data;
+	*((uint32_t*)(apicbase+r)) = data;
 }
 
 int
@@ -198,8 +198,8 @@ int
 apiconline(void)
 {
 	Apic *apic;
-	u64int tsc;
-	u32int dfr, ver;
+	uint64_t tsc;
+	uint32_t dfr, ver;
 	int apicno, nlvt;
 
 	if(apicbase == nil)
@@ -379,7 +379,7 @@ void
 apicsipi(int apicno, uintmem pa)
 {
 	int i;
-	u32int crhi, crlo;
+	uint32_t crhi, crlo;
 
 	/*
 	 * SIPI - Start-up IPI.
@@ -392,7 +392,7 @@ apicsipi(int apicno, uintmem pa)
 	apicrput(Iclo, DSnone|TMlevel|MTir);
 	millidelay(10);
 
-	crlo = DSnone|TMedge|MTsipi|((u32int)pa/(4*KiB));
+	crlo = DSnone|TMedge|MTsipi|((uint32_t)pa/(4*KiB));
 	for(i = 0; i < 2; i++){
 		apicrput(Ichi, crhi);
 		apicrput(Iclo, crlo);

sys/src/9/k10/archk10.c

@@ -16,7 +16,7 @@
 static int
 cpuidinit(void)
 {
-	u32int eax, info[4];
+	uint32_t eax, info[4];
 
 	/*
 	 * Standard CPUID functions.
@@ -47,7 +47,7 @@ cpuidinit(void)
 }
 
 static int
-cpuidinfo(u32int eax, u32int ecx, u32int info[4])
+cpuidinfo(uint32_t eax, uint32_t ecx, uint32_t info[4])
 {
 	if(m->ncpuinfos == 0 && cpuidinit() == 0)
 		return 0;
@@ -65,11 +65,11 @@ cpuidinfo(u32int eax, u32int ecx, u32int info[4])
 }
 
 static int64_t
-cpuidhz(u32int info[2][4])
+cpuidhz(uint32_t info[2][4])
 {
 	int f, r;
 	int64_t hz;
-	u64int msr;
+	uint64_t msr;
 
 	if(memcmp(&info[0][1], "GenuntelineI", 12) == 0){
 		switch(info[1][0] & 0x0fff3ff0){
@@ -198,7 +198,7 @@ void
 cpuiddump(void)
 {
 	int i;
-	u32int info[4];
+	uint32_t info[4];
 
 	if(!DBGFLG)
 		return;
@@ -222,7 +222,7 @@ int64_t
 archhz(void)
 {
 	int64_t hz;
-	u32int info[2][4];
+	uint32_t info[2][4];
 
 	if(!cpuidinfo(0, 0, info[0]) || !cpuidinfo(1, 0, info[1]))
 		return 0;
@@ -237,7 +237,7 @@ archhz(void)
 int
 archmmu(void)
 {
-	u32int info[4];
+	uint32_t info[4];
 
 	/*
 	 * Should the check for m->machno != 0 be here
@@ -312,9 +312,9 @@ fmtL(Fmt* f)
 static int
 fmtR(Fmt* f)
 {
-	u64int r;
+	uint64_t r;
 
-	r = va_arg(f->args, u64int);
+	r = va_arg(f->args, uint64_t);
 
 	return fmtprint(f, "%#16.16llux", r);
 }
@@ -323,9 +323,9 @@ fmtR(Fmt* f)
 static int
 fmtW(Fmt *f)
 {
-	u64int va;
+	uint64_t va;
 
-	va = va_arg(f->args, u64int);
+	va = va_arg(f->args, uint64_t);
 	return fmtprint(f, "%#ullx=0x[%ullx][%ullx][%ullx][%ullx][%ullx]", va,
 		PTLX(va, 3), PTLX(va, 2), PTLX(va, 1), PTLX(va, 0),
 		va & ((1<<PGSHFT)-1));
@@ -362,7 +362,7 @@ archidle(void)
 void
 microdelay(int microsecs)
 {
-	u64int r, t;
+	uint64_t r, t;
 
 	r = rdtsc();
 	for(t = r + m->cpumhz*microsecs; r < t; r = rdtsc())
@@ -372,7 +372,7 @@ microdelay(int microsecs)
 void
 millidelay(int millisecs)
 {
-	u64int r, t;
+	uint64_t r, t;
 
 	r = rdtsc();
 	for(t = r + m->cpumhz*1000ull*millisecs; r < t; r = rdtsc())

sys/src/9/k10/archk8.c

@@ -17,7 +17,7 @@ static int
 cpuidinit(void)
 {
 	int i, n;
-	u32int eax;
+	uint32_t eax;
 
 	if((m->ncpuinfos = cpuid(0, m->cpuinfo[0])) == 0)
 		return 0;
@@ -44,8 +44,8 @@ cpuidinit(void)
 	return 1;
 }
 
-static u32int*
-cpuidinfo(u32int eax)
+static uint32_t*
+cpuidinfo(uint32_t eax)
 {
 	if(m->ncpuinfos == 0 && cpuidinit() == 0)
 		return nil;
@@ -65,11 +65,11 @@ cpuidinfo(u32int eax)
 }
 
 static int64_t
-cpuidhz(u32int* info[2])
+cpuidhz(uint32_t* info[2])
 {
 	int f, r;
 	int64_t hz;
-	u64int msr;
+	uint64_t msr;
 
 	if(memcmp(&info[0][1], "GenuntelineI", 12) == 0){
 		switch(info[1][0] & 0x0fff3ff0){
@@ -217,7 +217,7 @@ int64_t
 archhz(void)
 {
 	int64_t hz;
-	u32int *info[2];
+	uint32_t *info[2];
 
 	if((info[0] = cpuidinfo(0)) == 0 || (info[1] = cpuidinfo(1)) == 0)
 		return 0;
@@ -238,7 +238,7 @@ archidle(void)
 void
 microdelay(int microsecs)
 {
-	u64int r, t;
+	uint64_t r, t;
 
 	r = rdtsc();
 	for(t = r + m->cpumhz*microsecs; r < t; r = rdtsc())
@@ -248,7 +248,7 @@ microdelay(int microsecs)
 void
 millidelay(int millisecs)
 {
-	u64int r, t;
+	uint64_t r, t;
 
 	r = rdtsc();
 	for(t = r + m->cpumhz*1000ull*millisecs; r < t; r = rdtsc())

sys/src/9/k10/asm.c

@@ -265,7 +265,7 @@ asmmapinit(uintmem addr, uintmem size, int type)
 }
 
 void
-asmmodinit(u32int start, u32int end, int8_t* s)
+asmmodinit(uint32_t start, uint32_t end, int8_t* s)
 {
 	DBG("asmmodinit: %#ux -> %#ux: <%s> %#ux\n",
 		start, end, s, ROUNDUP(end, 4096));

sys/src/9/k10/devacpi.c

@@ -28,7 +28,7 @@
 
 
 #define l16get(p)	(((p)[1]<<8)|(p)[0])
-#define l32get(p)	(((u32int)l16get(p+2)<<16)|l16get(p))
+#define l32get(p)	(((uint32_t)l16get(p+2)<<16)|l16get(p))
 static Atable* acpifadt(uint8_t*, int);
 static Atable* acpitable(uint8_t*, int);
 static Atable* acpimadt(uint8_t*, int);
@@ -109,8 +109,8 @@ acpiregid(int8_t *s)
 	return -1;
 }
 
-static u64int
-l64get(u8int* p)
+static uint64_t
+l64get(uint8_t* p)
 {
 	/*
 	 * Doing this as a define
@@ -118,102 +118,102 @@ l64get(u8int* p)
 	 * causes 8c to abort with "out of fixed registers" in
 	 * rsdlink() below.
 	 */
-	return (((u64int)l32get(p+4)<<32)|l32get(p));
+	return (((uint64_t)l32get(p+4)<<32)|l32get(p));
 }
 
-static u8int
+static uint8_t
 mget8(uintptr p, void*)
 {
-	u8int *cp = (u8int*)p;
+	uint8_t *cp = (uint8_t*)p;
 	return *cp;
 }
 
 static void
-mset8(uintptr p, u8int v, void*)
+mset8(uintptr p, uint8_t v, void*)
 {
-	u8int *cp = (u8int*)p;
+	uint8_t *cp = (uint8_t*)p;
 	*cp = v;
 }
 
-static u16int
+static uint16_t
 mget16(uintptr p, void*)
 {
-	u16int *cp = (u16int*)p;
+	uint16_t *cp = (uint16_t*)p;
 	return *cp;
 }
 
 static void
-mset16(uintptr p, u16int v, void*)
+mset16(uintptr p, uint16_t v, void*)
 {
-	u16int *cp = (u16int*)p;
+	uint16_t *cp = (uint16_t*)p;
 	*cp = v;
 }
 
-static u32int
+static uint32_t
 mget32(uintptr p, void*)
 {
-	u32int *cp = (u32int*)p;
+	uint32_t *cp = (uint32_t*)p;
 	return *cp;
 }
 
 static void
-mset32(uintptr p, u32int v, void*)
+mset32(uintptr p, uint32_t v, void*)
 {
-	u32int *cp = (u32int*)p;
+	uint32_t *cp = (uint32_t*)p;
 	*cp = v;
 }
 
-static u64int
+static uint64_t
 mget64(uintptr p, void*)
 {
-	u64int *cp = (u64int*)p;
+	uint64_t *cp = (uint64_t*)p;
 	return *cp;
 }
 
 static void
-mset64(uintptr p, u64int v, void*)
+mset64(uintptr p, uint64_t v, void*)
 {
-	u64int *cp = (u64int*)p;
+	uint64_t *cp = (uint64_t*)p;
 	*cp = v;
 }
 
-static u8int
+static uint8_t
 ioget8(uintptr p, void*)
 {
 	return inb(p);
 }
 
 static void
-ioset8(uintptr p, u8int v, void*)
+ioset8(uintptr p, uint8_t v, void*)
 {
 	outb(p, v);
 }
 
-static u16int
+static uint16_t
 ioget16(uintptr p, void*)
 {
 	return ins(p);
 }
 
 static void
-ioset16(uintptr p, u16int v, void*)
+ioset16(uintptr p, uint16_t v, void*)
 {
 	outs(p, v);
 }
 
-static u32int
+static uint32_t
 ioget32(uintptr p, void*)
 {
 	return inl(p);
 }
 
 static void
-ioset32(uintptr p, u32int v, void*)
+ioset32(uintptr p, uint32_t v, void*)
 {
 	outl(p, v);
 }
 
-static u8int
+static uint8_t
 cfgget8(uintptr p, void* r)
 {
 	Reg *ro = r;
@@ -224,7 +224,7 @@ cfgget8(uintptr p, void* r)
 }
 
 static void
-cfgset8(uintptr p, u8int v, void* r)
+cfgset8(uintptr p, uint8_t v, void* r)
 {
 	Reg *ro = r;
 	Pcidev d;
@@ -233,7 +233,7 @@ cfgset8(uintptr p, u8int v, void* r)
 	pcicfgw8(&d, p, v);
 }
 
-static u16int
+static uint16_t
 cfgget16(uintptr p, void* r)
 {
 	Reg *ro = r;
@@ -244,7 +244,7 @@ cfgget16(uintptr p, void* r)
 }
 
 static void
-cfgset16(uintptr p, u16int v, void* r)
+cfgset16(uintptr p, uint16_t v, void* r)
 {
 	Reg *ro = r;
 	Pcidev d;
@@ -253,7 +253,7 @@ cfgset16(uintptr p, u16int v, void* r)
 	pcicfgw16(&d, p, v);
 }
 
-static u32int
+static uint32_t
 cfgget32(uintptr p, void* r)
 {
 	Reg *ro = r;
@@ -264,7 +264,7 @@ cfgget32(uintptr p, void* r)
 }
 
 static void
-cfgset32(uintptr p, u32int v, void* r)
+cfgset32(uintptr p, uint32_t v, void* r)
 {
 	Reg *ro = r;
 	Pcidev d;
@@ -423,7 +423,7 @@ newtable(uint8_t *p)
 static void*
 sdtchecksum(void* addr, int len)
 {
-	u8int *p, sum;
+	uint8_t *p, sum;
 
 	sum = 0;
 	for(p = addr; len-- > 0; p++)
@@ -623,7 +623,7 @@ acpifadt(uint8_t *p, int)
 	else
 		loadfacs(fp->facs);
 
-	if(fp->xdsdt == ((u64int)fp->dsdt)) /* acpica */
+	if(fp->xdsdt == ((uint64_t)fp->dsdt)) /* acpica */
 		loaddsdt(fp->xdsdt);
 	else
 		loaddsdt(fp->dsdt);
@@ -1149,10 +1149,10 @@ acpixsdtload(int8_t *sig)
 }
 
 static void*
-rsdscan(u8int* addr, int len, int8_t* signature)
+rsdscan(uint8_t* addr, int len, int8_t* signature)
 {
 	int sl;
-	u8int *e, *p;
+	uint8_t *e, *p;
 
 	e = addr+len;
 	sl = strlen(signature);
@@ -1169,7 +1169,7 @@ static void*
 rsdsearch(int8_t* signature)
 {
 	uintptr p;
-	u8int *bda;
+	uint8_t *bda;
 	void *rsd;
 
 	/*

sys/src/9/k10/devarch.c

@@ -606,7 +606,7 @@ cycles(uint64_t* t)
 void
 delay(int millisecs)
 {
-	u64int r, t;
+	uint64_t r, t;
 
 	if(millisecs <= 0)
 		millisecs = 1;

sys/src/9/k10/ether82563.c

@@ -377,12 +377,12 @@ enum {					/* Receive Delay Timer Ring */
 };
 
 typedef struct Rd {			/* Receive Descriptor */
-	u32int	addr[2];
-	u16int	length;
-	u16int	checksum;
-	u8int	status;
-	u8int	errors;
-	u16int	special;
+	uint32_t	addr[2];
+	uint16_t	length;
+	uint16_t	checksum;
+	uint8_t	status;
+	uint8_t	errors;
+	uint16_t	special;
 } Rd;
 
 enum {					/* Rd status */
@@ -406,9 +406,9 @@ enum {					/* Rd errors */
 };
 
 typedef struct {			/* Transmit Descriptor */
-	u32int	addr[2];		/* Data */
-	u32int	control;
-	u32int	status;
+	uint32_t	addr[2];		/* Data */
+	uint32_t	control;
+	uint32_t	status;
 } Td;
 
 enum {					/* Tdesc control */
@@ -438,8 +438,8 @@ enum {					/* Tdesc status */
 };
 
 typedef struct {
-	u16int	*reg;
-	u32int	*reg32;
+	uint16_t	*reg;
+	uint32_t	*reg32;
 	int	sz;
 } Flash;
 
@@ -542,7 +542,7 @@ struct Ctlr {
 	Ether	*edev;
 	int	active;
 	int	type;
-	u16int	eeprom[0x40];
+	uint16_t	eeprom[0x40];
 
 	QLock	alock;			/* attach */
 	int	attached;
@@ -573,7 +573,7 @@ struct Ctlr {
 	uint	phyerrata;
 
 	uint8_t	ra[Eaddrlen];		/* receive address */
-	u32int	mta[128];		/* multicast table array */
+	uint32_t	mta[128];		/* multicast table array */
 
 	Rendez	rrendez;
 	int	rim;
@@ -1211,7 +1211,7 @@ phyread(Ctlr *c, int phyno, int reg)
 }
 
 static uint
-phywrite0(Ctlr *c, int phyno, int reg, u16int val)
+phywrite0(Ctlr *c, int phyno, int reg, uint16_t val)
 {
 	uint phy, i;
 
@@ -1247,7 +1247,7 @@ setpage(Ctlr *c, uint phyno, uint p, uint r)
 }
 
 static uint
-phywrite(Ctlr *c, uint phyno, uint reg, u16int v)
+phywrite(Ctlr *c, uint phyno, uint reg, uint16_t v)
 {
 	if(setpage(c, phyno, reg>>8, reg & 0xff) == ~0)
 		panic("%s: bad phy reg %.4ux", cname(c), reg);
@@ -1611,7 +1611,7 @@ i82563shutdown(Ether* ether)
 	i82563detach(ether->ctlr);
 }
 
-static u16int
+static uint16_t
 eeread(Ctlr *ctlr, int adr)
 {
 	csr32w(ctlr, Eerd, EEstart | adr << 2);
@@ -1623,7 +1623,7 @@ eeread(Ctlr *ctlr, int adr)
 static int
 eeload(Ctlr *ctlr)
 {
-	u16int sum;
+	uint16_t sum;
 	int data, adr;
 
 	sum = 0;
@@ -1638,7 +1638,7 @@ eeload(Ctlr *ctlr)
 static int
 fcycle(Ctlr *, Flash *f)
 {
-	u16int s, i;
+	uint16_t s, i;
 
 	s = f->reg[Fsts];
 	if((s&Fvalid) == 0)
@@ -1656,7 +1656,7 @@ fcycle(Ctlr *, Flash *f)
 static int
 fread(Ctlr *c, Flash *f, int ladr)
 {
-	u16int s;
+	uint16_t s;
 
 	delay(1);
 	if(fcycle(c, f) == -1)
@@ -1681,8 +1681,8 @@ fread(Ctlr *c, Flash *f, int ladr)
 static int
 fload(Ctlr *c)
 {
-	u32int data, io, r, adr;
-	u16int sum;
+	uint32_t data, io, r, adr;
+	uint16_t sum;
 	Flash f;
 
 	io = c->pcidev->mem[1].bar & ~0x0f;
@@ -1722,7 +1722,7 @@ defaultea(Ctlr *ctlr, uint8_t *ra)
 		return;
 	if(cttab[ctlr->type].flag & Fflashea){
 		/* intel mb bug */
-		u = (uint64_t)csr32r(ctlr, Rah)<<32u | (u32int)csr32r(ctlr, Ral);
+		u = (uint64_t)csr32r(ctlr, Rah)<<32u | (uint32_t)csr32r(ctlr, Ral);
 		for(i = 0; i < Eaddrlen; i++)
 			ra[i] = u >> 8*i;
 	}
@@ -1807,7 +1807,7 @@ static int32_t
 i82563ctl(Ether *edev, void *buf, int32_t n)
 {
 	int8_t *p;
-	u32int v;
+	uint32_t v;
 	Ctlr *ctlr;
 	Cmdbuf *cb;
 	Cmdtab *ct;
@@ -1960,7 +1960,7 @@ static void
 i82563pci(void)
 {
 	int type;
-	u32int io;
+	uint32_t io;
 	Ctlr *ctlr;
 	Pcidev *p;
 

sys/src/9/k10/etherbcm.c

@@ -36,9 +36,9 @@ struct Ctlr {
 	Ether	*ether;
 	Ctlr	*next;
 	Pcidev	*pdev;
-	u32int	*nic, *status;
+	uint32_t	*nic, *status;
 
-	u32int	*recvret, *recvprod, *sendr;
+	uint32_t	*recvret, *recvprod, *sendr;
 	uint32_t	port;
 	uint	recvreti, recvprodi, sendri, sendcleani;
 	Block	**sends;
@@ -396,7 +396,7 @@ static int
 replenish(Ctlr *ctlr)
 {
 	uint incr;
-	u32int *next;
+	uint32_t *next;
 	Block *bp;
 	
 	incr = (ctlr->recvprodi + 1) & (RxProdRingLen - 1);
@@ -425,7 +425,7 @@ static void
 bcmreceive(Ether *edev)
 {
 	uint len;
-	u32int *pkt;
+	uint32_t *pkt;
 	Ctlr *ctlr;
 	Block *bp;
 	
@@ -468,7 +468,7 @@ static void
 bcmtransmit(Ether *edev)
 {
 	uint incr;
-	u32int *next;
+	uint32_t *next;
 	Ctlr *ctlr;
 	Block *bp;
 	
@@ -524,7 +524,7 @@ bcmerror(Ether *edev)
 static void
 bcminterrupt(Ureg*, void *arg)
 {
-	u32int status, tag, dummy;
+	uint32_t status, tag, dummy;
 	Ether *edev;
 	Ctlr *ctlr;
 	
@@ -557,10 +557,10 @@ mem32w(Ctlr *c, uint r, uint v)
 	pcicfgw32(c->pdev, MemwindData, v);
 }
 
-static u32int
+static uint32_t
 mem32r(Ctlr *c, uint r)
 {
-	u32int v;
+	uint32_t v;
 
 	pcicfgw32(c->pdev, Memwind, r);
 	v = pcicfgr32(c->pdev, MemwindData);

sys/src/9/k10/fpu.c

@@ -305,7 +305,7 @@ fpunote(void)
 int8_t*
 xfpuxf(Ureg* ureg, void*)
 {
-	u32int mxcsr;
+	uint32_t mxcsr;
 	Fxsave *fpusave;
 	int8_t *m;
 
@@ -504,7 +504,7 @@ acfpunm(Ureg *ureg, void *p)
 void
 fpuinit(void)
 {
-	u64int r;
+	uint64_t r;
 	Fxsave *fxsave;
 	uint8_t buf[sizeof(Fxsave)+15];
 

sys/src/9/k10/i8254.c

@@ -88,10 +88,10 @@ i8254set(int port, int hz)
 }
 
 int64_t
-i8254hz(u32int info[2][4])
+i8254hz(uint32_t info[2][4])
 {
-	u32int ax;
-	u64int a, b;
+	uint32_t ax;
+	uint64_t a, b;
 	int aamcycles, incr, loops, x, y;
 
 	/*

sys/src/9/k10/ioapic.c

@@ -28,7 +28,7 @@ struct Rbus {
 struct Rdt {
 	Apic	*apic;
 	int	intin;
-	u32int	lo;
+	uint32_t	lo;
 
 	int	ref;				/* could map to multiple busses */
 	int	enabled;				/* times enabled */
@@ -59,7 +59,7 @@ static int idtno = IdtIOAPIC;
 Apic	xioapic[Napic];
 
 static void
-rtblget(Apic* apic, int sel, u32int* hi, u32int* lo)
+rtblget(Apic* apic, int sel, uint32_t* hi, uint32_t* lo)
 {
 	sel = Ioredtbl + 2*sel;
 
@@ -70,7 +70,7 @@ rtblget(Apic* apic, int sel, u32int* hi, u32int* lo)
 }
 
 static void
-rtblput(Apic* apic, int sel, u32int hi, u32int lo)
+rtblput(Apic* apic, int sel, uint32_t hi, uint32_t lo)
 {
 	sel = Ioredtbl + 2*sel;
 
@@ -95,7 +95,7 @@ rdtlookup(Apic *apic, int intin)
 }
 
 void
-ioapicintrinit(int busno, int apicno, int intin, int devno, u32int lo)
+ioapicintrinit(int busno, int apicno, int intin, int devno, uint32_t lo)
 {
 	Rbus *rbus;
 	Rdt *rdt;
@@ -169,7 +169,7 @@ ioapicdump(void)
 	Rbus *rbus;
 	Rdt *rdt;
 	Apic *apic;
-	u32int hi, lo;
+	uint32_t hi, lo;
 
 	if(!DBGFLG)
 		return;
@@ -220,7 +220,7 @@ ioapiconline(void)
 static int dfpolicy = 0;
 
 static void
-ioapicintrdd(u32int* hi, u32int* lo)
+ioapicintrdd(uint32_t* hi, uint32_t* lo)
 {
 	int i;
 	static int df;
@@ -339,7 +339,7 @@ ioapicintrenable(Vctl* v)
 {
 	Rbus *rbus;
 	Rdt *rdt;
-	u32int hi, lo;
+	uint32_t hi, lo;
 	int busno, devno, vecno;
 
 	/*

sys/src/9/k10/main.c

@@ -251,7 +251,7 @@ HERE(void)
 }
 
 void
-main(u32int ax, u32int bx)
+main(uint32_t ax, uint32_t bx)
 {
 	int64_t hz;
 

sys/src/9/k10/map.c

@@ -21,7 +21,7 @@
 void*
 KADDR(uintptr pa)
 {
-	u8int* va;
+	uint8_t* va;
 
 	va = UINT2PTR(pa);
 	if(pa < TMFM)

sys/src/9/k10/mmu.c

@@ -130,7 +130,7 @@ dumpmmu(Proc *p)
 }
 
 void
-dumpmmuwalk(u64int addr)
+dumpmmuwalk(uint64_t addr)
 {
 	int l;
 	PTE *pte, *pml4;
@@ -265,7 +265,7 @@ checkpte(uintmem ppn, void *a)
 {
 	int l;
 	PTE *pte, *pml4;
-	u64int addr;
+	uint64_t addr;
 	int8_t buf[240], *s;
 
 	addr = PTR2UINT(a);
@@ -712,7 +712,7 @@ vunmap(void* v, usize size)
 }
 
 int
-mmuwalk(PTE* pml4, uintptr va, int level, PTE** ret, u64int (*alloc)(usize))
+mmuwalk(PTE* pml4, uintptr va, int level, PTE** ret, uint64_t (*alloc)(usize))
 {
 	int l;
 	uintmem pa;
@@ -779,7 +779,7 @@ mmuinit(void)
 {
 	uint8_t *p;
 	Page *page;
-	u64int o, pa, r, sz;
+	uint64_t o, pa, r, sz;
 
 	archmmu();
 	DBG("mach%d: %#p pml4 %#p npgsz %d\n", m->machno, m, m->pml4, m->npgsz);

sys/src/9/k10/mp.c

@@ -19,29 +19,29 @@
  * MultiProcessor Specification Version 1.[14].
  */
 typedef struct {				/* MP Floating Pointer */
-	u8int	signature[4];			/* "_MP_" */
-	u8int	addr[4];			/* PCMP */
-	u8int	length;				/* 1 */
-	u8int	revision;			/* [14] */
-	u8int	checksum;
-	u8int	feature[5];
+	uint8_t	signature[4];			/* "_MP_" */
+	uint8_t	addr[4];			/* PCMP */
+	uint8_t	length;				/* 1 */
+	uint8_t	revision;			/* [14] */
+	uint8_t	checksum;
+	uint8_t	feature[5];
 } _MP_;
 
 typedef struct {				/* MP Configuration Table */
-	u8int	signature[4];			/* "PCMP" */
-	u8int	length[2];
-	u8int	revision;			/* [14] */
-	u8int	checksum;
-	u8int	string[20];			/* OEM + Product ID */
-	u8int	oaddr[4];			/* OEM table pointer */
-	u8int	olength[2];			/* OEM table length */
-	u8int	entry[2];			/* entry count */
-	u8int	apicpa[4];			/* local APIC address */
-	u8int	xlength[2];			/* extended table length */
-	u8int	xchecksum;			/* extended table checksum */
-	u8int	reserved;
-
-	u8int	entries[];
+	uint8_t	signature[4];			/* "PCMP" */
+	uint8_t	length[2];
+	uint8_t	revision;			/* [14] */
+	uint8_t	checksum;
+	uint8_t	string[20];			/* OEM + Product ID */
+	uint8_t	oaddr[4];			/* OEM table pointer */
+	uint8_t	olength[2];			/* OEM table length */
+	uint8_t	entry[2];			/* entry count */
+	uint8_t	apicpa[4];			/* local APIC address */
+	uint8_t	xlength[2];			/* extended table length */
+	uint8_t	xchecksum;			/* extended table checksum */
+	uint8_t	reserved;
+
+	uint8_t	entries[];
 } PCMP;
 
 typedef struct {
@@ -58,7 +58,7 @@ static Mpbus* mpbus[Nbus];
 int mpisabusno = -1;
 
 static void
-mpintrprint(int8_t* s, u8int* p)
+mpintrprint(int8_t* s, uint8_t* p)
 {
 	int8_t buf[128], *b, *e;
 	int8_t format[] = " type %d flags %#ux bus %d IRQ %d APIC %d INTIN %d\n";
@@ -72,10 +72,10 @@ mpintrprint(int8_t* s, u8int* p)
 	print(buf);
 }
 
-static u32int
-mpmkintr(u8int* p)
+static uint32_t
+mpmkintr(uint8_t* p)
 {
-	u32int v;
+	uint32_t v;
 	Apic *apic;
 	int n, polarity, trigger;
 
@@ -185,8 +185,8 @@ mpmkintr(u8int* p)
 static void
 mpparse(PCMP* pcmp, int maxcores)
 {
-	u32int lo;
-	u8int *e, *p;
+	uint32_t lo;
+	uint8_t *e, *p;
 	int devno, i, n;
 
 	p = pcmp->entries;
@@ -362,7 +362,7 @@ mpparse(PCMP* pcmp, int maxcores)
 static int
 sigchecksum(void* address, int length)
 {
-	u8int *p, sum;
+	uint8_t *p, sum;
 
 	sum = 0;
 	for(p = address; length-- > 0; p++)
@@ -372,9 +372,9 @@ sigchecksum(void* address, int length)
 }
 
 static void*
-sigscan(u8int* address, int length, int8_t* signature)
+sigscan(uint8_t* address, int length, int8_t* signature)
 {
-	u8int *e, *p;
+	uint8_t *e, *p;
 	int siglength;
 
 	e = address+length;
@@ -392,7 +392,7 @@ static void*
 sigsearch(int8_t* signature)
 {
 	uintptr p;
-	u8int *bda;
+	uint8_t *bda;
 	void *r;
 
 	/*
@@ -419,7 +419,7 @@ sigsearch(int8_t* signature)
 void
 mpsinit(int maxcores)
 {
-	u8int *p;
+	uint8_t *p;
 	int i, n;
 	_MP_ *mp;
 	PCMP *pcmp;
@@ -465,7 +465,7 @@ mpsinit(int maxcores)
     			l16get(pcmp->xlength), pcmp->xchecksum);
 	}
 	if(pcmp->xchecksum != 0){
-		p = ((u8int*)pcmp) + l16get(pcmp->length);
+		p = ((uint8_t*)pcmp) + l16get(pcmp->length);
 		i = sigchecksum(p, l16get(pcmp->xlength));
 		if(((i+pcmp->xchecksum) & 0xff) != 0){
 			print("extended table checksums to %#ux\n", i);

sys/src/9/k10/multiboot.c

@@ -15,22 +15,22 @@
 
 typedef struct Mbi Mbi;
 struct Mbi {
-	u32int	flags;
-	u32int	memlower;
-	u32int	memupper;
-	u32int	bootdevice;
-	u32int	cmdline;
-	u32int	modscount;
-	u32int	modsaddr;
-	u32int	syms[4];
-	u32int	mmaplength;
-	u32int	mmapaddr;
-	u32int	driveslength;
-	u32int	drivesaddr;
-	u32int	configtable;
-	u32int	bootloadername;
-	u32int	apmtable;
-	u32int	vbe[6];
+	uint32_t	flags;
+	uint32_t	memlower;
+	uint32_t	memupper;
+	uint32_t	bootdevice;
+	uint32_t	cmdline;
+	uint32_t	modscount;
+	uint32_t	modsaddr;
+	uint32_t	syms[4];
+	uint32_t	mmaplength;
+	uint32_t	mmapaddr;
+	uint32_t	driveslength;
+	uint32_t	drivesaddr;
+	uint32_t	configtable;
+	uint32_t	bootloadername;
+	uint32_t	apmtable;
+	uint32_t	vbe[6];
 };
 
 enum {						/* flags */
@@ -50,29 +50,29 @@ enum {						/* flags */
 
 typedef struct Mod Mod;
 struct Mod {
-	u32int	modstart;
-	u32int	modend;
-	u32int	string;
-	u32int	reserved;
+	uint32_t	modstart;
+	uint32_t	modend;
+	uint32_t	string;
+	uint32_t	reserved;
 };
 
 typedef struct MMap MMap;
 struct MMap {
-	u32int	size;
-	u32int	base[2];
-	u32int	length[2];
-	u32int	type;
+	uint32_t	size;
+	uint32_t	base[2];
+	uint32_t	length[2];
+	uint32_t	type;
 };
 
 int
-multiboot(u32int magic, u32int pmbi, int vflag)
+multiboot(uint32_t magic, uint32_t pmbi, int vflag)
 {
 	int8_t *p;
 	int i, n;
 	Mbi *mbi;
 	Mod *mod;
 	MMap *mmap;
-	u64int addr, len;
+	uint64_t addr, len;
 
 	if(vflag)
 		print("magic %#ux pmbi %#ux\n", magic, pmbi);
@@ -107,8 +107,8 @@ multiboot(u32int magic, u32int pmbi, int vflag)
 		mmap = KADDR(mbi->mmapaddr);
 		n = 0;
 		while(n < mbi->mmaplength){
-			addr = (((u64int)mmap->base[1])<<32)|mmap->base[0];
-			len = (((u64int)mmap->length[1])<<32)|mmap->length[0];
+			addr = (((uint64_t)mmap->base[1])<<32)|mmap->base[0];
+			len = (((uint64_t)mmap->length[1])<<32)|mmap->length[0];
 			switch(mmap->type){
 			default:
 				if(vflag)

sys/src/9/k10/physalloc.c

@@ -54,7 +54,7 @@ struct Buddy {
 typedef struct Bal Bal;
 struct Bal {
 	uintmem	base;
-	u64int	size;
+	uint64_t	size;
 	usize	nfree;
 	usize	nblocks;
 	int	kmin;		/* Minimum lg2 */
@@ -89,7 +89,7 @@ seprintphysstats(int8_t *s,  int8_t *e)
 }
 
 static void
-xphysfree(Bal *b, uintmem data, u64int size)
+xphysfree(Bal *b, uintmem data, uint64_t size)
 {
 	uint i;
 	Buddy *l, *p;
@@ -179,7 +179,7 @@ S1:
 }
 
 void
-physfree(uintmem data, u64int size)
+physfree(uintmem data, uint64_t size)
 {
 	Bal *b;
 	int i;
@@ -244,9 +244,9 @@ static uint8_t lg2table[256] = {
 };
 
 static int
-lg2floor(u64int w)
+lg2floor(uint64_t w)
 {
-	u64int hi, lo;
+	uint64_t hi, lo;
 
 	if((lo = (w>>48)) != 0){
 		if((hi = (lo>>8)) != 0)
@@ -269,7 +269,7 @@ lg2floor(u64int w)
 }
 
 static uintmem
-xphysalloc(Bal *b, u64int size, void *tag)
+xphysalloc(Bal *b, uint64_t size, void *tag)
 {
 	uint i, j, k;
 	Buddy *l, *p;
@@ -350,7 +350,7 @@ xphysalloc(Bal *b, u64int size, void *tag)
 }
 
 uintmem
-physalloc(u64int size, int *colorp, void *tag)
+physalloc(uint64_t size, int *colorp, void *tag)
 {
 	int i, color;
 	uintmem m;
@@ -469,7 +469,7 @@ iimbchunk(Bal *b, uintmem a, uintmem e, int type)
  * Called from umeminit to initialize user memory allocators.
  */
 void
-physinit(uintmem a, u64int size)
+physinit(uintmem a, uint64_t size)
 {
 	uintmem dtsz;
 	Bal *b;

sys/src/9/k10/pmcio.c

@@ -48,7 +48,7 @@ pmcnregs(void)
 static int
 pmcuserenab(int enable)
 {
-	u64int cr4;
+	uint64_t cr4;
 
 	cr4 = cr4get();
 	if (enable){
@@ -102,9 +102,9 @@ pmctrans(PmcCtl *p)
 }
 
 static int
-getctl(PmcCtl *p, u32int regno)
+getctl(PmcCtl *p, uint32_t regno)
 {
-	u64int r, e, u;
+	uint64_t r, e, u;
 
 	r = rdmsr(regno + PerfEvtbase);
 	p->enab = (r&PeCtEna) != 0;
@@ -139,7 +139,7 @@ extern int pmcdebug;
 static int
 setctl(PmcCtl *p, int regno)
 {
-	u64int v, e, u;
+	uint64_t v, e, u;
 	int8_t *toks[2];
 	int8_t str[KNAMELEN];
 
@@ -230,14 +230,14 @@ pmcdescstr(int8_t *str, int nstr)
 	return ns;
 }
 
-static u64int
-getctr(u32int regno)
+static uint64_t
+getctr(uint32_t regno)
 {
 	return rdmsr(regno + PerfCtrbase);
 }
 
 static int
-setctr(u64int v, u32int regno)
+setctr(uint64_t v, uint32_t regno)
 {
 	wrmsr(regno + PerfCtrbase, v);
 	return 0;
@@ -325,12 +325,12 @@ shouldipi(Mach *mp)
 	return 1;
 }
 
-u64int
-pmcgetctr(u32int coreno, u32int regno)
+uint64_t
+pmcgetctr(uint32_t coreno, uint32_t regno)
 {
 	PmcCtr *p;
 	Mach *mp;
-	u64int v;
+	uint64_t v;
 
 	if(coreno == m->machno){
 		v = getctr(regno);
@@ -357,7 +357,7 @@ pmcgetctr(u32int coreno, u32int regno)
 }
 
 int
-pmcsetctr(u32int coreno, u64int v, u32int regno)
+pmcsetctr(uint32_t coreno, uint64_t v, uint32_t regno)
 {
 	PmcCtr *p;
 	Mach *mp;
@@ -400,7 +400,7 @@ ctl2ctl(PmcCtl *dctl, PmcCtl *sctl)
 }
 
 int
-pmcsetctl(u32int coreno, PmcCtl *pctl, u32int regno)
+pmcsetctl(uint32_t coreno, PmcCtl *pctl, uint32_t regno)
 {
 	PmcCtr *p;
 	Mach *mp;
@@ -421,7 +421,7 @@ pmcsetctl(u32int coreno, PmcCtl *pctl, u32int regno)
 }
 
 int
-pmcgetctl(u32int coreno, PmcCtl *pctl, u32int regno)
+pmcgetctl(uint32_t coreno, PmcCtl *pctl, uint32_t regno)
 {
 	PmcCtr *p;
 	Mach *mp;

sys/src/9/k10/sipi.c

@@ -24,9 +24,9 @@ sipi(void)
 	Apic *apic;
 	Mach *mach;
 	int apicno, i;
-	u32int *sipiptr;
+	uint32_t *sipiptr;
 	uintmem sipipa;
-	u8int *alloc, *p;
+	uint8_t *alloc, *p;
 	extern void squidboy(int);
 
 	/*

sys/src/9/k10/trap.c

@@ -611,7 +611,7 @@ expected(Ureg*, void*)
 static void
 faultamd64(Ureg* ureg, void*)
 {
-	u64int addr;
+	uint64_t addr;
 	int read, user, insyscall;
 	int8_t buf[ERRMAX];
 
@@ -675,8 +675,8 @@ userpc(Ureg* ureg)
 void
 setregisters(Ureg* ureg, int8_t* pureg, int8_t* uva, int n)
 {
-	u64int cs, flags, ss;
-	u16int ds, es, fs, gs;
+	uint64_t cs, flags, ss;
+	uint16_t ds, es, fs, gs;
 
 	ss = ureg->ss;
 	flags = ureg->flags;

sys/src/9/k10/vsvm.c

@@ -24,24 +24,24 @@
 #include "ureg.h"
 
 typedef struct Gd Gd;
-typedef u64int Sd;
-typedef u16int Ss;
+typedef uint64_t Sd;
+typedef uint16_t Ss;
 typedef struct Tss Tss;
 
 struct Gd {
 	Sd	sd;
-	u64int	hi;
+	uint64_t	hi;
 };
 
 struct Tss {
-	u32int	_0_;
-	u32int	rsp0[2];
-	u32int	rsp1[2];
-	u32int	rsp2[2];
-	u32int	_28_[2];
-	u32int	ist[14];
-	u16int	_92_[5];
-	u16int	iomap;
+	uint32_t	_0_;
+	uint32_t	rsp0[2];
+	uint32_t	rsp1[2];
+	uint32_t	rsp2[2];
+	uint32_t	_28_[2];
+	uint32_t	ist[14];
+	uint16_t	_92_[5];
+	uint16_t	iomap;
 };
 
 enum {
@@ -69,7 +69,7 @@ static Gd idt64[Nidt];
 static Gd acidt64[Nidt];	/* NIX application core IDT */
 
 static Sd
-mksd(u64int base, u64int limit, u64int bits, u64int* upper)
+mksd(uint64_t base, uint64_t limit, uint64_t bits, uint64_t* upper)
 {
 	Sd sd;
 
@@ -86,7 +86,7 @@ mksd(u64int base, u64int limit, u64int bits, u64int* upper)
 }
 
 static void
-mkgd(Gd* gd, u64int offset, Ss ss, u64int bits, int ist)
+mkgd(Gd* gd, uint64_t offset, Ss ss, uint64_t bits, int ist)
 {
 	Sd sd;
 
@@ -103,7 +103,7 @@ static void
 idtinit(Gd *gd, uintptr offset)
 {
 	int ist, v;
-	u64int dpl;
+	uint64_t dpl;
 
 	for(v = 0; v < Nidt; v++){
 		ist = 0;
@@ -158,7 +158,7 @@ void
 vsvminit(int size, int nixtype)
 {
 	Sd *sd;
-	u64int r;
+	uint64_t r;
 
 	if(m->machno == 0){
 		idtinit(idt64, PTR2UINT(idthandlers));
@@ -188,8 +188,8 @@ vsvminit(int size, int nixtype)
 	r = rdmsr(Efer);
 	r |= Sce;
 	wrmsr(Efer, r);
-	r = ((u64int)SSEL(SiU32CS, SsRPL3))<<48;
-	r |= ((u64int)SSEL(SiCS, SsRPL0))<<32;
+	r = ((uint64_t)SSEL(SiU32CS, SsRPL3))<<48;
+	r |= ((uint64_t)SSEL(SiCS, SsRPL0))<<32;
 	wrmsr(Star, r);
 	if(nixtype != NIXAC)
 		wrmsr(Lstar, PTR2UINT(syscallentry));

sys/src/9/port/devaoe.c

@@ -1737,10 +1737,10 @@ gbit16(void *a)
 	return i[1] << 8 | i[0];
 }
 
-static u32int
+static uint32_t
 gbit32(void *a)
 {
-	u32int j;
+	uint32_t j;
 	uint8_t *i;
 
 	i = a;

sys/src/9/port/devmnt.c

@@ -105,7 +105,7 @@ mntreset(void)
  * Version is not multiplexed: message sent only once per connection.
  */
 usize
-mntversion(Chan *c, u32int msize, int8_t *version, usize returnlen)
+mntversion(Chan *c, uint32_t msize, int8_t *version, usize returnlen)
 {
 	Fcall f;
 	uint8_t *msg;

sys/src/9/port/devpmc.c

@@ -219,8 +219,8 @@ pmcread(Chan *c, void *a, int32_t n, int64_t offset)
 	uint32_t type, id;
 	PmcCtl p;
 	int8_t *s;
-	u64int v;
-	u64int coreno;
+	uint64_t v;
+	uint64_t coreno;
 
 	type = PMCTYPE(c->qid.path);
 	id = PMCID(c->qid.path);
@@ -237,7 +237,7 @@ pmcread(Chan *c, void *a, int32_t n, int64_t offset)
 		free(s);
 		nexterror();
 	}
-	coreno = (u64int)c->aux;
+	coreno = (uint64_t)c->aux;
 	p.coreno = coreno;
 	switch(type){
 	case Qdata:
@@ -299,7 +299,7 @@ typedef struct AcCtrArg AcCtrArg;
 struct AcCtrArg {
 	int regno;
 	int coreno;
-	u64int v;
+	uint64_t v;
 };
 
 void
@@ -338,7 +338,7 @@ pmcwrite(Chan *c, void *a, int32_t n, int64_t)
 	int8_t str[64];	/* 0x0000000000000000\0 */
 	AcPmcArg p;
 	AcCtrArg ctr;
-	u64int coreno;
+	uint64_t coreno;
 	Mach *mp;
 
 	if (c->qid.type == QTDIR)
@@ -349,7 +349,7 @@ pmcwrite(Chan *c, void *a, int32_t n, int64_t)
 		error(Ebadctl);
 
 	pmcnull(&p);
-	coreno = (u64int)c->aux;
+	coreno = (uint64_t)c->aux;
 	p.coreno = coreno;
 	type = PMCTYPE(c->qid.path);
 	p.regno = PMCID(c->qid.path);

sys/src/9/port/devtls.c

@@ -242,10 +242,10 @@ static void	tlsPackMac(Secret *sec, uint8_t *mackey, uint8_t *seq,
 			      uint8_t *header, uint8_t *body, int len,
 			      uint8_t *mac);
 static void	put64(uint8_t *p, int64_t x);
-static void	put32(uint8_t *p, u32int);
+static void	put32(uint8_t *p, uint32_t);
 static void	put24(uint8_t *p, int);
 static void	put16(uint8_t *p, int);
-static u32int	get32(uint8_t *p);
+static uint32_t	get32(uint8_t *p);
 static int	get16(uint8_t *p);
 static void	tlsSetState(TlsRec *tr, int new, int old);
 static void	rcvAlert(TlsRec *tr, int err);
@@ -2133,7 +2133,7 @@ tlsPackMac(Secret *sec, uint8_t *mackey, uint8_t *seq, uint8_t *header,
 }
 
 static void
-put32(uint8_t *p, u32int x)
+put32(uint8_t *p, uint32_t x)
 {
 	p[0] = x>>24;
 	p[1] = x>>16;
@@ -2144,8 +2144,8 @@ put32(uint8_t *p, u32int x)
 static void
 put64(uint8_t *p, int64_t x)
 {
-	put32(p, (u32int)(x >> 32));
-	put32(p+4, (u32int)x);
+	put32(p, (uint32_t)(x >> 32));
+	put32(p+4, (uint32_t)x);
 }
 
 static void
@@ -2163,7 +2163,7 @@ put16(uint8_t *p, int x)
 	p[1] = x;
 }
 
-static u32int
+static uint32_t
 get32(uint8_t *p)
 {
 	return (p[0]<<24)|(p[1]<<16)|(p[2]<<8)|p[3];

sys/src/9/port/devtrace.c

@@ -121,7 +121,7 @@ int8_t hex[] = {
 
 /* big-endian ... */
 void
-hex8(u32int l, int8_t *c)
+hex8(uint32_t l, int8_t *c)
 {
 	int i;
 	for(i = 2; i; i--){
@@ -131,7 +131,7 @@ hex8(u32int l, int8_t *c)
 }
 
 void
-hex16(u32int l, int8_t *c)
+hex16(uint32_t l, int8_t *c)
 {
 	int i;
 	for(i = 4; i; i--){
@@ -141,7 +141,7 @@ hex16(u32int l, int8_t *c)
 }
 
 void
-hex32(u32int l, int8_t *c)
+hex32(uint32_t l, int8_t *c)
 {
 	int i;
 	for(i = 8; i; i--){
@@ -151,7 +151,7 @@ hex32(u32int l, int8_t *c)
 }
 
 void
-hex64(u64int l, int8_t *c)
+hex64(uint64_t l, int8_t *c)
 {
 	hex32(l>>32, c);
 	hex32(l, &c[8]);
@@ -169,8 +169,8 @@ logfull(void)
 	return (pw - pr) >= logsize;
 }
 
-static u64int 
-idx(u64int f)
+static uint64_t 
+idx(uint64_t f)
 {
 	return f & logmask;
 }
@@ -617,7 +617,7 @@ traceread(Chan *c, void *a, int32_t n, int64_t offset)
 				cp[0] = eventname[pl->info];
 				cp ++;
 				*cp++ = ' ';
-				hex64((u64int)pl->pc, cp);
+				hex64((uint64_t)pl->pc, cp);
 				cp[16] = ' ';
 				cp += 17;
 				hex64(pl->ticks, cp);

sys/src/9/port/sdaoe.c

@@ -85,10 +85,10 @@ gbit16(void *a)
 	return i[1] << 8 | i[0];
 }
 
-static u32int
+static uint32_t
 gbit32(void *a)
 {
-	u32int j;
+	uint32_t j;
 	uint8_t *i;
 
 	i = a;

sys/src/9/port/segment.c

@@ -30,7 +30,7 @@ segppn(Segment *s, uintmem pa)
  * if base is aligned to 1G and size is >= 1G and we support 1G pages.
  */
 Segment *
-newseg(int type, uintptr base, u64int size)
+newseg(int type, uintptr base, uint64_t size)
 {
 	Segment *s;
 	int mapsize;

sys/src/9/port/sysauth.c

@@ -34,7 +34,7 @@ sysfversion(Ar0* ar0, va_list list)
 	Chan *c;
 	int8_t *version;
 	int fd;
-	u32int msize;
+	uint32_t msize;
 	usize nversion;
 
 	/*
@@ -43,7 +43,7 @@ sysfversion(Ar0* ar0, va_list list)
 	 * usize fversion(int fd, u32int msize, char *version, usize nversion);
 	 */
 	fd = va_arg(list, int);
-	msize = va_arg(list, u32int);
+	msize = va_arg(list, uint32_t);
 	version = va_arg(list, int8_t*);
 	nversion = va_arg(list, usize);
 	version = validaddr(version, nversion, 1);

sys/src/9/port/tcklock.c

@@ -124,22 +124,22 @@ lockloop(Lock *l, uintptr pc)
 		dumpaproc(p);
 }
 
-static u32int
-getuser(u32int key)
+static uint32_t
+getuser(uint32_t key)
 {
 	return key & 0xFFFF;
 }
 
-static u32int
-getticket(u32int key)
+static uint32_t
+getticket(uint32_t key)
 {
 	return (key>>16) & 0xFFFF;
 }
 
-static u32int
-incuser(u32int *key)
+static uint32_t
+incuser(uint32_t *key)
 {
-	u32int old, new;
+	uint32_t old, new;
 
 	do{
 		old = *key;
@@ -148,10 +148,10 @@ incuser(u32int *key)
 	return getuser(new);
 }
 
-static u32int
-incticket(u32int *key)
+static uint32_t
+incticket(uint32_t *key)
 {
-	u32int old, new;
+	uint32_t old, new;
 
 	do{
 		old = *key;
@@ -161,8 +161,8 @@ incticket(u32int *key)
 	return getticket(new);
 }
 
-static u32int
-myticket(u32int user)
+static uint32_t
+myticket(uint32_t user)
 {
 	return (user-1) & 0xFFFF;
 }
@@ -172,7 +172,7 @@ lock(Lock *l)
 {
 	int i;
 	uintptr pc;
-	u32int user;
+	uint32_t user;
 	uint64_t t0;
 
 	pc = getcallerpc(&l);
@@ -221,7 +221,7 @@ ilock(Lock *l)
 	Mpl pl;
 	uintptr pc;
 	uint64_t t0;
-	u32int user;
+	uint32_t user;
 
 	pc = getcallerpc(&l);
 	lockstats.locks++;

sys/src/9/root/big.c

@@ -15,7 +15,7 @@ main(int argc, int8_t *argv[])
 {
 	uint32_t num = 1;
 	uint64_t size;
-	u8int *c;
+	uint8_t *c;
 
 	if (argc > 1)
 		num = strtoul(argv[1], 0, 0);

sys/src/9/root/blow.c

@@ -82,13 +82,13 @@ enum {
  */
 typedef struct Tpkt Tpkt;
 struct Tpkt {
-	u8int	sk;				/* Skip Checksum Control */
-	u8int	hint;				/* Hint|Dp|Pid0 */
-	u8int	size;				/* Size|Pid1|Dm|Dy|VC */
-	u8int	dst[N];				/* Destination Coordinates */
-	u8int	_6_[2];				/* reserved */
-	u8int	_8_[8];				/* protocol header */
-	u8int	payload[];
+	uint8_t	sk;				/* Skip Checksum Control */
+	uint8_t	hint;				/* Hint|Dp|Pid0 */
+	uint8_t	size;				/* Size|Pid1|Dm|Dy|VC */
+	uint8_t	dst[N];				/* Destination Coordinates */
+	uint8_t	_6_[2];				/* reserved */
+	uint8_t	_8_[8];				/* protocol header */
+	uint8_t	payload[];
 };
 
 /*
@@ -123,7 +123,7 @@ enum {
 };
 
 static int
-torusparse(u8int d[3], int8_t* item, int8_t* buf)
+torusparse(uint8_t d[3], int8_t* item, int8_t* buf)
 {
 	int n;
 	int8_t *p;

sys/src/9/root/suck.c

@@ -82,13 +82,13 @@ enum {
  */
 typedef struct Tpkt Tpkt;
 struct Tpkt {
-	u8int	sk;				/* Skip Checksum Control */
-	u8int	hint;				/* Hint|Dp|Pid0 */
-	u8int	size;				/* Size|Pid1|Dm|Dy|VC */
-	u8int	dst[N];				/* Destination Coordinates */
-	u8int	_6_[2];				/* reserved */
-	u8int	_8_[8];				/* protocol header */
-	u8int	payload[];
+	uint8_t	sk;				/* Skip Checksum Control */
+	uint8_t	hint;				/* Hint|Dp|Pid0 */
+	uint8_t	size;				/* Size|Pid1|Dm|Dy|VC */
+	uint8_t	dst[N];				/* Destination Coordinates */
+	uint8_t	_6_[2];				/* reserved */
+	uint8_t	_8_[8];				/* protocol header */
+	uint8_t	payload[];
 };
 
 /*
@@ -123,7 +123,7 @@ enum {
 };
 
 static int
-torusparse(u8int d[3], int8_t* item, int8_t* buf)
+torusparse(uint8_t d[3], int8_t* item, int8_t* buf)
 {
 	int n;
 	int8_t *p;

sys/src/9/test/1/main.c

@@ -256,7 +256,7 @@ HERE(void)
 }
 
 void
-main(u32int ax, u32int bx)
+main(uint32_t ax, uint32_t bx)
 {
 	int64_t hz;
 

sys/src/9/w/pxeload/conf.c

@@ -257,7 +257,7 @@ readlsconf(void)
 	int i, n;
 	uint8_t *p;
 	MMap *map;
-	u64int addr, len;
+	uint64_t addr, len;
 
 	p = (uint8_t*)ROUND((uint32_t)end, BY2PG);
 	for(n = 0; n < 20; n++){
@@ -302,8 +302,8 @@ readlsconf(void)
 					print("ACPI NVS Memory");
 				break;
 			}
-			addr = (((u64int)map->base[1])<<32)|map->base[0];
-			len = (((u64int)map->length[1])<<32)|map->length[0];
+			addr = (((uint64_t)map->base[1])<<32)|map->base[0];
+			len = (((uint64_t)map->length[1])<<32)|map->length[0];
 			if(vflag)
 				print("\n\t0x%16.16lluX 0x%16.16lluX (%llud)\n",
 					addr, addr+len, len);

sys/src/9/w/pxeload/ether8169.c

@@ -178,10 +178,10 @@ enum {					/* Cplusc */
 
 typedef struct D D;			/* Transmit/Receive Descriptor */
 struct D {
-	u32int	control;
-	u32int	vlan;
-	u32int	addrlo;
-	u32int	addrhi;
+	uint32_t	control;
+	uint32_t	vlan;
+	uint32_t	addrlo;
+	uint32_t	addrhi;
 };
 
 enum {					/* Transmit Descriptor control */
@@ -230,19 +230,19 @@ enum {					/* Ring sizes  (<= 1024) */
 
 typedef struct Dtcc Dtcc;
 struct Dtcc {
-	u64int	txok;
-	u64int	rxok;
-	u64int	txer;
-	u32int	rxer;
-	u16int	misspkt;
-	u16int	fae;
-	u32int	tx1col;
-	u32int	txmcol;
-	u64int	rxokph;
-	u64int	rxokbrd;
-	u32int	rxokmu;
-	u16int	txabt;
-	u16int	txundrn;
+	uint64_t	txok;
+	uint64_t	rxok;
+	uint64_t	txer;
+	uint32_t	rxer;
+	uint16_t	misspkt;
+	uint16_t	fae;
+	uint32_t	tx1col;
+	uint32_t	txmcol;
+	uint64_t	rxokph;
+	uint64_t	rxokbrd;
+	uint32_t	rxokmu;
+	uint16_t	txabt;
+	uint16_t	txundrn;
 };
 
 enum {						/* Variants */
@@ -416,7 +416,7 @@ rtl8169halt(Ctlr* ctlr)
 static int
 rtl8169reset(Ctlr* ctlr)
 {
-	u32int r;
+	uint32_t r;
 	int timeo;
 
 	/*
@@ -472,9 +472,9 @@ rtl8169replenish(Ctlr* ctlr)
 static int
 rtl8169init(Ether* edev)
 {
-	u32int r;
+	uint32_t r;
 	Ctlr *ctlr;
-	u8int cplusc;
+	uint8_t cplusc;
 
 	ctlr = edev->ctlr;
 	ilock(&ctlr->ilock);
@@ -739,7 +739,7 @@ rtl8169receive(Ether* edev)
 	D *d;
 	int len, rdh;
 	Ctlr *ctlr;
-	u32int control;
+	uint32_t control;
 	RingBuf *ring;
 
 	ctlr = edev->ctlr;
@@ -784,7 +784,7 @@ rtl8169interrupt(Ureg*, void* arg)
 {
 	Ctlr *ctlr;
 	Ether *edev;
-	u32int isr;
+	uint32_t isr;
 
 	edev = arg;
 	ctlr = edev->ctlr;
@@ -831,7 +831,7 @@ rtl8169pci(void)
 	Pcidev *p;
 	Ctlr *ctlr;
 	int i, port;
-	u32int bar;
+	uint32_t bar;
 
 	p = nil;
 	while(p = pcimatch(p, 0, 0)){
@@ -900,7 +900,7 @@ rtl8169pci(void)
 int
 rtl8169pnp(Ether* edev)
 {
-	u32int r;
+	uint32_t r;
 	Ctlr *ctlr;
 
 	if(rtl8169ctlrhead == nil)

sys/src/9/w/pxeload/ether82563.c

@@ -454,7 +454,7 @@ struct Ctlr {
 	uint8_t	ra[Eaddrlen];		/* receive address */
 	int	type;
 
-	u32int*	nic;
+	uint32_t*	nic;
 	Lock	imlock;
 	int	im;			/* interrupt mask */
 
@@ -720,7 +720,7 @@ static void
 i82563init(Ether* edev)
 {
 	Ctlr *ctlr;
-	u32int r, rctl;
+	uint32_t r, rctl;
 
 	ctlr = edev->ctlr;
 

sys/src/9/w/pxeload/etherbcm4401.c

@@ -210,8 +210,8 @@ enum {						/* SBtshi */
 // have to malloc that even though we don't use it all.
 // descriptors are only ever read by the nic, not written back.
 typedef struct {
-	u32int	control;
-	u32int	address;
+	uint32_t	control;
+	uint32_t	address;
 } DD;
 
 enum {						/* DD.control */
@@ -230,9 +230,9 @@ enum {						/* DD.control */
 // 28 and the offset is usually set to 30?
 // bollocks. it looks to me like the status written is 28 bytes.
 typedef struct {
-	u32int	status;
-	u32int	undefined;
-	u32int	pad[5];
+	uint32_t	status;
+	uint32_t	undefined;
+	uint32_t	pad[5];
 
 	void*	bp;				/* software */
 
@@ -268,7 +268,7 @@ enum {
 
 typedef struct Ctlr Ctlr;
 typedef struct Ctlr {
-	u32int	port;
+	uint32_t	port;
 	Pcidev*	pcidev;
 	Ctlr*	next;
 	int	active;
@@ -280,8 +280,8 @@ typedef struct Ctlr {
 	QLock	alock;				/* attach */
 	void*	alloc;				/*  */
 
-	u32int	im;
-	u32int	rcr;
+	uint32_t	im;
+	uint32_t	rcr;
 
 	Lock	tlock;				/* transmit */
 	DD*	td;				/* descriptor ring */
@@ -318,12 +318,12 @@ typedef struct Ctlr {
 	uint	mib[Nmib];
 } Ctlr;
 
-#define csr8r(c, r)	(*((u8int*)((c)->nic)+(r)))
-#define csr16r(c, r)	(*((u16int*)((c)->nic)+((r)/2)))
-#define csr32p(c, r)	((u32int*)((c)->nic)+((r)/4))
+#define csr8r(c, r)	(*((uint8_t*)((c)->nic)+(r)))
+#define csr16r(c, r)	(*((uint16_t*)((c)->nic)+((r)/2)))
+#define csr32p(c, r)	((uint32_t*)((c)->nic)+((r)/4))
 #define csr32r(c, r)	(*csr32p(c, r))
 #define csr32w(c, r, v)	(*csr32p(c, r) = (v))
-#define csr32a(c, r)	{ u32int dummy = csr32r(c, r); USED(dummy);}
+#define csr32a(c, r)	{ uint32_t dummy = csr32r(c, r); USED(dummy);}
 // hmmm. maybe we need a csr32wrb instead, write and read back?
 
 static Ctlr* bcm4401ctlrhead;
@@ -393,11 +393,11 @@ static void
 bcm4401mib(Ctlr* ctlr, uint* mib)
 {
 	int i;
-	u32int r;
+	uint32_t r;
 
 	csr32w(ctlr, MIBctl, MIBcor);
 	for(i = 0; i < Nmib; i++){
-		r = csr32r(ctlr, MIB+i*sizeof(u32int));
+		r = csr32r(ctlr, MIB+i*sizeof(uint32_t));
 		if(mib == nil)
 			continue;
 		if(statistics[i] != nil)
@@ -444,7 +444,7 @@ bcm4401ifstat(Ether* edev, void* a, int32_t n, uint32_t offset)
 static void
 _bcm4401promiscuous(Ctlr* ctlr, int on)
 {
-	u32int r;
+	uint32_t r;
 
 	r = csr32r(ctlr, CAMctl);
 	if(on){
@@ -603,7 +603,7 @@ bcm4401receive(Ether* edev)
 	uint8_t *p;
 	int len, rdh, rdt, s;
 	Ctlr *ctlr;
-	u32int status;
+	uint32_t status;
 	RingBuf *ring;
 
 	ctlr = edev->ctlr;
@@ -651,7 +651,7 @@ bcm4401interrupt(Ureg*, void* arg)
 {
 	Ctlr *ctlr;
 	Ether *edev;
-	u32int im, is;
+	uint32_t im, is;
 
 	edev = arg;
 	ctlr = edev->ctlr;
@@ -711,7 +711,7 @@ bcm4401cam(Ctlr* ctlr, int cvix, uint8_t* a)
 static void
 bcm4401sbreset(Ctlr* ctlr)
 {
-	u32int bar0, r;
+	uint32_t bar0, r;
 
 	/*
 	 * If the core is running, stop it.
@@ -811,7 +811,7 @@ bcm4401detach(Ctlr* ctlr)
 static int
 bcm4401init(Ctlr* ctlr)
 {
-	u32int r;
+	uint32_t r;
 
 	// Clear the stats on reset.
 	bcm4401mib(ctlr, nil);
@@ -869,7 +869,7 @@ bcm4401init(Ctlr* ctlr)
 static int
 bcm4401miimir(Mii* mii, int pa, int ra)
 {
-	u32int r;
+	uint32_t r;
 	int timeo;
 	Ctlr *ctlr;
 
@@ -891,7 +891,7 @@ bcm4401miimir(Mii* mii, int pa, int ra)
 static int
 bcm4401miimiw(Mii* mii, int pa, int ra, int data)
 {
-	u32int r;
+	uint32_t r;
 	int timeo;
 	Ctlr *ctlr;
 
@@ -914,7 +914,7 @@ static int
 bcm4401reset(Ctlr* ctlr)
 {
 	int i;
-	u32int r;
+	uint32_t r;
 	MiiPhy *phy;
 	uint8_t ea[Eaddrlen];
 
@@ -1007,7 +1007,7 @@ bcm4401pci(void)
 	Pcidev *p;
 	Ctlr *ctlr;
 	int i, port;
-	u32int bar;
+	uint32_t bar;
 
 	p = nil;
 	while(p = pcimatch(p, 0, 0)){

sys/src/9/w/pxeload/ethervgbe.c

@@ -958,7 +958,7 @@ vgbepci(void)
 	Pcidev *p;
 	Ctlr *ctlr;
 	int i, port;
-	u32int bar;
+	uint32_t bar;
 
 	p = nil;
 	while(p = pcimatch(p, 0, 0)){

sys/src/9/w/pxeload/load.c

@@ -21,8 +21,8 @@ Mach* m;
 uint32_t* mach0pdb;
 Mach* mach0m;
 Segdesc* mach0gdt;
-u32int memstart;
-u32int memend;
+uint32_t memstart;
+uint32_t memend;
 
 int vflag = 0;
 int debug = 0;

sys/src/9/w/pxeload/memory.c

@@ -277,19 +277,19 @@ umbscan(void)
 
 
 void
-meminit(u32int)
+meminit(uint32_t)
 {
 	MMap *map;
-	u32int modend;
-	u64int addr, last, len;
+	uint32_t modend;
+	uint64_t addr, last, len;
 
 	umbscan();
 
 	modend = PADDR(memstart);
 	last = 0;
 	for(map = mmap; map < &mmap[nmmap]; map++){
-		addr = (((u64int)map->base[1])<<32)|map->base[0];
-		len = (((u64int)map->length[1])<<32)|map->length[0];
+		addr = (((uint64_t)map->base[1])<<32)|map->base[0];
+		len = (((uint64_t)map->length[1])<<32)|map->length[0];
 
 		switch(map->type){
 		default:

sys/src/cmd/disk/mbr.c

@@ -80,7 +80,7 @@ fatal(int8_t *fmt, ...)
 }
 
 static void
-putle32(void* v, u32int i)
+putle32(void* v, uint32_t i)
 {
 	uint8_t *p;
 
@@ -112,7 +112,8 @@ writechs(Disk *disk, uint8_t *p, int64_t lba)
 }
 
 static void
-wrtentry(Disk *disk, Tentry *tp, int type, u32int base, u32int lba, u32int end)
+wrtentry(Disk *disk, Tentry *tp, int type, uint32_t base, uint32_t lba,
+	 uint32_t end)
 {
 	tp->active = 0x80;		/* make this sole partition active */
 	tp->type = type;

sys/src/cmd/disk/prep/fdisk.c

@@ -277,8 +277,8 @@ struct Dospart {
 	Part;
 	Tentry;
 
-	u32int	lba;
-	u32int	size;
+	uint32_t	lba;
+	uint32_t	size;
 	int		primary;
 };
 
@@ -355,7 +355,7 @@ typestr0(int type)
 	return types[type].desc;
 }
 
-static u32int
+static uint32_t
 getle32(void* v)
 {
 	uint8_t *p;
@@ -365,7 +365,7 @@ getle32(void* v)
 }
 
 static void
-putle32(void* v, u32int i)
+putle32(void* v, uint32_t i)
 {
 	uint8_t *p;
 
@@ -377,7 +377,7 @@ putle32(void* v, u32int i)
 }
 
 static void
-diskread(Disk *disk, void *data, int ndata, u32int sec, u32int off)
+diskread(Disk *disk, void *data, int ndata, uint32_t sec, uint32_t off)
 {
 	if(seek(disk->fd, (int64_t)sec*disk->secsize+off, 0) != (int64_t)sec*disk->secsize+off)
 		sysfatal("diskread seek %lud.%lud: %r", (uint32_t)sec,
@@ -388,7 +388,7 @@ diskread(Disk *disk, void *data, int ndata, u32int sec, u32int off)
 }
 
 static int
-diskwrite(Disk *disk, void *data, int ndata, u32int sec, u32int off)
+diskwrite(Disk *disk, void *data, int ndata, uint32_t sec, uint32_t off)
 {
 	written = 1;
 	if(seek(disk->wfd, (int64_t)sec*disk->secsize+off, 0) != (int64_t)sec*disk->secsize+off)
@@ -1008,7 +1008,8 @@ writechs(Disk *disk, uint8_t *p, int64_t lba)
 }
 
 static void
-wrtentry(Disk *disk, Tentry *tp, int type, u32int xbase, u32int lba, u32int end)
+wrtentry(Disk *disk, Tentry *tp, int type, uint32_t xbase, uint32_t lba,
+	 uint32_t end)
 {
 	tp->type = type;
 	writechs(disk, &tp->starth, lba);

sys/src/cmd/fossil/9fid.c

@@ -183,7 +183,7 @@ fidUnHash(Fid* fid)
 }
 
 Fid*
-fidGet(Con* con, u32int fidno, int flags)
+fidGet(Con* con, uint32_t fidno, int flags)
 {
 	Fid *fid, **hash;
 
@@ -293,7 +293,7 @@ void
 fidClunkAll(Con* con)
 {
 	Fid *fid;
-	u32int fidno;
+	uint32_t fidno;
 
 	vtLock(con->fidlock);
 	while(con->fhead != nil){

sys/src/cmd/fossil/9fsys.c

@@ -943,7 +943,7 @@ fsysClrp(Fsys* fsys, int argc, int8_t* argv[])
 }
 
 static int
-fsysEsearch1(File* f, int8_t* s, u32int elo)
+fsysEsearch1(File* f, int8_t* s, uint32_t elo)
 {
 	int n, r;
 	DirEntry de;
@@ -998,7 +998,7 @@ fsysEsearch1(File* f, int8_t* s, u32int elo)
 }
 
 static int
-fsysEsearch(Fs* fs, int8_t* path, u32int elo)
+fsysEsearch(Fs* fs, int8_t* path, uint32_t elo)
 {
 	int n;
 	File *f;
@@ -1321,7 +1321,7 @@ fsckClri(Fsck *fsck, int8_t *name, MetaBlock *mb, int i, Block *b)
 }
 
 static void
-fsckClose(Fsck *fsck, Block *b, u32int epoch)
+fsckClose(Fsck *fsck, Block *b, uint32_t epoch)
 {
 	Label l;
 

sys/src/cmd/fossil/9ping.c

@@ -12,14 +12,14 @@
 
 typedef uint64_t u64int;
 
-#define TWID64	((u64int)~(u64int)0)
+#define TWID64	((uint64_t)~(uint64_t)0)
 
 
-u64int
+uint64_t
 unittoull(int8_t *s)
 {
 	int8_t *es;
-	u64int n;
+	uint64_t n;
 
 	if(s == nil)
 		return TWID64;

sys/src/cmd/fossil/9proc.c

@@ -38,7 +38,7 @@ static struct {
 	int	nproc;
 	int	nprocstarve;
 
-	u32int	msize;			/* immutable */
+	uint32_t	msize;			/* immutable */
 } mbox;
 
 static struct {
@@ -54,7 +54,7 @@ static struct {
 	int	ncon;
 	int	nconstarve;
 
-	u32int	msize;
+	uint32_t	msize;
 } cbox;
 
 static void

sys/src/cmd/fossil/9user.c

@@ -68,11 +68,11 @@ int8_t* uidadm = "adm";
 int8_t* unamenone = "none";
 int8_t* uidnoworld = "noworld";
 
-static u32int
+static uint32_t
 userHash(int8_t* s)
 {
 	uint8_t *p;
-	u32int hash;
+	uint32_t hash;
 
 	hash = 0;
 	for(p = (uint8_t*)s; *p != '\0'; p++)

sys/src/cmd/fossil/archive.c

@@ -154,7 +154,7 @@ etype(Entry *e)
 }
 
 static uint8_t*
-copyBlock(Block *b, u32int blockSize)
+copyBlock(Block *b, uint32_t blockSize)
 {
 	uint8_t *data;
 
@@ -184,7 +184,7 @@ enum
 	ArchFaked,
 };
 static int
-archWalk(Param *p, u32int addr, uint8_t type, u32int tag)
+archWalk(Param *p, uint32_t addr, uint8_t type, uint32_t tag)
 {
 	int ret, i, x, psize, dsize;
 	uint8_t *data, score[VtScoreSize];
@@ -354,7 +354,7 @@ archThread(void *v)
 	Param p;
 	Super super;
 	int ret;
-	u32int addr;
+	uint32_t addr;
 	uint8_t rbuf[VtRootSize];
 	VtRoot root;
 

sys/src/cmd/fossil/cache.c

@@ -38,20 +38,20 @@ struct Cache
 	int	size;			/* block size */
 	int	ndmap;		/* size of per-block dirty pointer map used in blockWrite */
 	VtSession *z;
-	u32int	now;			/* ticks for usage timestamps */
+	uint32_t	now;			/* ticks for usage timestamps */
 	Block	**heads;		/* hash table for finding address */
 	int	nheap;			/* number of available victims */
 	Block	**heap;			/* heap for locating victims */
 	int32_t	nblocks;		/* number of blocks allocated */
 	Block	*blocks;		/* array of block descriptors */
-	u8int	*mem;			/* memory for all block data & blists */
+	uint8_t	*mem;			/* memory for all block data & blists */
 
 	BList	*blfree;
 	VtRendez *blrend;
 
 	int 	ndirty;			/* number of dirty blocks in the cache */
 	int 	maxdirty;		/* max number of dirty blocks */
-	u32int	vers;
+	uint32_t	vers;
 
 	int32_t hashSize;
 
@@ -80,11 +80,11 @@ struct Cache
 
 struct BList {
 	int part;
-	u32int addr;
+	uint32_t addr;
 	uint8_t type;
-	u32int tag;
-	u32int epoch;
-	u32int vers;
+	uint32_t tag;
+	uint32_t epoch;
+	uint32_t vers;
 
 	int recurse;	/* for block unlink */
 
@@ -99,19 +99,19 @@ struct BList {
 
 struct BAddr {
 	int part;
-	u32int addr;
-	u32int vers;
+	uint32_t addr;
+	uint32_t vers;
 };
 
 struct FreeList {
 	VtLock *lk;
-	u32int last;		/* last block allocated */
-	u32int end;		/* end of data partition */
-	u32int nused;		/* number of used blocks */
-	u32int epochLow;	/* low epoch when last updated nused */
+	uint32_t last;		/* last block allocated */
+	uint32_t end;		/* end of data partition */
+	uint32_t nused;		/* number of used blocks */
+	uint32_t epochLow;	/* low epoch when last updated nused */
 };
 
-static FreeList *flAlloc(u32int end);
+static FreeList *flAlloc(uint32_t end);
 static void flFree(FreeList *fl);
 
 static Block *cacheBumpBlock(Cache *c);
@@ -159,7 +159,7 @@ cacheAlloc(Disk *disk, VtSession *z, uint32_t nblocks, int mode)
 	Cache *c;
 	Block *b;
 	BList *bl;
-	u8int *p;
+	uint8_t *p;
 	int nbl;
 
 	c = vtMemAllocZ(sizeof(Cache));
@@ -296,7 +296,7 @@ cacheDump(Cache *c)
 static void
 cacheCheck(Cache *c)
 {
-	u32int size, now;
+	uint32_t size, now;
 	int i, k, refed;
 	static uint8_t zero[VtScoreSize];
 	Block *b;
@@ -409,7 +409,7 @@ if(0)fprint(2, "%s: dropping %d:%x:%V\n", argv0, b->part, b->addr, b->score);
  * look for a particular version of the block in the memory cache.
  */
 static Block *
-_cacheLocalLookup(Cache *c, int part, u32int addr, u32int vers,
+_cacheLocalLookup(Cache *c, int part, uint32_t addr, uint32_t vers,
 	int waitlock, int *lockfailure)
 {
 	Block *b;
@@ -476,7 +476,7 @@ _cacheLocalLookup(Cache *c, int part, u32int addr, u32int vers,
 	/* NOT REACHED */
 }
 static Block*
-cacheLocalLookup(Cache *c, int part, u32int addr, u32int vers)
+cacheLocalLookup(Cache *c, int part, uint32_t addr, uint32_t vers)
 {
 	return _cacheLocalLookup(c, part, addr, vers, Waitlock, 0);
 }
@@ -487,7 +487,7 @@ cacheLocalLookup(Cache *c, int part, u32int addr, u32int vers)
  * if it's not there, load it, bumping some other block.
  */
 Block *
-_cacheLocal(Cache *c, int part, u32int addr, int mode, u32int epoch)
+_cacheLocal(Cache *c, int part, uint32_t addr, int mode, uint32_t epoch)
 {
 	Block *b;
 	uint32_t h;
@@ -595,7 +595,7 @@ fprint(2, "%s: _cacheLocal want epoch %ud got %ud\n", argv0, epoch, b->l.epoch);
 }
 
 Block *
-cacheLocal(Cache *c, int part, u32int addr, int mode)
+cacheLocal(Cache *c, int part, uint32_t addr, int mode)
 {
 	return _cacheLocal(c, part, addr, mode, 0);
 }
@@ -606,7 +606,8 @@ cacheLocal(Cache *c, int part, u32int addr, int mode)
  * check tag and type.
  */
 Block *
-cacheLocalData(Cache *c, u32int addr, int type, u32int tag, int mode, u32int epoch)
+cacheLocalData(Cache *c, uint32_t addr, int type, uint32_t tag, int mode,
+	       uint32_t epoch)
 {
 	Block *b;
 
@@ -630,13 +631,13 @@ cacheLocalData(Cache *c, u32int addr, int type, u32int tag, int mode, u32int epo
  * check tag and type if it's really a local block in disguise.
  */
 Block *
-cacheGlobal(Cache *c, uint8_t score[VtScoreSize], int type, u32int tag,
+cacheGlobal(Cache *c, uint8_t score[VtScoreSize], int type, uint32_t tag,
 	    int mode)
 {
 	int n;
 	Block *b;
 	uint32_t h;
-	u32int addr;
+	uint32_t addr;
 
 	addr = globalToLocal(score);
 	if(addr != NilBlock){
@@ -646,7 +647,7 @@ cacheGlobal(Cache *c, uint8_t score[VtScoreSize], int type, u32int tag,
 		return b;
 	}
 
-	h = (u32int)(score[0]|(score[1]<<8)|(score[2]<<16)|(score[3]<<24)) % c->hashSize;
+	h = (uint32_t)(score[0]|(score[1]<<8)|(score[2]<<16)|(score[3]<<24)) % c->hashSize;
 
 	/*
 	 * look for the block in the cache
@@ -718,13 +719,14 @@ if(0)fprint(2, "%s: cacheGlobal %V %d\n", argv0, score, type);
  * allocate a new on-disk block and load it into the memory cache.
  * BUG: if the disk is full, should we flush some of it to Venti?
  */
-static u32int lastAlloc;
+static uint32_t lastAlloc;
 
 Block *
-cacheAllocBlock(Cache *c, int type, u32int tag, u32int epoch, u32int epochLow)
+cacheAllocBlock(Cache *c, int type, uint32_t tag, uint32_t epoch,
+		uint32_t epochLow)
 {
 	FreeList *fl;
-	u32int addr;
+	uint32_t addr;
 	Block *b;
 	int n, nwrap;
 	Label lab;
@@ -790,7 +792,7 @@ assert(b->iostate == BioLabel || b->iostate == BioClean);
 	lab.tag = tag;
 	lab.state = BsAlloc;
 	lab.epoch = epoch;
-	lab.epochClose = ~(u32int)0;
+	lab.epochClose = ~(uint32_t)0;
 	if(!blockSetLabel(b, &lab, 1)){
 		fprint(2, "%s: cacheAllocBlock: xxx4 %R\n", argv0);
 		blockPut(b);
@@ -814,10 +816,11 @@ cacheDirty(Cache *c)
 }
 
 void
-cacheCountUsed(Cache *c, u32int epochLow, u32int *used, u32int *total, u32int *bsize)
+cacheCountUsed(Cache *c, uint32_t epochLow, uint32_t *used, uint32_t *total,
+	       uint32_t *bsize)
 {
 	int n;
-	u32int addr, nused;
+	uint32_t addr, nused;
 	Block *b;
 	Label lab;
 	FreeList *fl;
@@ -865,7 +868,7 @@ cacheCountUsed(Cache *c, u32int epochLow, u32int *used, u32int *total, u32int *b
 }
 
 static FreeList *
-flAlloc(u32int end)
+flAlloc(uint32_t end)
 {
 	FreeList *fl;
 
@@ -883,7 +886,7 @@ flFree(FreeList *fl)
 	vtMemFree(fl);
 }
 
-u32int
+uint32_t
 cacheLocalSize(Cache *c, int part)
 {
 	return diskSize(c->disk, part);
@@ -971,7 +974,7 @@ _blockSetLabel(Block *b, Label *l)
 {
 	int lpb;
 	Block *bb;
-	u32int a;
+	uint32_t a;
 	Cache *c;
 
 	c = b->c;
@@ -1127,7 +1130,7 @@ blockDirty(Block *b)
 uint8_t *
 blockRollback(Block *b, uint8_t *buf)
 {
-	u32int addr;
+	uint32_t addr;
 	BList *p;
 	Super super;
 
@@ -1400,7 +1403,7 @@ if(0) fprint(2, "%s: iostate part=%d addr=%x %s->%s\n", argv0, b->part, b->addr,
  * the copy gets written out.
  */
 Block*
-blockCopy(Block *b, u32int tag, u32int ehi, u32int elo)
+blockCopy(Block *b, uint32_t tag, uint32_t ehi, uint32_t elo)
 {
 	Block *bb, *lb;
 	Label l;
@@ -1459,7 +1462,8 @@ blockCopy(Block *b, u32int tag, u32int ehi, u32int elo)
  * If b depends on bb, it doesn't anymore, so we remove bb from the prior list.
  */
 void
-blockRemoveLink(Block *b, u32int addr, int type, u32int tag, int recurse)
+blockRemoveLink(Block *b, uint32_t addr, int type, uint32_t tag,
+		int recurse)
 {
 	BList *p, **pp, bl;
 	
@@ -1512,7 +1516,7 @@ static void
 doRemoveLink(Cache *c, BList *p)
 {
 	int i, n, recurse;
-	u32int a;
+	uint32_t a;
 	Block *b;
 	Label l;
 	BList bl;
@@ -1753,7 +1757,7 @@ scoreFmt(Fmt *f)
 {
 	uint8_t *v;
 	int i;
-	u32int addr;
+	uint32_t addr;
 
 	v = va_arg(f->args, uint8_t*);
 	if(v == nil){
@@ -1772,7 +1776,7 @@ static int
 upHeap(int i, Block *b)
 {
 	Block *bb;
-	u32int now;
+	uint32_t now;
 	int p;
 	Cache *c;
 
@@ -1796,7 +1800,7 @@ static int
 downHeap(int i, Block *b)
 {
 	Block *bb;
-	u32int now;
+	uint32_t now;
 	int k;
 	Cache *c;
 
@@ -1860,11 +1864,11 @@ heapIns(Block *b)
  * Get just the label for a block.
  */
 int
-readLabel(Cache *c, Label *l, u32int addr)
+readLabel(Cache *c, Label *l, uint32_t addr)
 {
 	int lpb;
 	Block *b;
-	u32int a;
+	uint32_t a;
 
 	lpb = c->size / LabelSize;
 	a = addr / lpb;

sys/src/cmd/fossil/check.c

@@ -14,15 +14,15 @@
 static void	checkDirs(Fsck*);
 static void	checkEpochs(Fsck*);
 static void	checkLeak(Fsck*);
-static void	closenop(Fsck*, Block*, u32int);
+static void	closenop(Fsck*, Block*, uint32_t);
 static void	clrenop(Fsck*, Block*, int);
 static void	clrinop(Fsck*, int8_t*, MetaBlock*, int, Block*);
 static void	error(Fsck*, int8_t*, ...);
-static int	getBit(uint8_t*, u32int);
+static int	getBit(uint8_t*, uint32_t);
 static int	printnop(int8_t*, ...);
-static void	setBit(uint8_t*, u32int);
+static void	setBit(uint8_t*, uint32_t);
 static int	walkEpoch(Fsck *chk, Block *b, uint8_t score[VtScoreSize],
-			int type, u32int tag, u32int epoch);
+			int type, uint32_t tag, uint32_t epoch);
 static void	warn(Fsck*, int8_t*, ...);
 
 #pragma varargck argpos error 2
@@ -83,7 +83,7 @@ fsCheck(Fsck *chk)
 	vtMemFree(chk->smap);
 }
 
-static void checkEpoch(Fsck*, u32int);
+static void checkEpoch(Fsck*, uint32_t);
 
 /*
  * Walk through all the blocks in the write buffer.
@@ -92,7 +92,7 @@ static void checkEpoch(Fsck*, u32int);
 static void
 checkEpochs(Fsck *chk)
 {
-	u32int e;
+	uint32_t e;
 	uint nb;
 
 	nb = chk->nblocks;
@@ -114,9 +114,9 @@ checkEpochs(Fsck *chk)
 }
 
 static void
-checkEpoch(Fsck *chk, u32int epoch)
+checkEpoch(Fsck *chk, uint32_t epoch)
 {
-	u32int a;
+	uint32_t a;
 	Block *b;
 	Entry e;
 	Label l;
@@ -177,11 +177,11 @@ checkEpoch(Fsck *chk, u32int epoch)
  */
 static int
 walkEpoch(Fsck *chk, Block *b, uint8_t score[VtScoreSize], int type,
-	  u32int tag,
-	u32int epoch)
+	  uint32_t tag,
+	uint32_t epoch)
 {
 	int i, ret;
-	u32int addr, ep;
+	uint32_t addr, ep;
 	Block *bb;
 	Entry e;
 
@@ -361,7 +361,7 @@ Exit:
 static void
 checkLeak(Fsck *chk)
 {
-	u32int a, nfree, nlost;
+	uint32_t a, nfree, nlost;
 	Block *b;
 	Label l;
 
@@ -411,8 +411,8 @@ checkLeak(Fsck *chk)
  * Check that all sources in the tree are accessible.
  */
 static Source *
-openSource(Fsck *chk, Source *s, int8_t *name, uint8_t *bm, u32int offset,
-	u32int gen, int dir, MetaBlock *mb, int i, Block *b)
+openSource(Fsck *chk, Source *s, int8_t *name, uint8_t *bm, uint32_t offset,
+	uint32_t gen, int dir, MetaBlock *mb, int i, Block *b)
 {
 	Source *r;
 
@@ -526,7 +526,7 @@ if(0){
 static void
 scanSource(Fsck *chk, int8_t *name, Source *r)
 {
-	u32int a, nb, o;
+	uint32_t a, nb, o;
 	Block *b;
 	Entry e;
 
@@ -566,7 +566,7 @@ static void
 chkDir(Fsck *chk, int8_t *name, Source *source, Source *meta)
 {
 	int i;
-	u32int a1, a2, nb, o;
+	uint32_t a1, a2, nb, o;
 	int8_t *s, *nn;
 	uint8_t *bm;
 	Block *b, *bb;
@@ -739,7 +739,7 @@ checkDirs(Fsck *chk)
 }
 
 static void
-setBit(uint8_t *bmap, u32int addr)
+setBit(uint8_t *bmap, uint32_t addr)
 {
 	if(addr == NilBlock)
 		return;
@@ -748,7 +748,7 @@ setBit(uint8_t *bmap, u32int addr)
 }
 
 static int
-getBit(uint8_t *bmap, u32int addr)
+getBit(uint8_t *bmap, uint32_t addr)
 {
 	if(addr == NilBlock)
 		return 0;
@@ -793,7 +793,7 @@ clrenop(Fsck*, Block*, int)
 }
 
 static void
-closenop(Fsck*, Block*, u32int)
+closenop(Fsck*, Block*, uint32_t)
 {
 }
 

sys/src/cmd/fossil/disk.c

@@ -53,7 +53,7 @@ static char *partname[] = {
 Disk *
 diskAlloc(int fd)
 {
-	u8int buf[HeaderSize];
+	uint8_t buf[HeaderSize];
 	Header h;
 	Disk *disk;
 
@@ -101,7 +101,7 @@ diskFree(Disk *disk)
 	vtMemFree(disk);
 }
 
-static u32int
+static uint32_t
 partStart(Disk *disk, int part)
 {
 	switch(part){
@@ -117,7 +117,7 @@ partStart(Disk *disk, int part)
 }
 
 
-static u32int
+static uint32_t
 partEnd(Disk *disk, int part)
 {
 	switch(part){
@@ -133,10 +133,10 @@ partEnd(Disk *disk, int part)
 }
 
 int
-diskReadRaw(Disk *disk, int part, u32int addr, uint8_t *buf)
+diskReadRaw(Disk *disk, int part, uint32_t addr, uint8_t *buf)
 {
 	uint32_t start, end;
-	u64int offset;
+	uint64_t offset;
 	int n, nn;
 
 	start = partStart(disk, part);
@@ -147,7 +147,7 @@ diskReadRaw(Disk *disk, int part, u32int addr, uint8_t *buf)
 		return 0;
 	}
 
-	offset = ((u64int)(addr + start))*disk->h.blockSize;
+	offset = ((uint64_t)(addr + start))*disk->h.blockSize;
 	n = disk->h.blockSize;
 	while(n > 0){
 		nn = pread(disk->fd, buf, n, offset);
@@ -167,10 +167,10 @@ diskReadRaw(Disk *disk, int part, u32int addr, uint8_t *buf)
 }
 
 int
-diskWriteRaw(Disk *disk, int part, u32int addr, uint8_t *buf)
+diskWriteRaw(Disk *disk, int part, uint32_t addr, uint8_t *buf)
 {
 	uint32_t start, end;
-	u64int offset;
+	uint64_t offset;
 	int n;
 
 	start = partStart(disk, part);
@@ -181,7 +181,7 @@ diskWriteRaw(Disk *disk, int part, u32int addr, uint8_t *buf)
 		return 0;
 	}
 
-	offset = ((u64int)(addr + start))*disk->h.blockSize;
+	offset = ((uint64_t)(addr + start))*disk->h.blockSize;
 	n = pwrite(disk->fd, buf, disk->h.blockSize, offset);
 	if(n < 0){
 		vtOSError();
@@ -286,7 +286,7 @@ diskFlush(Disk *disk)
 	return 1;
 }
 
-u32int
+uint32_t
 diskSize(Disk *disk, int part)
 {
 	return partEnd(disk, part) - partStart(disk, part);

sys/src/cmd/fossil/file.c

@@ -27,7 +27,7 @@ struct File {
 	int	partial;	/* file was never really open */
 	int	removed;	/* file has been removed */
 	int	dirty;	/* dir is dirty with respect to meta data in block */
-	u32int	boff;	/* block offset within msource for this file's meta data */
+	uint32_t	boff;	/* block offset within msource for this file's meta data */
 
 	DirEntry dir;	/* meta data for this file, including component name */
 
@@ -45,7 +45,7 @@ struct File {
 };
 
 static int fileMetaFlush2(File*, int8_t*);
-static u32int fileMetaAlloc(File*, DirEntry*, u32int);
+static uint32_t fileMetaAlloc(File*, DirEntry*, uint32_t);
 static int fileRLock(File*);
 static void fileRUnlock(File*);
 static int fileLock(File*);
@@ -94,7 +94,7 @@ dirLookup(File *f, int8_t *elem)
 	Block *b;
 	Source *meta;
 	File *ff;
-	u32int bo, nb;
+	uint32_t bo, nb;
 
 	meta = f->msource;
 	b = nil;
@@ -212,7 +212,7 @@ Err:
 }
 
 static Source *
-fileOpenSource(File *f, u32int offset, u32int gen, int dir, uint mode,
+fileOpenSource(File *f, uint32_t offset, uint32_t gen, int dir, uint mode,
 	int issnapshot)
 {
 	int8_t *rname, *fname;
@@ -539,7 +539,7 @@ fileRead(File *f, void *buf, int cnt, int64_t offset)
 {
 	Source *s;
 	uint64_t size;
-	u32int bn;
+	uint32_t bn;
 	int off, dsize, n, nn;
 	Block *b;
 	uint8_t *p;
@@ -816,8 +816,8 @@ fileSetDir(File *f, DirEntry *dir, int8_t *uid)
 {
 	File *ff;
 	int8_t *oelem;
-	u32int mask;
-	u64int size;
+	uint32_t mask;
+	uint64_t size;
 
 	/* can not set permissions for the root */
 	if(fileIsRoot(f)){
@@ -916,7 +916,7 @@ Err:
 }
 
 int
-fileSetQidSpace(File *f, u64int offset, u64int max)
+fileSetQidSpace(File *f, uint64_t offset, uint64_t max)
 {
 	int ret;
 
@@ -1059,7 +1059,7 @@ fileMetaFlush2(File *f, int8_t *oelem)
 	MetaBlock mb;
 	MetaEntry me, me2;
 	int i, n;
-	u32int boff;
+	uint32_t boff;
 
 	if(!f->dirty)
 		return 0;
@@ -1199,7 +1199,7 @@ Err:
 static int
 fileCheckEmpty(File *f)
 {
-	u32int i, n;
+	uint32_t i, n;
 	Block *b;
 	MetaBlock mb;
 	Source *r;
@@ -1473,7 +1473,7 @@ deeRead(DirEntryEnum *dee, DirEntry *de)
 {
 	int ret, didread;
 	File *f;
-	u32int nb;
+	uint32_t nb;
 
 	if(dee == nil){
 		vtSetError("cannot happen in deeRead");
@@ -1536,10 +1536,10 @@ deeClose(DirEntryEnum *dee)
  * caller must NOT lock the source and msource
  * referenced by dir.
  */
-static u32int
-fileMetaAlloc(File *f, DirEntry *dir, u32int start)
+static uint32_t
+fileMetaAlloc(File *f, DirEntry *dir, uint32_t start)
 {
-	u32int nb, bo;
+	uint32_t nb, bo;
 	Block *b, *bb;
 	MetaBlock mb;
 	int nn;
@@ -1735,7 +1735,7 @@ fileWAccess(File* f, int8_t *mid)
 static int
 getEntry(Source *r, Entry *e, int checkepoch)
 {
-	u32int epoch;
+	uint32_t epoch;
 	Block *b;
 
 	if(r == nil){
@@ -1792,7 +1792,7 @@ setEntry(Source *r, Entry *e)
 
 /* assumes hold elk */
 int
-fileSnapshot(File *dst, File *src, u32int epoch, int doarchive)
+fileSnapshot(File *dst, File *src, uint32_t epoch, int doarchive)
 {
 	Entry e, ee;
 

sys/src/cmd/fossil/flchk.c

@@ -55,7 +55,7 @@ flclri(Fsck*, int8_t *name, MetaBlock*, int, Block*)
 }
 
 static void
-flclose(Fsck*, Block *b, u32int epoch)
+flclose(Fsck*, Block *b, uint32_t epoch)
 {
 	Bprint(&bout, "# bclose 0x%ux %ud\n", b->addr, epoch);
 }

sys/src/cmd/fossil/flfmt.c

@@ -15,27 +15,27 @@
 #define blockWrite _blockWrite	/* hack */
 
 static void usage(void);
-static u64int fdsize(int fd);
+static uint64_t fdsize(int fd);
 static void partition(int fd, int bsize, Header *h);
-static u64int unittoull(int8_t *s);
-static u32int blockAlloc(int type, u32int tag);
-static void blockRead(int part, u32int addr);
-static void blockWrite(int part, u32int addr);
-static void superInit(int8_t *label, u32int root, uint8_t[VtScoreSize]);
+static uint64_t unittoull(int8_t *s);
+static uint32_t blockAlloc(int type, uint32_t tag);
+static void blockRead(int part, uint32_t addr);
+static void blockWrite(int part, uint32_t addr);
+static void superInit(int8_t *label, uint32_t root, uint8_t[VtScoreSize]);
 static void rootMetaInit(Entry *e);
-static u32int rootInit(Entry *e);
+static uint32_t rootInit(Entry *e);
 static void topLevel(int8_t *name);
 static int parseScore(uint8_t[VtScoreSize], int8_t*);
-static u32int ventiRoot(int8_t*, int8_t*);
+static uint32_t ventiRoot(int8_t*, int8_t*);
 static VtSession *z;
 
-#define TWID64	((u64int)~(u64int)0)
+#define TWID64	((uint64_t)~(uint64_t)0)
 
 Disk *disk;
 Fs *fs;
 uint8_t *buf;
 int bsize = 8*1024;
-u64int qid = 1;
+uint64_t qid = 1;
 int iso9660off;
 int8_t *iso9660file;
 
@@ -170,11 +170,11 @@ Out:
 	exits(0);
 }
 
-static u64int
+static uint64_t
 fdsize(int fd)
 {
 	Dir *dir;
-	u64int size;
+	uint64_t size;
 
 	dir = dirfstat(fd);
 	if(dir == nil)
@@ -216,17 +216,17 @@ partition(int fd, int bsize, Header *h)
 
 	h->super = (HeaderOffset + 2*bsize)/bsize;
 	h->label = h->super + 1;
-	ndata = ((u64int)lpb)*(nblock - h->label)/(lpb+1);
+	ndata = ((uint64_t)lpb)*(nblock - h->label)/(lpb+1);
 	nlabel = (ndata + lpb - 1)/lpb;
 	h->data = h->label + nlabel;
 	h->end = h->data + ndata;
 
 }
 
-static u32int
+static uint32_t
 tagGen(void)
 {
-	u32int tag;
+	uint32_t tag;
 
 	for(;;){
 		tag = lrand();
@@ -254,8 +254,8 @@ entryInit(Entry *e)
 static void
 rootMetaInit(Entry *e)
 {
-	u32int addr;
-	u32int tag;
+	uint32_t addr;
+	uint32_t tag;
 	DirEntry de;
 	MetaBlock mb;
 	MetaEntry me;
@@ -300,11 +300,11 @@ rootMetaInit(Entry *e)
 	localToGlobal(addr, e->score);
 }
 
-static u32int
+static uint32_t
 rootInit(Entry *e)
 {
 	uint32_t addr;
-	u32int tag;
+	uint32_t tag;
 
 	tag = tagGen();
 
@@ -339,10 +339,10 @@ rootInit(Entry *e)
 }
 
 
-static u32int
-blockAlloc(int type, u32int tag)
+static uint32_t
+blockAlloc(int type, uint32_t tag)
 {
-	static u32int addr;
+	static uint32_t addr;
 	Label l;
 	int lpb;
 
@@ -354,7 +354,7 @@ blockAlloc(int type, u32int tag)
 	if(l.state != BsFree)
 		vtFatal("want to allocate block already in use");
 	l.epoch = 1;
-	l.epochClose = ~(u32int)0;
+	l.epochClose = ~(uint32_t)0;
 	l.type = type;
 	l.state = BsAlloc;
 	l.tag = tag;
@@ -364,7 +364,7 @@ blockAlloc(int type, u32int tag)
 }
 
 static void
-superInit(int8_t *label, u32int root, uint8_t score[VtScoreSize])
+superInit(int8_t *label, uint32_t root, uint8_t score[VtScoreSize])
 {
 	Super s;
 
@@ -384,11 +384,11 @@ superInit(int8_t *label, u32int root, uint8_t score[VtScoreSize])
 	blockWrite(PartSuper, 0);
 }
 
-static u64int
+static uint64_t
 unittoull(int8_t *s)
 {
 	int8_t *es;
-	u64int n;
+	uint64_t n;
 
 	if(s == nil)
 		return TWID64;
@@ -409,14 +409,14 @@ unittoull(int8_t *s)
 }
 
 static void
-blockRead(int part, u32int addr)
+blockRead(int part, uint32_t addr)
 {
 	if(!diskReadRaw(disk, part, addr, buf))
 		vtFatal("read failed: %r");
 }
 
 static void
-blockWrite(int part, u32int addr)
+blockWrite(int part, uint32_t addr)
 {
 	if(!diskWriteRaw(disk, part, addr, buf))
 		vtFatal("write failed: %r");
@@ -469,12 +469,12 @@ ventiRead(uint8_t score[VtScoreSize], int type)
 	return n;
 }
 
-static u32int
+static uint32_t
 ventiRoot(int8_t *host, int8_t *s)
 {
 	int i, n;
 	uint8_t score[VtScoreSize];
-	u32int addr, tag;
+	uint32_t addr, tag;
 	DirEntry de;
 	MetaBlock mb;
 	MetaEntry me;

sys/src/cmd/fossil/flfmt9660.c

@@ -341,7 +341,7 @@ fprint(2, "look for %lud at %lud\n", startoff, startoff-off9660);
 }
 
 void
-iso9660labels(Disk *disk, uint8_t *buf, void (*write)(int, u32int))
+iso9660labels(Disk *disk, uint8_t *buf, void (*write)(int, uint32_t))
 {
 	uint32_t sb, eb, bn, lb, llb;
 	Label l;
@@ -365,7 +365,7 @@ iso9660labels(Disk *disk, uint8_t *buf, void (*write)(int, u32int))
 	l.state = BsAlloc;
 	l.tag = Tag;
 	l.epoch = 1;
-	l.epochClose = ~(u32int)0;
+	l.epochClose = ~(uint32_t)0;
 	for(bn=sb; bn<eb; bn++){
 		lb = bn/lpb;
 		if(lb != llb){

sys/src/cmd/fossil/fs.c

@@ -381,7 +381,7 @@ fsNeedArch(Fs *fs, uint archMinute)
 }
 
 int
-fsEpochLow(Fs *fs, u32int low)
+fsEpochLow(Fs *fs, uint32_t low)
 {
 	Block *bs;
 	Super super;
@@ -411,7 +411,7 @@ static int
 bumpEpoch(Fs *fs, int doarchive)
 {
 	uint8_t oscore[VtScoreSize];
-	u32int oldaddr;
+	uint32_t oldaddr;
 	Block *b, *bs;
 	Entry e;
 	Source *r;
@@ -493,7 +493,7 @@ saveQid(Fs *fs)
 {
 	Block *b;
 	Super super;
-	u64int qidMax;
+	uint64_t qidMax;
 
 	if((b = superGet(fs->cache, &super)) == nil)
 		return 0;
@@ -774,7 +774,7 @@ fsUnhalt(Fs *fs)
 }
 
 int
-fsNextQid(Fs *fs, u64int *qid)
+fsNextQid(Fs *fs, uint64_t *qid)
 {
 	Block *b;
 	Super super;
@@ -808,7 +808,7 @@ fsMetaFlush(void *a)
 }
 
 static int
-fsEsearch1(File *f, int8_t *path, u32int savetime, u32int *plo)
+fsEsearch1(File *f, int8_t *path, uint32_t savetime, uint32_t *plo)
 {
 	int n, r;
 	DirEntry de;
@@ -853,7 +853,7 @@ fsEsearch1(File *f, int8_t *path, u32int savetime, u32int *plo)
 }
 
 static int
-fsEsearch(Fs *fs, int8_t *path, u32int savetime, u32int *plo)
+fsEsearch(Fs *fs, int8_t *path, uint32_t savetime, uint32_t *plo)
 {
 	int n;
 	File *f;
@@ -878,9 +878,9 @@ fsEsearch(Fs *fs, int8_t *path, u32int savetime, u32int *plo)
 }
 
 void
-fsSnapshotCleanup(Fs *fs, u32int age)
+fsSnapshotCleanup(Fs *fs, uint32_t age)
 {
-	u32int lo;
+	uint32_t lo;
 
 	/*
 	 * Find the best low epoch we can use,
@@ -985,9 +985,9 @@ struct Snap
 	uint	snapMinutes;
 	uint	archMinute;
 	uint	snapLife;
-	u32int	lastSnap;
-	u32int	lastArch;
-	u32int	lastCleanup;
+	uint32_t	lastSnap;
+	uint32_t	lastArch;
+	uint32_t	lastCleanup;
 	uint	ignore;
 };
 
@@ -995,10 +995,10 @@ static void
 snapEvent(void *v)
 {
 	Snap *s;
-	u32int now, min;
+	uint32_t now, min;
 	Tm tm;
 	int need;
-	u32int snaplife;
+	uint32_t snaplife;
 
 	s = v;
 
@@ -1069,7 +1069,7 @@ snapInit(Fs *fs)
 }
 
 void
-snapGetTimes(Snap *s, u32int *arch, u32int *snap, u32int *snaplen)
+snapGetTimes(Snap *s, uint32_t *arch, uint32_t *snap, uint32_t *snaplen)
 {
 	if(s == nil){
 		*snap = -1;
@@ -1086,7 +1086,7 @@ snapGetTimes(Snap *s, u32int *arch, u32int *snap, u32int *snaplen)
 }
 
 void
-snapSetTimes(Snap *s, u32int arch, u32int snap, u32int snaplen)
+snapSetTimes(Snap *s, uint32_t arch, uint32_t snap, uint32_t snaplen)
 {
 	if(s == nil)
 		return;

sys/src/cmd/fossil/pack.c

@@ -93,17 +93,17 @@ Bad:
 		if(!(l->state&BsAlloc) || l->state & ~BsMask)
 			goto Bad;
 		if(l->state&BsClosed){
-			if(l->epochClose == ~(u32int)0)
+			if(l->epochClose == ~(uint32_t)0)
 				goto Bad;
 		}else{
-			if(l->epochClose != ~(u32int)0)
+			if(l->epochClose != ~(uint32_t)0)
 				goto Bad;
 		}
 	}
 	return 1;
 }
 
-u32int
+uint32_t
 globalToLocal(uint8_t score[VtScoreSize])
 {
 	int i;
@@ -116,7 +116,7 @@ globalToLocal(uint8_t score[VtScoreSize])
 }
 
 void
-localToGlobal(u32int addr, uint8_t score[VtScoreSize])
+localToGlobal(uint32_t addr, uint8_t score[VtScoreSize])
 {
 	memset(score, 0, VtScoreSize-4);
 	U32PUT(score+VtScoreSize-4, addr);
@@ -189,7 +189,7 @@ entryType(Entry *e)
 void
 superPack(Super *s, uint8_t *p)
 {
-	u32int t32;
+	uint32_t t32;
 
 	memset(p, 0, SuperSize);
 	U32PUT(p, SuperMagic);

sys/src/cmd/fossil/source.c

@@ -14,7 +14,7 @@
 #include "9.h"
 
 static int	sizeToDepth(uint64_t s, int psize, int dsize);
-static u32int 	tagGen(void);
+static uint32_t 	tagGen(void);
 static Block 	*sourceLoad(Source *r, Entry *e);
 static int	sourceShrinkDepth(Source*, Block*, Entry*, int);
 static int	sourceShrinkSize(Source*, Entry*, uint64_t);
@@ -23,10 +23,11 @@ static int	sourceGrowDepth(Source*, Block*, Entry*, int);
 #define sourceIsLocked(r)	((r)->b != nil)
 
 static Source *
-sourceAlloc(Fs *fs, Block *b, Source *p, u32int offset, int mode, int issnapshot)
+sourceAlloc(Fs *fs, Block *b, Source *p, uint32_t offset, int mode,
+	    int issnapshot)
 {
 	int epb;
-	u32int epoch;
+	uint32_t epoch;
 	int8_t *pname = nil;
 	Source *r;
 	Entry e;
@@ -140,7 +141,7 @@ Bad:
 }
 
 Source *
-sourceRoot(Fs *fs, u32int addr, int mode)
+sourceRoot(Fs *fs, uint32_t addr, int mode)
 {
 	Source *r;
 	Block *b;
@@ -187,10 +188,10 @@ sourceOpen(Source *r, uint32_t offset, int mode, int issnapshot)
 }
 
 Source *
-sourceCreate(Source *r, int dsize, int dir, u32int offset)
+sourceCreate(Source *r, int dsize, int dir, uint32_t offset)
 {
 	int i, epb, psize;
-	u32int bn, size;
+	uint32_t bn, size;
 	Block *b;
 	Entry e;
 	Source *rr;
@@ -269,8 +270,8 @@ sourceKill(Source *r, int doremove)
 {
 	Entry e;
 	Block *b;
-	u32int addr;
-	u32int tag;
+	uint32_t addr;
+	uint32_t tag;
 	int type;
 
 	assert(sourceIsLocked(r));
@@ -350,7 +351,7 @@ sourceShrinkSize(Source *r, Entry *e, uint64_t size)
 {
 	int i, type, ppb;
 	uint64_t ptrsz;
-	u32int addr;
+	uint32_t addr;
 	uint8_t score[VtScoreSize];
 	Block *b;
 
@@ -538,7 +539,7 @@ blockWalk(Block *p, int index, int mode, Fs *fs, Entry *e)
 {
 	Block *b;
 	Cache *c;
-	u32int addr;
+	uint32_t addr;
 	int type;
 	uint8_t oscore[VtScoreSize], score[VtScoreSize];
 	Entry oe;
@@ -613,7 +614,7 @@ static int
 sourceGrowDepth(Source *r, Block *p, Entry *e, int depth)
 {
 	Block *b, *bb;
-	u32int tag;
+	uint32_t tag;
 	int type;
 	Entry oe;
 
@@ -664,7 +665,7 @@ static int
 sourceShrinkDepth(Source *r, Block *p, Entry *e, int depth)
 {
 	Block *b, *nb, *ob, *rb;
-	u32int tag;
+	uint32_t tag;
 	int type, d;
 	Entry oe;
 
@@ -865,7 +866,7 @@ sourceClose(Source *r)
 static Block*
 sourceLoadBlock(Source *r, int mode)
 {
-	u32int addr;
+	uint32_t addr;
 	Block *b;
 
 	switch(r->mode){
@@ -1057,10 +1058,10 @@ sizeToDepth(uint64_t s, int psize, int dsize)
 	return d;
 }
 
-static u32int
+static uint32_t
 tagGen(void)
 {
-	u32int tag;
+	uint32_t tag;
 
 	for(;;){
 		tag = lrand();

sys/src/cmd/fossil/vac.c

@@ -128,7 +128,7 @@ mbInit(MetaBlock *mb, uint8_t *p, int n, int ne)
 int
 mbUnpack(MetaBlock *mb, uint8_t *p, int n)
 {
-	u32int magic;
+	uint32_t magic;
 	int i;
 	int eo, en, omin;
 	uint8_t *q;

sys/src/cmd/fossil/view.c

@@ -53,7 +53,7 @@ Atree *atreeinit(int8_t*);
 Tnode *initxheader(void);
 Tnode *initxcache(int8_t *name);
 Tnode *initxsuper(void);
-Tnode *initxlocalroot(int8_t *name, u32int addr);
+Tnode *initxlocalroot(int8_t *name, uint32_t addr);
 Tnode *initxentry(Entry);
 Tnode *initxsource(Entry, int);
 Tnode *initxentryblock(Block*, Entry*);
@@ -134,7 +134,7 @@ blockPut(Block *b)
 	free(b);
 }
 
-static u32int
+static uint32_t
 partStart(int part)
 {
 	switch(part){
@@ -150,7 +150,7 @@ partStart(int part)
 }
 
 
-static u32int
+static uint32_t
 partEnd(int part)
 {
 	switch(part){
@@ -166,10 +166,10 @@ partEnd(int part)
 }
 
 Block*
-readBlock(int part, u32int addr)
+readBlock(int part, uint32_t addr)
 {
-	u32int start, end;
-	u64int offset;
+	uint32_t start, end;
+	uint64_t offset;
 	int n, nn;
 	Block *b;
 	uint8_t *buf;
@@ -184,7 +184,7 @@ readBlock(int part, u32int addr)
 	b = allocBlock();
 	b->addr = addr;
 	buf = b->data;
-	offset = ((u64int)(addr+start))*h.blockSize;
+	offset = ((uint64_t)(addr+start))*h.blockSize;
 	n = h.blockSize;
 	while(n > 0){
 		nn = pread(fd, buf, n, offset);
@@ -253,7 +253,7 @@ dataBlock(uint8_t score[VtScoreSize], uint type, uint tag)
 	Block *b, *bl;
 	int lpb;
 	Label l;
-	u32int addr;
+	uint32_t addr;
 
 	addr = globalToLocal(score);
 	if(addr == NilBlock)
@@ -366,7 +366,7 @@ xheaderexpand(Tnode *t)
 Tnode*
 initxheader(void)
 {
-	u8int buf[HeaderSize];
+	uint8_t buf[HeaderSize];
 	Tnode *t;
 
 	if(pread(fd, buf, HeaderSize, HeaderOffset) < HeaderSize)
@@ -681,7 +681,7 @@ xlocalrootgen(void*, Block *b, int o, Tnode **tp)
 }
 
 Tnode*
-initxlocalroot(int8_t *name, u32int addr)
+initxlocalroot(int8_t *name, uint32_t addr)
 {
 	uint8_t score[VtScoreSize];
 	Block *b;
@@ -834,7 +834,7 @@ scoreFmt(Fmt *f)
 {
 	uint8_t *v;
 	int i;
-	u32int addr;
+	uint32_t addr;
 
 	v = va_arg(f->args, uint8_t*);
 	if(v == nil){

sys/src/cmd/fossil/walk.c

@@ -51,7 +51,7 @@ initWalk(WalkPtr *w, Block *b, uint size)
 }
 
 int
-nextWalk(WalkPtr *w, uint8_t score[VtScoreSize], uint8_t *type, u32int *tag,
+nextWalk(WalkPtr *w, uint8_t score[VtScoreSize], uint8_t *type, uint32_t *tag,
 	 Entry **e)
 {
 	if(w->n >= w->m)

sys/src/cmd/gs/src/gdevpsft.c

@@ -127,7 +127,7 @@ private void
 put_u32(byte *p, uint32_t v)
 {
     put_u16(p, (ushort)(v >> 16));
-    put_u16(p + 2, (ushort)v);
+    put_u16(p + 2, (uint16_t)v);
 }
 private ulong
 put_table(byte tab[16], const int8_t *tname, uint32_t checksum,

sys/src/cmd/gs/src/gsalloc.c

@@ -61,7 +61,7 @@ alloc_trace_space(const gs_ref_memory_t *imem)
     return imem->space + (imem->stable_memory == (const gs_memory_t *)imem);
 }
 private void
-alloc_trace(const char *chars, gs_ref_memory_t * imem, client_name_t cname,
+alloc_trace(const int8_t *chars, gs_ref_memory_t * imem, client_name_t cname,
 	    gs_memory_type_ptr_t stype, uint size, const void *ptr)
 {
     if_debug7('A', "[a%d%s]%s %s(%u) %s0x%lx\n",
@@ -657,7 +657,7 @@ i_alloc_struct_array(gs_memory_t * mem, uint num_elements,
 	      struct_type_name_string(pstype),
 	      (uint32_t) num_elements * pstype->ssize,
 	      num_elements, pstype->ssize, (uint32_t) obj);
-    return (char *)obj;
+    return (int8_t *)obj;
 }
 private void *
 i_alloc_struct_array_immovable(gs_memory_t * mem, uint num_elements,
@@ -675,7 +675,7 @@ i_alloc_struct_array_immovable(gs_memory_t * mem, uint num_elements,
 	      struct_type_name_string(pstype),
 	      (uint32_t) num_elements * pstype->ssize,
 	      num_elements, pstype->ssize, (uint32_t) obj);
-    return (char *)obj;
+    return (int8_t *)obj;
 }
 private void *
 i_resize_object(gs_memory_t * mem, void *obj, uint new_num_elements,

sys/src/cmd/gs/src/gxclmem.c

@@ -460,7 +460,7 @@ compress_log_blk(MEMFILE * f, LOG_MEMFILE_BLK * bp)
     f->rd.limit = f->rd.ptr + MEMFILE_DATA_SIZE;
 
     bp->phys_blk = f->phys_curr;
-    bp->phys_pdata = (char *)(f->wt.ptr) + 1;
+    bp->phys_pdata = (int8_t *)(f->wt.ptr) + 1;
     if (f->compress_state->template->reinit != 0)
 	(*f->compress_state->template->reinit)(f->compress_state);
     compressed_size = 0;
@@ -468,7 +468,7 @@ compress_log_blk(MEMFILE * f, LOG_MEMFILE_BLK * bp)
     start_ptr = f->wt.ptr;
     status = (*f->compress_state->template->process)(f->compress_state,
 						     &(f->rd), &(f->wt), true);
-    bp->phys_blk->data_limit = (char *)(f->wt.ptr);
+    bp->phys_blk->data_limit = (int8_t *)(f->wt.ptr);
 
     if (status == 1) {		/* More output space needed (see strimpl.h) */
 	/* allocate another physical block, then compress remainder       */
@@ -498,7 +498,7 @@ compress_log_blk(MEMFILE * f, LOG_MEMFILE_BLK * bp)
 	    eprintf("Compression required more than one full block!\n");
 	    return_error(gs_error_Fatal);
 	}
-	newphys->data_limit = (char *)(f->wt.ptr);
+	newphys->data_limit = (int8_t *)(f->wt.ptr);
     }
     compressed_size += f->wt.ptr - start_ptr;
     if (compressed_size > MEMFILE_DATA_SIZE) {

sys/src/cmd/gs/src/gxfill.c

@@ -140,7 +140,7 @@ gs_private_st_simple(st_active_line, active_line, "active_line");
 #ifdef DEBUG
 /* Internal procedures for printing and checking active lines. */
 private void
-print_active_line(const char *label, const active_line * alp)
+print_active_line(const int8_t *label, const active_line * alp)
 {
     dlprintf5("[f]%s 0x%lx(%d): x_current=%f x_next=%f\n",
 	      label, (uint32_t) alp, alp->direction,

sys/src/cmd/gs/src/iparam.c

@@ -70,7 +70,7 @@ ref_to_key(const ref * pref, gs_param_key_t * key, iparam_list *plist)
 	key->size = r_size(&nref);
 	key->persistent = false; /* names may be freed */
     } else if (r_has_type(pref, t_integer)) {
-	char istr[sizeof(int32_t) * 8 / 3 + 2];
+	int8_t istr[sizeof(int32_t) * 8 / 3 + 2];
 	int len;
 	byte *buf;
 

sys/src/cmd/gs/src/zbfont.c

@@ -121,7 +121,7 @@ zfont_glyph_name(gs_font *font, gs_glyph index, gs_const_string *pstr)
     ref nref, sref;
 
     if (index >= gs_min_cid_glyph) {	/* Fabricate a numeric name. */
-	char cid_name[sizeof(gs_glyph) * 3 + 1];
+	int8_t cid_name[sizeof(gs_glyph) * 3 + 1];
 	int code;
 
 	sprintf(cid_name, "%lu", (uint32_t) index);

sys/src/cmd/ssh1/agent.c

@@ -22,7 +22,7 @@ typedef struct Achan Achan;
 struct Achan
 {
 	int open;
-	u32int chan;	/* of remote */
+	uint32_t chan;	/* of remote */
 	uint8_t lbuf[4];
 	uint nlbuf;
 	uint len;
@@ -205,7 +205,7 @@ void handlefullmsg(Conn*, Achan*);
 void
 handleagentmsg(Msg *m)
 {
-	u32int chan, len;
+	uint32_t chan, len;
 	int n;
 	Achan *a;
 
@@ -251,7 +251,7 @@ void
 handlefullmsg(Conn *c, Achan *a)
 {
 	int i;
-	u32int chan, len, n, rt;
+	uint32_t chan, len, n, rt;
 	uint8_t type;
 	Msg *m, mm;
 	Msg *r;
@@ -386,7 +386,7 @@ void
 handleagentopen(Msg *m)
 {
 	int i;
-	u32int remote;
+	uint32_t remote;
 
 	assert(m->type == SSH_SMSG_AGENT_OPEN);
 	remote = getlong(m);
@@ -417,7 +417,7 @@ handleagentopen(Msg *m)
 void
 handleagentieof(Msg *m)
 {
-	u32int local;
+	uint32_t local;
 
 	assert(m->type == SSH_MSG_CHANNEL_INPUT_EOF);
 	local = getlong(m);
@@ -442,7 +442,7 @@ handleagentieof(Msg *m)
 void
 handleagentoclose(Msg *m)
 {
-	u32int local;
+	uint32_t local;
 
 	assert(m->type == SSH_MSG_CHANNEL_OUTPUT_CLOSED);
 	local = getlong(m);

sys/src/cmd/unix/drawterm/kern/devtls.c

@@ -241,7 +241,7 @@ static void	tlsPackMac(Secret *sec, uint8_t *mackey, uint8_t *seq,
 			      uint8_t *header, uint8_t *body, int len,
 			      uint8_t *mac);
 static void	put64(uint8_t *p, int64_t x);
-static void	put32(uint8_t *p, u32int);
+static void	put32(uint8_t *p, uint32_t);
 static void	put24(uint8_t *p, int);
 static void	put16(uint8_t *p, int);
 /* static u32int	get32(uchar *p); */
@@ -2137,7 +2137,7 @@ tlsPackMac(Secret *sec, uint8_t *mackey, uint8_t *seq, uint8_t *header,
 }
 
 static void
-put32(uint8_t *p, u32int x)
+put32(uint8_t *p, uint32_t x)
 {
 	p[0] = x>>24;
 	p[1] = x>>16;
@@ -2148,8 +2148,8 @@ put32(uint8_t *p, u32int x)
 static void
 put64(uint8_t *p, int64_t x)
 {
-	put32(p, (u32int)(x >> 32));
-	put32(p+4, (u32int)x);
+	put32(p, (uint32_t)(x >> 32));
+	put32(p+4, (uint32_t)x);
 }
 
 static void

sys/src/cmd/unix/drawterm/libmemdraw/alloc.c

@@ -79,7 +79,7 @@ Memimage*
 _allocmemimage(Rectangle r, uint32_t chan)
 {
 	int d;
-	u32int l, nw;
+	uint32_t l, nw;
 	uint8_t *p;
 	Memdata *md;
 	Memimage *i;

sys/src/cmd/unix/drawterm/libmemdraw/draw.c

@@ -1323,11 +1323,11 @@ greymaskread(Param *p, uint8_t *buf, int y)
 
 #define DBG if(0)
 static Buffer
-readnbit(Param *p, uchar *buf, int y)
+readnbit(Param *p, uint8_t *buf, int y)
 {
 	Buffer b;
 	Memimage *img;
-	uchar *repl, *r, *w, *ow, bits;
+	uint8_t *repl, *r, *w, *ow, bits;
 	int i, n, sh, depth, x, dx, npack, nbits;
 
 	b.rgba = (uint32_t*)buf;
@@ -1417,9 +1417,9 @@ DBG print("bits %x nbits %d...", bits, nbits);
 
 #define DBG if(0)
 static void
-writenbit(Param *p, uchar *w, Buffer src)
+writenbit(Param *p, uint8_t *w, Buffer src)
 {
-	uchar *r;
+	uint8_t *r;
 	uint32_t bits;
 	int i, sh, depth, npack, nbits, x, ex;
 
@@ -1544,13 +1544,13 @@ writecmap(Param *p, uint8_t *w, Buffer src)
 
 #define DBG if(0)
 static Buffer
-readbyte(Param *p, uchar *buf, int y)
+readbyte(Param *p, uint8_t *buf, int y)
 {
 	Buffer b;
 	Memimage *img;
 	int dx, isgrey, convgrey, alphaonly, copyalpha, i, nb;
-	uchar *begin, *end, *r, *w, *rrepl, *grepl, *brepl, *arepl, *krepl;
-	uchar ured, ugrn, ublu;
+	uint8_t *begin, *end, *r, *w, *rrepl, *grepl, *brepl, *arepl, *krepl;
+	uint8_t ured, ugrn, ublu;
 	uint32_t u;
 
 	img = p->img;
@@ -1652,11 +1652,11 @@ DBG print("alpha %x grey %x\n", b.alpha ? *b.alpha : 0xFF, *b.grey);
 
 #define DBG if(0)
 static void
-writebyte(Param *p, uchar *w, Buffer src)
+writebyte(Param *p, uint8_t *w, Buffer src)
 {
 	Memimage *img;
 	int i, isalpha, isgrey, nb, delta, dx, adelta;
-	uchar ff, *red, *grn, *blu, *grey, *alpha;
+	uint8_t ff, *red, *grn, *blu, *grey, *alpha;
 	uint32_t u, mask;
 
 	img = p->img;
@@ -2248,7 +2248,7 @@ DBG print("dp=%p; dx=%d; for(y=0; y<%d; y++, dp+=%d)\nmemsets(dp, v, dx);\n",
 	if((par->state&(m|Replsrc))==m && src->depth >= 8 
 	&& src->chan == dst->chan && !(src->flags&Falpha) && (op == S || op == SoverD)){
 		uchar *sp, *dp;
-		long swid, dwid, nb;
+		int32_t swid, dwid, nb;
 		int dir;
 
 		if(src->data == dst->data && byteaddr(dst, par->r.min) > byteaddr(src, par->sr.min))
@@ -2282,7 +2282,7 @@ DBG print("dp=%p; dx=%d; for(y=0; y<%d; y++, dp+=%d)\nmemsets(dp, v, dx);\n",
 	&& (par->r.min.x&7)==(par->sr.min.x&7) && (par->r.min.x&7)==(par->mr.min.x&7)){
 		uchar *sp, *dp, *mp;
 		uchar lm, rm;
-		long swid, dwid, mwid;
+		int32_t swid, dwid, mwid;
 		int i, x, dir;
 
 		sp = byteaddr(src, par->sr.min);
@@ -2383,7 +2383,7 @@ chardraw(Memdrawparam *par)
 	int i, ddepth, dy, dx, x, bx, ex, y, npack, bsh, depth, op;
 	uint32_t v, maskwid, dstwid;
 	uchar *wp, *rp, *q, *wc;
-	ushort *ws;
+	uint16_t *ws;
 	uint32_t *wl;
 	uchar sp[4];
 	Rectangle r, mr;
@@ -2460,8 +2460,8 @@ DBG print("bits %lux sh %d...", bits, i);
 			}
 			break;
 		case 16:
-			ws = (ushort*)wp;
-			v = *(ushort*)sp;
+			ws = (uint16_t*)wp;
+			v = *(uint16_t*)sp;
 			for(x=bx; x>ex; x--, ws++){
 				i = x&7;
 				if(i == 8-1)

sys/src/cmd/unix/drawterm/libmemdraw/drawtest.c

@@ -903,7 +903,7 @@ getmask(Memimage *img, Point pt)
 void
 putpixel(Memimage *img, Point pt, uint32_t nv)
 {
-	uchar r, g, b, a, *p, *q;
+	uint8_t r, g, b, a, *p, *q;
 	uint32_t c, mask, bits, v;
 	int bpp, sh, npack, nbits;
 

sys/src/cmd/unix/drawterm/libsec/aes.c

@@ -42,7 +42,7 @@
 #include <libsec.h>
 
 typedef uint8_t	u8;
-typedef u32int	u32;
+typedef uint32_t	u32;
 #define FULL_UNROLL
 
 static const u32 Td0[256];
@@ -57,9 +57,9 @@ static int rijndaelKeySetupEnc(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int
 static int rijndaelKeySetupDec(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits);
 #endif
 static int rijndaelKeySetup(u32 erk[/*4*(Nr + 1)*/], u32 drk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits);
-static void	rijndaelEncrypt(const u32int rk[], int Nr,
+static void	rijndaelEncrypt(const uint32_t rk[], int Nr,
 				   const uint8_t pt[16], uint8_t ct[16]);
-static void	rijndaelDecrypt(const u32int rk[], int Nr,
+static void	rijndaelDecrypt(const uint32_t rk[], int Nr,
 				   const uint8_t ct[16], uint8_t pt[16]);
 
 void

sys/src/cmd/unix/drawterm/libsec/blowfish.c

@@ -16,17 +16,17 @@
 // 	Fast Software Encryption
 // 	Cambridge Security Workshop, Cambridge, England (1993)
 
-static u32int sbox[1024];
-static u32int pbox[BFrounds+2];
+static uint32_t sbox[1024];
+static uint32_t pbox[BFrounds+2];
 
-static void bfencrypt(u32int *, BFstate *);
-static void bfdecrypt(u32int *, BFstate *);
+static void bfencrypt(uint32_t *, BFstate *);
+static void bfdecrypt(uint32_t *, BFstate *);
 
 void
 setupBFstate(BFstate *s, uint8_t key[], int keybytes, uint8_t *ivec)
 {
 	int i, j;
-	u32int n, buf[2];
+	uint32_t n, buf[2];
 
 	memset(s, 0, sizeof(*s));
 	memset(buf, 0, sizeof buf);
@@ -86,16 +86,16 @@ bfCBCencrypt(uint8_t *buf, int n, BFstate *s)
 {
 	int i;
 	uint8_t *p;
-	u32int bo[2], bi[2], b;
+	uint32_t bo[2], bi[2], b;
 
 	assert((n & 7) == 0);
 
-	bo[0] =  s->ivec[0] | ((u32int) s->ivec[1]<<8) | ((u32int)s->ivec[2]<<16) | ((u32int)s->ivec[3]<<24);
-	bo[1] =  s->ivec[4] | ((u32int) s->ivec[5]<<8) | ((u32int)s->ivec[6]<<16) | ((u32int)s->ivec[7]<<24);
+	bo[0] =  s->ivec[0] | ((uint32_t) s->ivec[1]<<8) | ((uint32_t)s->ivec[2]<<16) | ((uint32_t)s->ivec[3]<<24);
+	bo[1] =  s->ivec[4] | ((uint32_t) s->ivec[5]<<8) | ((uint32_t)s->ivec[6]<<16) | ((uint32_t)s->ivec[7]<<24);
 
 	for(i=0; i < n; i += 8, buf += 8) {
-		bi[0] =  buf[0] | ((u32int) buf[1]<<8) | ((u32int)buf[2]<<16) | ((u32int)buf[3]<<24);
-		bi[1] =  buf[4] | ((u32int) buf[5]<<8) | ((u32int)buf[6]<<16) | ((u32int)buf[7]<<24);
+		bi[0] =  buf[0] | ((uint32_t) buf[1]<<8) | ((uint32_t)buf[2]<<16) | ((uint32_t)buf[3]<<24);
+		bi[1] =  buf[4] | ((uint32_t) buf[5]<<8) | ((uint32_t)buf[6]<<16) | ((uint32_t)buf[7]<<24);
 
 		bi[0] ^= bo[0];
 		bi[1] ^= bo[1];
@@ -143,16 +143,16 @@ bfCBCdecrypt(uint8_t *buf, int n, BFstate *s)
 {
 	int i;
 	uint8_t *p;
-	u32int b, bo[2], bi[2], xr[2];
+	uint32_t b, bo[2], bi[2], xr[2];
 
 	assert((n & 7) == 0);
 
-	bo[0] =  s->ivec[0] | ((u32int) s->ivec[1]<<8) | ((u32int)s->ivec[2]<<16) | ((u32int)s->ivec[3]<<24);
-	bo[1] =  s->ivec[4] | ((u32int) s->ivec[5]<<8) | ((u32int)s->ivec[6]<<16) | ((u32int)s->ivec[7]<<24);
+	bo[0] =  s->ivec[0] | ((uint32_t) s->ivec[1]<<8) | ((uint32_t)s->ivec[2]<<16) | ((uint32_t)s->ivec[3]<<24);
+	bo[1] =  s->ivec[4] | ((uint32_t) s->ivec[5]<<8) | ((uint32_t)s->ivec[6]<<16) | ((uint32_t)s->ivec[7]<<24);
 
 	for(i=0; i < n; i += 8, buf += 8) {
-		bi[0] =  buf[0] | ((u32int) buf[1]<<8) | ((u32int)buf[2]<<16) | ((u32int)buf[3]<<24);
-		bi[1] =  buf[4] | ((u32int) buf[5]<<8) | ((u32int)buf[6]<<16) | ((u32int)buf[7]<<24);
+		bi[0] =  buf[0] | ((uint32_t) buf[1]<<8) | ((uint32_t)buf[2]<<16) | ((uint32_t)buf[3]<<24);
+		bi[1] =  buf[4] | ((uint32_t) buf[5]<<8) | ((uint32_t)buf[6]<<16) | ((uint32_t)buf[7]<<24);
 
 		xr[0] = bi[0];
 		xr[1] = bi[1];
@@ -202,11 +202,11 @@ void
 bfECBencrypt(uint8_t *buf, int n, BFstate *s)
 {
 	int i;
-	u32int b[2];
+	uint32_t b[2];
 
 	for(i=0; i < n; i += 8, buf += 8) {
-		b[0] =  buf[0] | ((u32int) buf[1]<<8) | ((u32int)buf[2]<<16) | ((u32int)buf[3]<<24);
-		b[1] =  buf[4] | ((u32int) buf[5]<<8) | ((u32int)buf[6]<<16) | ((u32int)buf[7]<<24);
+		b[0] =  buf[0] | ((uint32_t) buf[1]<<8) | ((uint32_t)buf[2]<<16) | ((uint32_t)buf[3]<<24);
+		b[1] =  buf[4] | ((uint32_t) buf[5]<<8) | ((uint32_t)buf[6]<<16) | ((uint32_t)buf[7]<<24);
 
 		bfencrypt(b, s);
 
@@ -228,11 +228,11 @@ void
 bfECBdecrypt(uint8_t *buf, int n, BFstate *s)
 {
 	int i;
-	u32int b[2];
+	uint32_t b[2];
 
 	for(i=0; i < n; i += 8, buf += 8) {
-		b[0] =  buf[0] | ((u32int) buf[1]<<8) | ((u32int)buf[2]<<16) | ((u32int)buf[3]<<24);
-		b[1] =  buf[4] | ((u32int) buf[5]<<8) | ((u32int)buf[6]<<16) | ((u32int)buf[7]<<24);
+		b[0] =  buf[0] | ((uint32_t) buf[1]<<8) | ((uint32_t)buf[2]<<16) | ((uint32_t)buf[3]<<24);
+		b[1] =  buf[4] | ((uint32_t) buf[5]<<8) | ((uint32_t)buf[6]<<16) | ((uint32_t)buf[7]<<24);
 
 		bfdecrypt(b, s);
 
@@ -251,11 +251,11 @@ bfECBdecrypt(uint8_t *buf, int n, BFstate *s)
 }
 
 static void
-bfencrypt(u32int *b, BFstate *s)
+bfencrypt(uint32_t *b, BFstate *s)
 {
 	int i;
-	u32int l, r;
-	u32int *pb, *sb;
+	uint32_t l, r;
+	uint32_t *pb, *sb;
 
 	l = b[0];
 	r = b[1];
@@ -285,11 +285,11 @@ bfencrypt(u32int *b, BFstate *s)
 }
 
 static void
-bfdecrypt(u32int *b, BFstate *s)
+bfdecrypt(uint32_t *b, BFstate *s)
 {
 	int i;
-	u32int l, r;
-	u32int *pb, *sb;
+	uint32_t l, r;
+	uint32_t *pb, *sb;
 
 	l = b[0];
 	r = b[1];
@@ -318,7 +318,7 @@ bfdecrypt(u32int *b, BFstate *s)
 	return;
 }
 
-static u32int pbox[BFrounds+2] = {
+static uint32_t pbox[BFrounds+2] = {
 	0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344, 
 	0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89, 
 	0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c, 
@@ -326,7 +326,7 @@ static u32int pbox[BFrounds+2] = {
 	0x9216d5d9, 0x8979fb1b
 };
 
-static u32int sbox[1024] = {
+static uint32_t sbox[1024] = {
 	0xd1310ba6L, 0x98dfb5acL, 0x2ffd72dbL, 0xd01adfb7L, 
 	0xb8e1afedL, 0x6a267e96L, 0xba7c9045L, 0xf12c7f99L, 
 	0x24a19947L, 0xb3916cf7L, 0x0801f2e2L, 0x858efc16L, 

sys/src/cmd/unix/drawterm/libsec/des.c

@@ -13,7 +13,7 @@
 /*
  * integrated sbox & p perm
  */
-static u32int spbox[] = {
+static uint32_t spbox[] = {
 
 0x00808200,0x00000000,0x00008000,0x00808202,0x00808002,0x00008202,0x00000002,0x00008000,
 0x00000200,0x00808200,0x00808202,0x00000200,0x00800202,0x00808002,0x00800000,0x00000002,
@@ -100,14 +100,14 @@ static u32int spbox[] = {
 void
 block_cipher(uint32_t key[32], uint8_t text[8], int decrypting)
 {
-	u32int right, left, v0, v1;
+	uint32_t right, left, v0, v1;
 	int i, keystep;
 
 	/*
 	 * initial permutation
 	 */
-	v0 = text[0] | ((u32int)text[2]<<8) | ((u32int)text[4]<<16) | ((u32int)text[6]<<24);
-	left = text[1] | ((u32int)text[3]<<8) | ((u32int)text[5]<<16) | ((u32int)text[7]<<24);
+	v0 = text[0] | ((uint32_t)text[2]<<8) | ((uint32_t)text[4]<<16) | ((uint32_t)text[6]<<24);
+	left = text[1] | ((uint32_t)text[3]<<8) | ((uint32_t)text[5]<<16) | ((uint32_t)text[7]<<24);
 	right = (left & 0xaaaaaaaa) | ((v0 >> 1) & 0x55555555);
 	left = ((left << 1) & 0xaaaaaaaa) | (v0 & 0x55555555);
 	left = ((left << 6) & 0x33003300)
@@ -192,14 +192,14 @@ void
 triple_block_cipher(uint32_t expanded_key[3][32], uint8_t text[8], int ende)
 {
 	uint32_t *key;
-	u32int right, left, v0, v1;
+	uint32_t right, left, v0, v1;
 	int i, j, keystep;
 
 	/*
 	 * initial permutation
 	 */
-	v0 = text[0] | ((u32int)text[2]<<8) | ((u32int)text[4]<<16) | ((u32int)text[6]<<24);
-	left = text[1] | ((u32int)text[3]<<8) | ((u32int)text[5]<<16) | ((u32int)text[7]<<24);
+	v0 = text[0] | ((uint32_t)text[2]<<8) | ((uint32_t)text[4]<<16) | ((uint32_t)text[6]<<24);
+	left = text[1] | ((uint32_t)text[3]<<8) | ((uint32_t)text[5]<<16) | ((uint32_t)text[7]<<24);
 	right = (left & 0xaaaaaaaa) | ((v0 >> 1) & 0x55555555);
 	left = ((left << 1) & 0xaaaaaaaa) | (v0 & 0x55555555);
 	left = ((left << 6) & 0x33003300)
@@ -290,7 +290,7 @@ triple_block_cipher(uint32_t expanded_key[3][32], uint8_t text[8], int ende)
 /*
  * key compression permutation, 4 bits at a time
  */
-static u32int comptab[] = {
+static uint32_t comptab[] = {
 
 0x000000,0x010000,0x000008,0x010008,0x000080,0x010080,0x000088,0x010088,
 0x000000,0x010000,0x000008,0x010008,0x000080,0x010080,0x000088,0x010088,
@@ -341,9 +341,9 @@ static int keysh[] =
 };
 
 static void
-keycompperm(u32int left, u32int right, uint32_t *ek)
+keycompperm(uint32_t left, uint32_t right, uint32_t *ek)
 {
-	u32int v0, v1;
+	uint32_t v0, v1;
 	int i;
 
 	for(i = 0; i < 16; i++){
@@ -380,10 +380,10 @@ keycompperm(u32int left, u32int right, uint32_t *ek)
 void
 des_key_setup(uint8_t key[8], uint32_t *ek)
 {
-	u32int left, right, v0, v1;
+	uint32_t left, right, v0, v1;
 
-	v0 = key[0] | ((u32int)key[2] << 8) | ((u32int)key[4] << 16) | ((u32int)key[6] << 24);
-	v1 = key[1] | ((u32int)key[3] << 8) | ((u32int)key[5] << 16) | ((u32int)key[7] << 24);
+	v0 = key[0] | ((uint32_t)key[2] << 8) | ((uint32_t)key[4] << 16) | ((uint32_t)key[6] << 24);
+	v1 = key[1] | ((uint32_t)key[3] << 8) | ((uint32_t)key[5] << 16) | ((uint32_t)key[7] << 24);
 	left = ((v0 >> 1) & 0x40404040)
 		| ((v0 >> 2) & 0x10101010)
 		| ((v0 >> 3) & 0x04040404)
@@ -442,10 +442,10 @@ static uint8_t parity[128] =
 void
 des56to64(uint8_t *k56, uint8_t *k64)
 {
-	u32int hi, lo;
+	uint32_t hi, lo;
 
-	hi = ((u32int)k56[0]<<24)|((u32int)k56[1]<<16)|((u32int)k56[2]<<8)|k56[3];
-	lo = ((u32int)k56[4]<<24)|((u32int)k56[5]<<16)|((u32int)k56[6]<<8);
+	hi = ((uint32_t)k56[0]<<24)|((uint32_t)k56[1]<<16)|((uint32_t)k56[2]<<8)|k56[3];
+	lo = ((uint32_t)k56[4]<<24)|((uint32_t)k56[5]<<16)|((uint32_t)k56[6]<<8);
 
 	k64[0] = parity[(hi>>25)&0x7f];
 	k64[1] = parity[(hi>>18)&0x7f];
@@ -463,12 +463,12 @@ des56to64(uint8_t *k56, uint8_t *k64)
 void
 des64to56(uint8_t *k64, uint8_t *k56)
 {
-	u32int hi, lo;
+	uint32_t hi, lo;
 
-	hi = (((u32int)k64[0]&0xfe)<<24)|(((u32int)k64[1]&0xfe)<<17)|(((u32int)k64[2]&0xfe)<<10)
+	hi = (((uint32_t)k64[0]&0xfe)<<24)|(((uint32_t)k64[1]&0xfe)<<17)|(((uint32_t)k64[2]&0xfe)<<10)
 		|((k64[3]&0xfe)<<3)|(k64[4]>>4);
-	lo = (((u32int)k64[4]&0xfe)<<28)|(((u32int)k64[5]&0xfe)<<21)|(((u32int)k64[6]&0xfe)<<14)
-		|(((u32int)k64[7]&0xfe)<<7);
+	lo = (((uint32_t)k64[4]&0xfe)<<28)|(((uint32_t)k64[5]&0xfe)<<21)|(((uint32_t)k64[6]&0xfe)<<14)
+		|(((uint32_t)k64[7]&0xfe)<<7);
 
 	k56[0] = hi>>24;
 	k56[1] = hi>>16;

sys/src/cmd/unix/drawterm/libsec/md4.c

@@ -100,17 +100,17 @@ static MD4Table tab[] =
 	{ 15,	S34},	
 };
 
-static void encode(uint8_t*, u32int*, uint32_t);
-static void decode(u32int*, uint8_t*, uint32_t);
+static void encode(uint8_t*, uint32_t*, uint32_t);
+static void decode(uint32_t*, uint8_t*, uint32_t);
 
 static void
 md4block(uint8_t *p, uint32_t len, MD4state *s)
 {
 	int i;
-	u32int a, b, c, d, tmp;
+	uint32_t a, b, c, d, tmp;
 	MD4Table *t;
 	uint8_t *end;
-	u32int x[16];
+	uint32_t x[16];
 
 	for(end = p+len; p < end; p += 64){
 		a = s->state[0];
@@ -156,7 +156,7 @@ md4block(uint8_t *p, uint32_t len, MD4state *s)
 MD4state*
 md4(uint8_t *p, uint32_t len, uint8_t *digest, MD4state *s)
 {
-	u32int x[16];
+	uint32_t x[16];
 	uint8_t buf[128];
 	int i;
 	uint8_t *e;
@@ -251,9 +251,9 @@ md4(uint8_t *p, uint32_t len, uint8_t *digest, MD4state *s)
  *	a multiple of 4.
  */
 static void
-encode(uint8_t *output, u32int *input, uint32_t len)
+encode(uint8_t *output, uint32_t *input, uint32_t len)
 {
-	u32int x;
+	uint32_t x;
 	uint8_t *e;
 
 	for(e = output + len; output < e;) {
@@ -270,7 +270,7 @@ encode(uint8_t *output, u32int *input, uint32_t len)
  *	a multiple of 4.
  */
 static void
-decode(u32int *output, uint8_t *input, uint32_t len)
+decode(uint32_t *output, uint8_t *input, uint32_t len)
 {
 	uint8_t *e;
 

sys/src/cmd/unix/drawterm/libsec/md5.c

@@ -36,14 +36,14 @@
  *	documentation and/or software.
  */
 
-static void encode(uint8_t*, u32int*, uint32_t);
+static void encode(uint8_t*, uint32_t*, uint32_t);
 
-extern void _md5block(uint8_t*, uint32_t, u32int*);
+extern void _md5block(uint8_t*, uint32_t, uint32_t*);
 
 MD5state*
 md5(uint8_t *p, uint32_t len, uint8_t *digest, MD5state *s)
 {
-	u32int x[16];
+	uint32_t x[16];
 	uint8_t buf[128];
 	int i;
 	uint8_t *e;
@@ -141,9 +141,9 @@ md5(uint8_t *p, uint32_t len, uint8_t *digest, MD5state *s)
  *	a multiple of 4.
  */
 static void
-encode(uint8_t *output, u32int *input, uint32_t len)
+encode(uint8_t *output, uint32_t *input, uint32_t len)
 {
-	u32int x;
+	uint32_t x;
 	uint8_t *e;
 
 	for(e = output + len; output < e;) {

sys/src/cmd/unix/drawterm/libsec/md5block.c

@@ -62,7 +62,7 @@ enum
 	S44=	21,
 };
 
-static u32int md5tab[] =
+static uint32_t md5tab[] =
 {
 	/* round 1 */
 /*[0]*/	0xd76aa478,	
@@ -137,16 +137,16 @@ static u32int md5tab[] =
 	0xeb86d391,	
 };
 
-static void decode(u32int*, uint8_t*, uint32_t);
-extern void _md5block(uint8_t *p, uint32_t len, u32int *s);
+static void decode(uint32_t*, uint8_t*, uint32_t);
+extern void _md5block(uint8_t *p, uint32_t len, uint32_t *s);
 
 void
-_md5block(uint8_t *p, uint32_t len, u32int *s)
+_md5block(uint8_t *p, uint32_t len, uint32_t *s)
 {
-	u32int a, b, c, d, sh;
-	u32int *t;
+	uint32_t a, b, c, d, sh;
+	uint32_t *t;
 	uint8_t *end;
-	u32int x[16];
+	uint32_t x[16];
 
 	for(end = p+len; p < end; p += 64){
 		a = s[0];
@@ -266,7 +266,7 @@ _md5block(uint8_t *p, uint32_t len, u32int *s)
  *	a multiple of 4.
  */
 static void
-decode(u32int *output, uint8_t *input, uint32_t len)
+decode(uint32_t *output, uint8_t *input, uint32_t len)
 {
 	uint8_t *e;
 

sys/src/cmd/unix/drawterm/libsec/sha1.c

@@ -10,9 +10,9 @@
 #include "os.h"
 #include <libsec.h>
 
-static void encode(uint8_t*, u32int*, uint32_t);
+static void encode(uint8_t*, uint32_t*, uint32_t);
 
-extern void _sha1block(uint8_t*, uint32_t, u32int*);
+extern void _sha1block(uint8_t*, uint32_t, uint32_t*);
 
 /*
  *  we require len to be a multiple of 64 for all but
@@ -23,7 +23,7 @@ SHA1state*
 sha1(uint8_t *p, uint32_t len, uint8_t *digest, SHA1state *s)
 {
 	uint8_t buf[128];
-	u32int x[16];
+	uint32_t x[16];
 	int i;
 	uint8_t *e;
 
@@ -121,9 +121,9 @@ sha1(uint8_t *p, uint32_t len, uint8_t *digest, SHA1state *s)
  *	a multiple of 4.
  */
 static void
-encode(uint8_t *output, u32int *input, uint32_t len)
+encode(uint8_t *output, uint32_t *input, uint32_t len)
 {
-	u32int x;
+	uint32_t x;
 	uint8_t *e;
 
 	for(e = output + len; output < e;) {

sys/src/cmd/unix/drawterm/libsec/sha1block.c

@@ -10,12 +10,12 @@
 #include "os.h"
 
 void
-_sha1block(uint8_t *p, uint32_t len, u32int *s)
+_sha1block(uint8_t *p, uint32_t len, uint32_t *s)
 {
-	u32int a, b, c, d, e, x;
+	uint32_t a, b, c, d, e, x;
 	uint8_t *end;
-	u32int *wp, *wend;
-	u32int w[80];
+	uint32_t *wp, *wend;
+	uint32_t w[80];
 
 	/* at this point, we have a multiple of 64 bytes */
 	for(end = p+len; p < end;){

sys/src/cmd/unix/drawterm/libsec/tlshand.c

@@ -317,10 +317,10 @@ static void factotum_rsa_close(AuthRpc*rpc);
 
 static void* emalloc(int);
 static void* erealloc(void*, int);
-static void put32(uint8_t *p, u32int);
+static void put32(uint8_t *p, uint32_t);
 static void put24(uint8_t *p, int);
 static void put16(uint8_t *p, int);
-static u32int get32(uint8_t *p);
+static uint32_t get32(uint8_t *p);
 static int get24(uint8_t *p);
 static int get16(uint8_t *p);
 static Bytes* newbytes(int len);
@@ -2224,7 +2224,7 @@ erealloc(void *ReallocP, int ReallocN)
 }
 
 static void
-put32(uint8_t *p, u32int x)
+put32(uint8_t *p, uint32_t x)
 {
 	p[0] = x>>24;
 	p[1] = x>>16;
@@ -2247,7 +2247,7 @@ put16(uint8_t *p, int x)
 	p[1] = x;
 }
 
-static u32int
+static uint32_t
 get32(uint8_t *p)
 {
 	return (p[0]<<24)|(p[1]<<16)|(p[2]<<8)|p[3];

sys/src/cmd/unix/drawterm/posix-amd64/md5block.c

@@ -63,7 +63,7 @@ enum
 	S44=	21,
 };
 
-static u32int md5tab[] =
+static uint32_t md5tab[] =
 {
 	/* round 1 */
 /*[0]*/	0xd76aa478,	
@@ -138,16 +138,16 @@ static u32int md5tab[] =
 	0xeb86d391,	
 };
 
-static void decode(u32int*, uint8_t*, uint32_t);
-extern void _md5block(uint8_t *p, uint32_t len, u32int *s);
+static void decode(uint32_t*, uint8_t*, uint32_t);
+extern void _md5block(uint8_t *p, uint32_t len, uint32_t *s);
 
 void
-_md5block(uint8_t *p, uint32_t len, u32int *s)
+_md5block(uint8_t *p, uint32_t len, uint32_t *s)
 {
-	u32int a, b, c, d, sh;
-	u32int *t;
+	uint32_t a, b, c, d, sh;
+	uint32_t *t;
 	uint8_t *end;
-	u32int x[16];
+	uint32_t x[16];
 
 	for(end = p+len; p < end; p += 64){
 		a = s[0];
@@ -267,7 +267,7 @@ _md5block(uint8_t *p, uint32_t len, u32int *s)
  *	a multiple of 4.
  */
 static void
-decode(u32int *output, uint8_t *input, uint32_t len)
+decode(uint32_t *output, uint8_t *input, uint32_t len)
 {
 	uint8_t *e;
 

sys/src/cmd/unix/drawterm/posix-amd64/sha1block.c

@@ -12,12 +12,12 @@
 #include <libsec.h>
 
 void
-_sha1block(uint8_t *p, uint32_t len, u32int *s)
+_sha1block(uint8_t *p, uint32_t len, uint32_t *s)
 {
-	u32int a, b, c, d, e, x;
+	uint32_t a, b, c, d, e, x;
 	uint8_t *end;
-	u32int *wp, *wend;
-	u32int w[80];
+	uint32_t *wp, *wend;
+	uint32_t w[80];
 
 	/* at this point, we have a multiple of 64 bytes */
 	for(end = p+len; p < end;){

sys/src/cmd/unix/drawterm/posix-arm/md5block.c

@@ -63,7 +63,7 @@ enum
 	S44=	21,
 };
 
-static u32int md5tab[] =
+static uint32_t md5tab[] =
 {
 	/* round 1 */
 /*[0]*/	0xd76aa478,	
@@ -138,16 +138,16 @@ static u32int md5tab[] =
 	0xeb86d391,	
 };
 
-static void decode(u32int*, uint8_t*, uint32_t);
-extern void _md5block(uint8_t *p, uint32_t len, u32int *s);
+static void decode(uint32_t*, uint8_t*, uint32_t);
+extern void _md5block(uint8_t *p, uint32_t len, uint32_t *s);
 
 void
-_md5block(uint8_t *p, uint32_t len, u32int *s)
+_md5block(uint8_t *p, uint32_t len, uint32_t *s)
 {
-	u32int a, b, c, d, sh;
-	u32int *t;
+	uint32_t a, b, c, d, sh;
+	uint32_t *t;
 	uint8_t *end;
-	u32int x[16];
+	uint32_t x[16];
 
 	for(end = p+len; p < end; p += 64){
 		a = s[0];
@@ -267,7 +267,7 @@ _md5block(uint8_t *p, uint32_t len, u32int *s)
  *	a multiple of 4.
  */
 static void
-decode(u32int *output, uint8_t *input, uint32_t len)
+decode(uint32_t *output, uint8_t *input, uint32_t len)
 {
 	uint8_t *e;
 

sys/src/cmd/unix/drawterm/posix-arm/sha1block.c

@@ -12,12 +12,12 @@
 #include <libsec.h>
 
 void
-_sha1block(uint8_t *p, uint32_t len, u32int *s)
+_sha1block(uint8_t *p, uint32_t len, uint32_t *s)
 {
-	u32int a, b, c, d, e, x;
+	uint32_t a, b, c, d, e, x;
 	uint8_t *end;
-	u32int *wp, *wend;
-	u32int w[80];
+	uint32_t *wp, *wend;
+	uint32_t w[80];
 
 	/* at this point, we have a multiple of 64 bytes */
 	for(end = p+len; p < end;){

sys/src/cmd/unix/drawterm/posix-mips/md5block.c

@@ -63,7 +63,7 @@ enum
 	S44=	21,
 };
 
-static u32int md5tab[] =
+static uint32_t md5tab[] =
 {
 	/* round 1 */
 /*[0]*/	0xd76aa478,	
@@ -138,16 +138,16 @@ static u32int md5tab[] =
 	0xeb86d391,	
 };
 
-static void decode(u32int*, uint8_t*, uint32_t);
-extern void _md5block(uint8_t *p, uint32_t len, u32int *s);
+static void decode(uint32_t*, uint8_t*, uint32_t);
+extern void _md5block(uint8_t *p, uint32_t len, uint32_t *s);
 
 void
-_md5block(uint8_t *p, uint32_t len, u32int *s)
+_md5block(uint8_t *p, uint32_t len, uint32_t *s)
 {
-	u32int a, b, c, d, sh;
-	u32int *t;
+	uint32_t a, b, c, d, sh;
+	uint32_t *t;
 	uint8_t *end;
-	u32int x[16];
+	uint32_t x[16];
 
 	for(end = p+len; p < end; p += 64){
 		a = s[0];
@@ -267,7 +267,7 @@ _md5block(uint8_t *p, uint32_t len, u32int *s)
  *	a multiple of 4.
  */
 static void
-decode(u32int *output, uint8_t *input, uint32_t len)
+decode(uint32_t *output, uint8_t *input, uint32_t len)
 {
 	uint8_t *e;
 

sys/src/cmd/unix/drawterm/posix-mips/sha1block.c

@@ -12,12 +12,12 @@
 #include <libsec.h>
 
 void
-_sha1block(uint8_t *p, uint32_t len, u32int *s)
+_sha1block(uint8_t *p, uint32_t len, uint32_t *s)
 {
-	u32int a, b, c, d, e, x;
+	uint32_t a, b, c, d, e, x;
 	uint8_t *end;
-	u32int *wp, *wend;
-	u32int w[80];
+	uint32_t *wp, *wend;
+	uint32_t w[80];
 
 	/* at this point, we have a multiple of 64 bytes */
 	for(end = p+len; p < end;){

sys/src/cmd/unix/drawterm/posix-port/md5block.c

@@ -63,7 +63,7 @@ enum
 	S44=	21,
 };
 
-static u32int md5tab[] =
+static uint32_t md5tab[] =
 {
 	/* round 1 */
 /*[0]*/	0xd76aa478,	
@@ -138,16 +138,16 @@ static u32int md5tab[] =
 	0xeb86d391,	
 };
 
-static void decode(u32int*, uint8_t*, uint32_t);
-extern void _md5block(uint8_t *p, uint32_t len, u32int *s);
+static void decode(uint32_t*, uint8_t*, uint32_t);
+extern void _md5block(uint8_t *p, uint32_t len, uint32_t *s);
 
 void
-_md5block(uint8_t *p, uint32_t len, u32int *s)
+_md5block(uint8_t *p, uint32_t len, uint32_t *s)
 {
-	u32int a, b, c, d, sh;
-	u32int *t;
+	uint32_t a, b, c, d, sh;
+	uint32_t *t;
 	uint8_t *end;
-	u32int x[16];
+	uint32_t x[16];
 
 	for(end = p+len; p < end; p += 64){
 		a = s[0];
@@ -267,7 +267,7 @@ _md5block(uint8_t *p, uint32_t len, u32int *s)
  *	a multiple of 4.
  */
 static void
-decode(u32int *output, uint8_t *input, uint32_t len)
+decode(uint32_t *output, uint8_t *input, uint32_t len)
 {
 	uint8_t *e;
 

sys/src/cmd/unix/drawterm/posix-port/sha1block.c

@@ -12,12 +12,12 @@
 #include <libsec.h>
 
 void
-_sha1block(uint8_t *p, uint32_t len, u32int *s)
+_sha1block(uint8_t *p, uint32_t len, uint32_t *s)
 {
-	u32int a, b, c, d, e, x;
+	uint32_t a, b, c, d, e, x;
 	uint8_t *end;
-	u32int *wp, *wend;
-	u32int w[80];
+	uint32_t *wp, *wend;
+	uint32_t w[80];
 
 	/* at this point, we have a multiple of 64 bytes */
 	for(end = p+len; p < end;){

sys/src/cmd/unix/drawterm/posix-power/md5block.c

@@ -63,7 +63,7 @@ enum
 	S44=	21,
 };
 
-static u32int md5tab[] =
+static uint32_t md5tab[] =
 {
 	/* round 1 */
 /*[0]*/	0xd76aa478,	
@@ -138,16 +138,16 @@ static u32int md5tab[] =
 	0xeb86d391,	
 };
 
-static void decode(u32int*, uint8_t*, uint32_t);
-extern void _md5block(uint8_t *p, uint32_t len, u32int *s);
+static void decode(uint32_t*, uint8_t*, uint32_t);
+extern void _md5block(uint8_t *p, uint32_t len, uint32_t *s);
 
 void
-_md5block(uint8_t *p, uint32_t len, u32int *s)
+_md5block(uint8_t *p, uint32_t len, uint32_t *s)
 {
-	u32int a, b, c, d, sh;
-	u32int *t;
+	uint32_t a, b, c, d, sh;
+	uint32_t *t;
 	uint8_t *end;
-	u32int x[16];
+	uint32_t x[16];
 
 	for(end = p+len; p < end; p += 64){
 		a = s[0];
@@ -267,7 +267,7 @@ _md5block(uint8_t *p, uint32_t len, u32int *s)
  *	a multiple of 4.
  */
 static void
-decode(u32int *output, uint8_t *input, uint32_t len)
+decode(uint32_t *output, uint8_t *input, uint32_t len)
 {
 	uint8_t *e;
 

sys/src/cmd/unix/drawterm/posix-power/sha1block.c

@@ -12,12 +12,12 @@
 #include <libsec.h>
 
 void
-_sha1block(uint8_t *p, uint32_t len, u32int *s)
+_sha1block(uint8_t *p, uint32_t len, uint32_t *s)
 {
-	u32int a, b, c, d, e, x;
+	uint32_t a, b, c, d, e, x;
 	uint8_t *end;
-	u32int *wp, *wend;
-	u32int w[80];
+	uint32_t *wp, *wend;
+	uint32_t w[80];
 
 	/* at this point, we have a multiple of 64 bytes */
 	for(end = p+len; p < end;){

sys/src/cmd/unix/drawterm/posix-sun4u/md5block.c

@@ -63,7 +63,7 @@ enum
 	S44=	21,
 };
 
-static u32int md5tab[] =
+static uint32_t md5tab[] =
 {
 	/* round 1 */
 /*[0]*/	0xd76aa478,	
@@ -138,16 +138,16 @@ static u32int md5tab[] =
 	0xeb86d391,	
 };
 
-static void decode(u32int*, uint8_t*, uint32_t);
-extern void _md5block(uint8_t *p, uint32_t len, u32int *s);
+static void decode(uint32_t*, uint8_t*, uint32_t);
+extern void _md5block(uint8_t *p, uint32_t len, uint32_t *s);
 
 void
-_md5block(uint8_t *p, uint32_t len, u32int *s)
+_md5block(uint8_t *p, uint32_t len, uint32_t *s)
 {
-	u32int a, b, c, d, sh;
-	u32int *t;
+	uint32_t a, b, c, d, sh;
+	uint32_t *t;
 	uint8_t *end;
-	u32int x[16];
+	uint32_t x[16];
 
 	for(end = p+len; p < end; p += 64){
 		a = s[0];
@@ -267,7 +267,7 @@ _md5block(uint8_t *p, uint32_t len, u32int *s)
  *	a multiple of 4.
  */
 static void
-decode(u32int *output, uint8_t *input, uint32_t len)
+decode(uint32_t *output, uint8_t *input, uint32_t len)
 {
 	uint8_t *e;
 

sys/src/cmd/unix/drawterm/posix-sun4u/sha1block.c

@@ -12,12 +12,12 @@
 #include <libsec.h>
 
 void
-_sha1block(uint8_t *p, uint32_t len, u32int *s)
+_sha1block(uint8_t *p, uint32_t len, uint32_t *s)
 {
-	u32int a, b, c, d, e, x;
+	uint32_t a, b, c, d, e, x;
 	uint8_t *end;
-	u32int *wp, *wend;
-	u32int w[80];
+	uint32_t *wp, *wend;
+	uint32_t w[80];
 
 	/* at this point, we have a multiple of 64 bytes */
 	for(end = p+len; p < end;){

sys/src/cmd/unix/u9fs/u9fs.c

@@ -953,7 +953,7 @@ rwstat(Fcall *rx, Fcall *tx)
 		}		
 	}
 
-	if((u32int)d.mode != (u32int)~0 && (((d.mode&DMDIR)!=0) ^ (S_ISDIR(fid->st.st_mode)!=0))){
+	if((uint32_t)d.mode != (uint32_t)~0 && (((d.mode&DMDIR)!=0) ^ (S_ISDIR(fid->st.st_mode)!=0))){
 		seterror(tx, Edirchange);
 		return;
 	}
@@ -970,14 +970,14 @@ rwstat(Fcall *rx, Fcall *tx)
 	 * leave truncate until last.
 	 * (see above comment about atomicity).
 	 */
-	if((u32int)d.mode != (u32int)~0 && chmod(fid->path, unixmode(&d)) < 0){
+	if((uint32_t)d.mode != (uint32_t)~0 && chmod(fid->path, unixmode(&d)) < 0){
 		if(chatty9p)
 			fprint(2, "chmod(%s, 0%luo) failed\n", fid->path, unixmode(&d));
 		seterror(tx, strerror(errno));
 		return;
 	}
 
-	if((u32int)d.mtime != (u32int)~0){
+	if((uint32_t)d.mtime != (uint32_t)~0){
 		struct utimbuf t;
 
 		t.actime = 0;
@@ -1022,7 +1022,7 @@ rwstat(Fcall *rx, Fcall *tx)
 		free(dir);
 	}
 
-	if((u64int)d.length != (u64int)~0 && truncate(fid->path, d.length) < 0){
+	if((uint64_t)d.length != (uint64_t)~0 && truncate(fid->path, d.length) < 0){
 		fprint(2, "truncate(%s, %lld) failed\n", fid->path, d.length);
 		seterror(tx, strerror(errno));
 		return;

sys/src/cmd/upas/bayes/dfa.c

@@ -263,9 +263,9 @@ countinst(Reprog *pp)
 }
 
 static void
-set(Deter *d, u32int **tab, Rune r)
+set(Deter *d, uint32_t **tab, Rune r)
 {
-	u32int *u;
+	uint32_t *u;
 
 	if((u = tab[r/4096]) == nil){
 		u = binalloc(&d->bin, 4096/8, 1);
@@ -283,7 +283,7 @@ set(Deter *d, u32int **tab, Rune r)
 static void
 findchars(Deter *d, Reprog *p)
 {
-	u32int *tab[65536/4096], *u, x;
+	uint32_t *tab[65536/4096], *u, x;
 	Reinst *i;
 	Rune *rp, *ep;
 	int k, m, n, a;

sys/src/cmd/usb/serial/ftdi.c

@@ -309,7 +309,7 @@ static uint32_t
 ft232bmbaudbase2div(int baud, int base)
 {
 	int divisor3;
-	u32int divisor;
+	uint32_t divisor;
 
 	divisor3 = (base / 2) / baud;
 	divisor = divisor3 >> 3 | divfrac[divisor3 & 7] << 14;