Plan 9 from Bell Labs 2011-02-12

sys/src/9/kw/devusb.c

@@ -328,7 +328,7 @@ epalloc(Hci *hp)
 	Ep *ep;
 	int i;
 
-	ep = mallocz(sizeof(Ep), 1);
+	ep = smalloc(sizeof(Ep));
 	ep->ref = 1;
 	qlock(&epslck);
 	for(i = 0; i < Neps; i++)
@@ -454,7 +454,7 @@ newdev(Hci *hp, int ishub, int isroot)
 	Udev *d;
 
 	ep = epalloc(hp);
-	d = ep->dev = mallocz(sizeof(Udev), 1);
+	d = ep->dev = smalloc(sizeof(Udev));
 	d->nb = newusbid(hp);
 	d->eps[0] = ep;
 	ep->nb = 0;
@@ -666,7 +666,7 @@ hciprobe(int cardno, int ctlrno)
 	static int epnb = 1;	/* guess the endpoint nb. for the controller */
 
 	ddprint("hciprobe %d %d\n", cardno, ctlrno);
-	hp = mallocz(sizeof(Hci), 1);
+	hp = smalloc(sizeof(Hci));
 	hp->ctlrno = ctlrno;
 	hp->tbdf = BUSUNKNOWN;
 

sys/src/9/kw/usbehcikw.c

@@ -273,7 +273,7 @@ findehcis(void)		/* actually just use fixed addresses on sheeva */
 		return;
 	already = 1;
 
-	ctlr = mallocz(sizeof(Ctlr), 1);
+	ctlr = smalloc(sizeof(Ctlr));
 	/* the sheeva's usb 2.0 otg uses a superset of the ehci registers */
 	ctlr->capio = (Ecapio *)(soc.ehci + 0x100);
 	ctlr->opio  = (Eopio *) (soc.ehci + 0x140);

sys/src/9/omap/devusb.c

@@ -328,7 +328,7 @@ epalloc(Hci *hp)
 	Ep *ep;
 	int i;
 
-	ep = mallocz(sizeof(Ep), 1);
+	ep = smalloc(sizeof(Ep));
 	ep->ref = 1;
 	qlock(&epslck);
 	for(i = 0; i < Neps; i++)
@@ -454,7 +454,7 @@ newdev(Hci *hp, int ishub, int isroot)
 	Udev *d;
 
 	ep = epalloc(hp);
-	d = ep->dev = mallocz(sizeof(Udev), 1);
+	d = ep->dev = smalloc(sizeof(Udev));
 	d->nb = newusbid(hp);
 	d->eps[0] = ep;
 	ep->nb = 0;
@@ -666,7 +666,7 @@ hciprobe(int cardno, int ctlrno)
 	static int epnb = 1;	/* guess the endpoint nb. for the controller */
 
 	ddprint("hciprobe %d %d\n", cardno, ctlrno);
-	hp = mallocz(sizeof(Hci), 1);
+	hp = smalloc(sizeof(Hci));
 	hp->ctlrno = ctlrno;
 
 	if(cardno < 0)

sys/src/9/omap/usbehciomap.c

@@ -158,13 +158,12 @@ reset(Hci *hp)
 	if(getconf("*nousbehci") != nil || probeaddr(PHYSEHCI) < 0)
 		return -1;
 
-	ctlr = mallocz(sizeof(Ctlr), 1);
+	ctlr = smalloc(sizeof(Ctlr));
 	/*
 	 * don't bother with vmap; i/o space is all mapped anyway,
 	 * and a size less than 1MB will blow an assertion in mmukmap.
 	 */
 	ctlr->capio = capio = (Ecapio *)PHYSEHCI;
-//	ctlr->capio = capio = vmap(PHYSEHCI, 1024);
 	ctlr->opio = opio = (Eopio*)((uintptr)capio + (capio->cap & 0xff));
 
 	hp->aux = ctlr;

sys/src/9/pc/devusb.c

@@ -328,7 +328,7 @@ epalloc(Hci *hp)
 	Ep *ep;
 	int i;
 
-	ep = mallocz(sizeof(Ep), 1);
+	ep = smalloc(sizeof(Ep));
 	ep->ref = 1;
 	qlock(&epslck);
 	for(i = 0; i < Neps; i++)
@@ -454,7 +454,7 @@ newdev(Hci *hp, int ishub, int isroot)
 	Udev *d;
 
 	ep = epalloc(hp);
-	d = ep->dev = mallocz(sizeof(Udev), 1);
+	d = ep->dev = smalloc(sizeof(Udev));
 	d->nb = newusbid(hp);
 	d->eps[0] = ep;
 	ep->nb = 0;
@@ -666,7 +666,7 @@ hciprobe(int cardno, int ctlrno)
 	static int epnb = 1;	/* guess the endpoint nb. for the controller */
 
 	ddprint("hciprobe %d %d\n", cardno, ctlrno);
-	hp = mallocz(sizeof(Hci), 1);
+	hp = smalloc(sizeof(Hci));
 	hp->ctlrno = ctlrno;
 	hp->tbdf = BUSUNKNOWN;
 

sys/src/9/pc/usbehcipc.c

@@ -180,7 +180,7 @@ scanpci(void)
 		dprint("usbehci: %#x %#x: port %#lux size %#x irq %d\n",
 			p->vid, p->did, io, p->mem[0].size, p->intl);
 
-		ctlr = mallocz(sizeof(Ctlr), 1);
+		ctlr = smalloc(sizeof(Ctlr));
 		ctlr->pcidev = p;
 		capio = ctlr->capio = vmap(io, p->mem[0].size);
 		ctlr->opio = (Eopio*)((uintptr)capio + (capio->cap & 0xff));

sys/src/9/pc/usbohci.c

@@ -1479,16 +1479,18 @@ epio(Ep *ep, Qio *io, void *a, long count, int mustlock)
 	io->state = Qinstall;
 
 	c = a;
-	assert(a != nil);
 	ltd = td0 = ed->tds;
 	load = tot = 0;
 	do{
 		n = ep->maxpkt;
 		if(count-tot < n)
 			n = count-tot;
-		if(io->tok != Tdtokin)
+		if(io->tok != Tdtokin) {
+			if(c == nil)
+				panic("usbohci: epio: io->tok != Tdtokin && "
+					"a == nil");
 			td = epgettd(ep, io, &ltd, 0, c+tot, n);
-		else
+		} else
 			td = epgettd(ep, io, &ltd, 0, nil, n);
 		tot += n;
 		load += ep->load;
@@ -1533,6 +1535,9 @@ epio(Ep *ep, Qio *io, void *a, long count, int mustlock)
 			n = BLEN(td->bp);
 			tot += n;
 			if(tdtok(td) == Tdtokin && n > 0){
+				if(c == nil)
+					panic("usbohci: epio: tdtok(td) == "
+						"Tdtokin && n > 0 && c == nil");
 				memmove(c, td->bp->rp, n);
 				c += n;
 			}
@@ -1738,7 +1743,7 @@ epctlio(Ep *ep, Ctlio *cio, void *a, long count)
 		cio->tok = Tdtokin;
 	}
 	cio->toggle = Tddata1;
-	epio(ep, cio, nil, 0, 0);
+	epio(ep, cio, nil, 0, 0);	/* nil is bad; this can't be right */
 	qunlock(cio);
 	poperror();
 	ddeprint("epctlio cio %#p return %ld\n", cio, count);
@@ -2370,7 +2375,7 @@ scanpci(void)
 			continue;
 		}
 
-		ctlr = mallocz(sizeof(Ctlr), 1);
+		ctlr = smalloc(sizeof(Ctlr));
 		ctlr->pcidev = p;
 		ctlr->ohci = vmap(mem, p->mem[0].size);
 		dprint("scanpci: ctlr %#p, ohci %#p\n", ctlr, ctlr->ohci);

sys/src/9/pc/usbuhci.c

@@ -2112,7 +2112,7 @@ scanpci(void)
 		dprint("uhci: %#x %#x: port %#ux size %#x irq %d\n",
 			p->vid, p->did, io, p->mem[4].size, p->intl);
 
-		ctlr = mallocz(sizeof(Ctlr), 1);
+		ctlr = smalloc(sizeof(Ctlr));
 		ctlr->pcidev = p;
 		ctlr->port = io;
 		for(i = 0; i < Nhcis; i++)