Fix declarations to be more robust.

The old-school style initializations in the drivers in Plan 9 are
prone to error and confusion.

Thanks to Davide Libenzi for the sript to fix this.

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

sys/src/9/386/devether.c

@@ -515,22 +515,22 @@ ethercrc(uint8_t *p, int len)
 }
 
 Dev etherdevtab = {
-	'l',
-	"ether",
-
-	etherreset,
-	devinit,
-	ethershutdown,
-	etherattach,
-	etherwalk,
-	etherstat,
-	etheropen,
-	ethercreate,
-	etherclose,
-	etherread,
-	etherbread,
-	etherwrite,
-	etherbwrite,
-	devremove,
-	etherwstat,
+	.dc = 'l',
+	.name = "ether",
+
+	.reset = etherreset,
+	.init = devinit,
+	.shutdown = ethershutdown,
+	.attach = etherattach,
+	.walk = etherwalk,
+	.stat = etherstat,
+	.open = etheropen,
+	.create = ethercreate,
+	.close = etherclose,
+	.read = etherread,
+	.bread = etherbread,
+	.write = etherwrite,
+	.bwrite = etherbwrite,
+	.remove = devremove,
+	.wstat = etherwstat,
 };

sys/src/9/386/devrtc.c

@@ -314,24 +314,24 @@ rtcwrite(Chan* c, void* buf, int32_t n, int64_t off)
 }
 
 Dev rtcdevtab = {
-	'r',
-	"rtc",
-
-	devreset,
-	rtcinit,
-	devshutdown,
-	rtcattach,
-	rtcwalk,
-	rtcstat,
-	rtcopen,
-	devcreate,
-	rtcclose,
-	rtcread,
-	devbread,
-	rtcwrite,
-	devbwrite,
-	devremove,
-	devwstat,
+	.dc = 'r',
+	.name = "rtc",
+
+	.reset = devreset,
+	.init = rtcinit,
+	.shutdown = devshutdown,
+	.attach = rtcattach,
+	.walk = rtcwalk,
+	.stat = rtcstat,
+	.open = rtcopen,
+	.create = devcreate,
+	.close = rtcclose,
+	.read = rtcread,
+	.bread = devbread,
+	.write = rtcwrite,
+	.bwrite = devbwrite,
+	.remove = devremove,
+	.wstat = devwstat,
 };
 
 #define SEC2MIN 60L

sys/src/9/amd64/devacpi.c

@@ -1703,22 +1703,22 @@ acpiwrite(Chan *c, void *a, int32_t n, int64_t off)
 
 
 Dev acpidevtab = {
-	L'α',
-	"acpi",
-
-	devreset,
-	devinit,
-	devshutdown,
-	acpiattach,
-	acpiwalk,
-	acpistat,
-	acpiopen,
-	devcreate,
-	acpiclose,
-	acpiread,
-	devbread,
-	acpiwrite,
-	devbwrite,
-	devremove,
-	devwstat,
+	.dc = L'α',
+	.name = "acpi",
+
+	.reset = devreset,
+	.init = devinit,
+	.shutdown = devshutdown,
+	.attach = acpiattach,
+	.walk = acpiwalk,
+	.stat = acpistat,
+	.open = acpiopen,
+	.create = devcreate,
+	.close = acpiclose,
+	.read = acpiread,
+	.bread = devbread,
+	.write = acpiwrite,
+	.bwrite = devbwrite,
+	.remove = devremove,
+	.wstat = devwstat,
 };

sys/src/9/amd64/devarch.c

@@ -495,24 +495,24 @@ archwrite(Chan *c, void *a, int32_t n, int64_t offset)
 }
 
 Dev archdevtab = {
-	'P',
-	"arch",
-
-	devreset,
-	devinit,
-	devshutdown,
-	archattach,
-	archwalk,
-	archstat,
-	archopen,
-	devcreate,
-	archclose,
-	archread,
-	devbread,
-	archwrite,
-	devbwrite,
-	devremove,
-	devwstat,
+	.dc = 'P',
+	.name = "arch",
+
+	.reset = devreset,
+	.init = devinit,
+	.shutdown = devshutdown,
+	.attach = archattach,
+	.walk = archwalk,
+	.stat = archstat,
+	.open = archopen,
+	.create = devcreate,
+	.close = archclose,
+	.read = archread,
+	.bread = devbread,
+	.write = archwrite,
+	.bwrite = devbwrite,
+	.remove = devremove,
+	.wstat = devwstat,
 };
 
 /*

sys/src/9/amd64/deviig.c

@@ -176,22 +176,22 @@ iigwrite(Chan* c, void* a, int32_t n, int64_t off)
 }
 
 Dev iigdevtab = {
-	'G',
-	"iig",
-
-	iigreset,
-	devinit,
-	devshutdown,
-	iigattach,
-	iigwalk,
-	iigstat,
-	iigopen,
-	devcreate,
-	iigclose,
-	iigread,
-	devbread,
-	iigwrite,
-	devbwrite,
-	devremove,
-	devwstat,
+	.dc = 'G',
+	.name = "iig",
+
+	.reset = iigreset,
+	.init = devinit,
+	.shutdown = devshutdown,
+	.attach = iigattach,
+	.walk = iigwalk,
+	.stat = iigstat,
+	.open = iigopen,
+	.create = devcreate,
+	.close = iigclose,
+	.read = iigread,
+	.bread = devbread,
+	.write = iigwrite,
+	.bwrite = devbwrite,
+	.remove = devremove,
+	.wstat = devwstat,
 };

sys/src/9/amd64/devpmc.c

@@ -433,22 +433,22 @@ pmcwrite(Chan *c, void *a, int32_t n, int64_t mm)
 
 
 Dev pmcdevtab = {
-	L'ε',
-	"pmc",
-
-	pmcinit,
-	devinit,
-	devshutdown,
-	pmcattach,
-	pmcwalk,
-	pmcstat,
-	pmcopen,
-	devcreate,
-	pmcclose,
-	pmcread,
-	devbread,
-	pmcwrite,
-	devbwrite,
-	devremove,
-	devwstat,
+	.dc = L'ε',
+	.name = "pmc",
+
+	.reset = pmcinit,
+	.init = devinit,
+	.shutdown = devshutdown,
+	.attach = pmcattach,
+	.walk = pmcwalk,
+	.stat = pmcstat,
+	.open = pmcopen,
+	.create = devcreate,
+	.close = pmcclose,
+	.read = pmcread,
+	.bread = devbread,
+	.write = pmcwrite,
+	.bwrite = devbwrite,
+	.remove = devremove,
+	.wstat = devwstat,
 };

sys/src/9/amd64/devusb.c

@@ -1477,22 +1477,22 @@ usbshutdown(void)
 }
 
 Dev usbdevtab = {
-	L'u',
-	"usb",
-
-	usbreset,
-	usbinit,
-	usbshutdown,
-	usbattach,
-	usbwalk,
-	usbstat,
-	usbopen,
-	devcreate,
-	usbclose,
-	usbread,
-	devbread,
-	usbwrite,
-	devbwrite,
-	devremove,
-	devwstat,
+	.dc = L'u',
+	.name = "usb",
+
+	.reset = usbreset,
+	.init = usbinit,
+	.shutdown = usbshutdown,
+	.attach = usbattach,
+	.walk = usbwalk,
+	.stat = usbstat,
+	.open = usbopen,
+	.create = devcreate,
+	.close = usbclose,
+	.read = usbread,
+	.bread = devbread,
+	.write = usbwrite,
+	.bwrite = devbwrite,
+	.remove = devremove,
+	.wstat = devwstat,
 };

sys/src/9/amd64/devvga.c

@@ -517,22 +517,22 @@ vgawrite(Chan* c, void* a, int32_t n, int64_t off)
 }
 
 Dev vgadevtab = {
-	'v',
-	"vga",
-
-	vgareset,
-	devinit,
-	devshutdown,
-	vgaattach,
-	vgawalk,
-	vgastat,
-	vgaopen,
-	devcreate,
-	vgaclose,
-	vgaread,
-	devbread,
-	vgawrite,
-	devbwrite,
-	devremove,
-	devwstat,
+	.dc = 'v',
+	.name = "vga",
+
+	.reset = vgareset,
+	.init = devinit,
+	.shutdown = devshutdown,
+	.attach = vgaattach,
+	.walk = vgawalk,
+	.stat = vgastat,
+	.open = vgaopen,
+	.create = devcreate,
+	.close = vgaclose,
+	.read = vgaread,
+	.bread = devbread,
+	.write = vgawrite,
+	.bwrite = devbwrite,
+	.remove = devremove,
+	.wstat = devwstat,
 };

sys/src/9/ip/devip.c

@@ -1232,24 +1232,24 @@ ipbwrite(Chan* ch, Block* bp, int64_t offset)
 }
 
 Dev ipdevtab = {
-	'I',
-	"ip",
-
-	ipreset,
-	devinit,
-	devshutdown,
-	ipattach,
-	ipwalk,
-	ipstat,
-	ipopen,
-	ipcreate,
-	ipclose,
-	ipread,
-	ipbread,
-	ipwrite,
-	ipbwrite,
-	ipremove,
-	ipwstat,
+	.dc = 'I',
+	.name = "ip",
+
+	.reset = ipreset,
+	.init = devinit,
+	.shutdown = devshutdown,
+	.attach = ipattach,
+	.walk = ipwalk,
+	.stat = ipstat,
+	.open = ipopen,
+	.create = ipcreate,
+	.close = ipclose,
+	.read = ipread,
+	.bread = ipbread,
+	.write = ipwrite,
+	.bwrite = ipbwrite,
+	.remove = ipremove,
+	.wstat = ipwstat,
 };
 
 int

sys/src/9/port/devcap.c

@@ -275,22 +275,22 @@ capwrite(Chan *c, void *va, int32_t n, int64_t m)
 }
 
 Dev capdevtab = {
-	L'¤',
-	"cap",
-
-	devreset,
-	devinit,
-	devshutdown,
-	capattach,
-	capwalk,
-	capstat,
-	capopen,
-	devcreate,
-	capclose,
-	capread,
-	devbread,
-	capwrite,
-	devbwrite,
-	capremove,
-	devwstat
+	.dc = L'¤',
+	.name = "cap",
+
+	.reset = devreset,
+	.init = devinit,
+	.shutdown = devshutdown,
+	.attach = capattach,
+	.walk = capwalk,
+	.stat = capstat,
+	.open = capopen,
+	.create = devcreate,
+	.close = capclose,
+	.read = capread,
+	.bread = devbread,
+	.write = capwrite,
+	.bwrite = devbwrite,
+	.remove = capremove,
+	.wstat = devwstat
 };

sys/src/9/port/devcec.c

@@ -900,24 +900,24 @@ cecinit(void)
 }
 
 Dev cecdevtab = {
-	L'©',
-	"cec",
-
-	devreset,
-	cecinit,
-	devshutdown,
-	cecattach,
-	cecwalk,
-	cecstat,
-	cecopen,
-	devcreate,
-	cecclose,
-	cecread,
-	devbread,
-	cecwrite,
-	devbwrite,
-	devremove,
-	devwstat,
-	devpower,
-	devconfig,
+	.dc = L'©',
+	.name = "cec",
+
+	.reset = devreset,
+	.init = cecinit,
+	.shutdown = devshutdown,
+	.attach = cecattach,
+	.walk = cecwalk,
+	.stat = cecstat,
+	.open = cecopen,
+	.create = devcreate,
+	.close = cecclose,
+	.read = cecread,
+	.bread = devbread,
+	.write = cecwrite,
+	.bwrite = devbwrite,
+	.remove = devremove,
+	.wstat = devwstat,
+	.power = devpower,
+	.config = devconfig,
 };

sys/src/9/port/devcmd.c

@@ -730,22 +730,22 @@ cmdproc(void *a)
 #endif
 
 Dev cmddevtab = {
-	'C',
-	"cmd",
-
-	devreset,
-	cmdinit,
-	devshutdown,
-	cmdattach,
-	cmdwalk,
-	cmdstat,
-	cmdopen,
-	devcreate,
-	cmdclose,
-	cmdread,
-	devbread,
-	cmdwrite,
-	devbwrite,
-	devremove,
-	cmdwstat
+	.dc = 'C',
+	.name = "cmd",
+
+	.reset = devreset,
+	.init = cmdinit,
+	.shutdown = devshutdown,
+	.attach = cmdattach,
+	.walk = cmdwalk,
+	.stat = cmdstat,
+	.open = cmdopen,
+	.create = devcreate,
+	.close = cmdclose,
+	.read = cmdread,
+	.bread = devbread,
+	.write = cmdwrite,
+	.bwrite = devbwrite,
+	.remove = devremove,
+	.wstat = cmdwstat
 };

sys/src/9/port/devcons.c

@@ -842,24 +842,24 @@ conswrite(Chan *c, void *va, int32_t n, int64_t off)
 }
 
 Dev consdevtab = {
-	'c',
-	"cons",
-
-	devreset,
-	consinit,
-	devshutdown,
-	consattach,
-	conswalk,
-	consstat,
-	consopen,
-	devcreate,
-	consclose,
-	consread,
-	devbread,
-	conswrite,
-	devbwrite,
-	devremove,
-	devwstat,
+	.dc = 'c',
+	.name = "cons",
+
+	.reset = devreset,
+	.init = consinit,
+	.shutdown = devshutdown,
+	.attach = consattach,
+	.walk = conswalk,
+	.stat = consstat,
+	.open = consopen,
+	.create = devcreate,
+	.close = consclose,
+	.read = consread,
+	.bread = devbread,
+	.write = conswrite,
+	.bwrite = devbwrite,
+	.remove = devremove,
+	.wstat = devwstat,
 };
 
 static	uint32_t	randn;

sys/src/9/port/devcoreboot.c

@@ -411,23 +411,22 @@ corebootwrite(Chan *c, void *va, int32_t n, int64_t r)
 }
 
 Dev corebootdevtab = {
-	'Y',
-	"coreboot",
-
-	devreset,
-	corebootinit,
-	devshutdown,
-	corebootattach,
-	corebootwalk,
-	corebootstat,
-	corebootopen,
-	corebootcreate,
-	corebootclose,
-	corebootread,
-	devbread,
-	corebootwrite,
-	devbwrite,
-	devremove,
-	devwstat,
+	.dc = 'Y',
+	.name = "coreboot",
+
+	.reset = devreset,
+	.init = corebootinit,
+	.shutdown = devshutdown,
+	.attach = corebootattach,
+	.walk = corebootwalk,
+	.stat = corebootstat,
+	.open = corebootopen,
+	.create = corebootcreate,
+	.close = corebootclose,
+	.read = corebootread,
+	.bread = devbread,
+	.write = corebootwrite,
+	.bwrite = devbwrite,
+	.remove = devremove,
+	.wstat = devwstat,
 };
-

sys/src/9/port/devdraw.c

@@ -2121,24 +2121,24 @@ drawmesg(Client *client, void *av, int n)
 }
 
 Dev drawdevtab = {
-	'i',
-	"draw",
-
-	devreset,
-	devinit,
-	devshutdown,
-	drawattach,
-	drawwalk,
-	drawstat,
-	drawopen,
-	devcreate,
-	drawclose,
-	drawread,
-	devbread,
-	drawwrite,
-	devbwrite,
-	devremove,
-	devwstat,
+	.dc = 'i',
+	.name = "draw",
+
+	.reset = devreset,
+	.init = devinit,
+	.shutdown = devshutdown,
+	.attach = drawattach,
+	.walk = drawwalk,
+	.stat = drawstat,
+	.open = drawopen,
+	.create = devcreate,
+	.close = drawclose,
+	.read = drawread,
+	.bread = devbread,
+	.write = drawwrite,
+	.bwrite = devbwrite,
+	.remove = devremove,
+	.wstat = devwstat,
 };
 
 /*

sys/src/9/port/devdup.c

@@ -134,22 +134,22 @@ dupwrite(Chan* c, void* v, int32_t i, int64_t n)
 }
 
 Dev dupdevtab = {
-	'd',
-	"dup",
+	.dc = 'd',
+	.name = "dup",
 
-	devreset,
-	devinit,
-	devshutdown,
-	dupattach,
-	dupwalk,
-	dupstat,
-	dupopen,
-	devcreate,
-	dupclose,
-	dupread,
-	devbread,
-	dupwrite,
-	devbwrite,
-	devremove,
-	devwstat,
+	.reset = devreset,
+	.init = devinit,
+	.shutdown = devshutdown,
+	.attach = dupattach,
+	.walk = dupwalk,
+	.stat = dupstat,
+	.open = dupopen,
+	.create = devcreate,
+	.close = dupclose,
+	.read = dupread,
+	.bread = devbread,
+	.write = dupwrite,
+	.bwrite = devbwrite,
+	.remove = devremove,
+	.wstat = devwstat,
 };

sys/src/9/port/devenv.c

@@ -310,24 +310,24 @@ envwrite(Chan *c, void *a, int32_t n, int64_t off)
 }
 
 Dev envdevtab = {
-	'e',
-	"env",
-
-	devreset,
-	devinit,
-	devshutdown,
-	envattach,
-	envwalk,
-	envstat,
-	envopen,
-	envcreate,
-	envclose,
-	envread,
-	devbread,
-	envwrite,
-	devbwrite,
-	envremove,
-	devwstat,
+	.dc = 'e',
+	.name = "env",
+
+	.reset = devreset,
+	.init = devinit,
+	.shutdown = devshutdown,
+	.attach = envattach,
+	.walk = envwalk,
+	.stat = envstat,
+	.open = envopen,
+	.create = envcreate,
+	.close = envclose,
+	.read = envread,
+	.bread = devbread,
+	.write = envwrite,
+	.bwrite = devbwrite,
+	.remove = envremove,
+	.wstat = devwstat,
 };
 
 void

sys/src/9/port/devfdmux.c

@@ -545,22 +545,22 @@ fdmuxbwrite(Chan *c, Block *bp, int64_t mm)
 }
 
 Dev fdmuxdevtab = {
-	'<',
-	"fdmux",
-
-	devreset,
-	fdmuxinit,
-	devshutdown,
-	fdmuxattach,
-	fdmuxwalk,
-	fdmuxstat,
-	fdmuxopen,
-	devcreate,
-	fdmuxclose,
-	fdmuxread,
-	fdmuxbread,
-	fdmuxwrite,
-	fdmuxbwrite,
-	devremove,
-	devwstat,
+	.dc = '<',
+	.name = "fdmux",
+
+	.reset = devreset,
+	.init = fdmuxinit,
+	.shutdown = devshutdown,
+	.attach = fdmuxattach,
+	.walk = fdmuxwalk,
+	.stat = fdmuxstat,
+	.open = fdmuxopen,
+	.create = devcreate,
+	.close = fdmuxclose,
+	.read = fdmuxread,
+	.bread = fdmuxbread,
+	.write = fdmuxwrite,
+	.bwrite = fdmuxbwrite,
+	.remove = devremove,
+	.wstat = devwstat,
 };

sys/src/9/port/devkbin.c

@@ -99,22 +99,22 @@ kbinwrite(Chan *c, void *a, int32_t n, int64_t _)
 }
 
 Dev kbindevtab = {
-	L'Ι',
-	"kbin",
+	.dc = L'Ι',
+	.name = "kbin",
 
-	devreset,
-	devinit,
-	devshutdown,
-	kbinattach,
-	kbinwalk,
-	kbinstat,
-	kbinopen,
-	devcreate,
-	kbinclose,
-	kbinread,
-	devbread,
-	kbinwrite,
-	devbwrite,
-	devremove,
-	devwstat,
+	.reset = devreset,
+	.init = devinit,
+	.shutdown = devshutdown,
+	.attach = kbinattach,
+	.walk = kbinwalk,
+	.stat = kbinstat,
+	.open = kbinopen,
+	.create = devcreate,
+	.close = kbinclose,
+	.read = kbinread,
+	.bread = devbread,
+	.write = kbinwrite,
+	.bwrite = devbwrite,
+	.remove = devremove,
+	.wstat = devwstat,
 };

sys/src/9/port/devkexec.c

@@ -345,24 +345,24 @@ kexecwrite(Chan *c, void *a, int32_t n, int64_t off)
 }
 
 Dev kexecdevtab = {
-	L'§',
-	"kexec",
-
-	devreset,
-	devinit,
-	devshutdown,
-	kexecattach,
-	kexecwalk,
-	kexecstat,
-	kexecopen,
-	kexeccreate,
-	kexecclose,
-	kexecread,
-	devbread,
-	kexecwrite,
-	devbwrite,
-	kexecremove,
-	devwstat,
+	.dc = L'§',
+	.name = "kexec",
+
+	.reset = devreset,
+	.init = devinit,
+	.shutdown = devshutdown,
+	.attach = kexecattach,
+	.walk = kexecwalk,
+	.stat = kexecstat,
+	.open = kexecopen,
+	.create = kexeccreate,
+	.close = kexecclose,
+	.read = kexecread,
+	.bread = devbread,
+	.write = kexecwrite,
+	.bwrite = devbwrite,
+	.remove = kexecremove,
+	.wstat = devwstat,
 };
 
 void
@@ -415,4 +415,3 @@ kexecwriteable(Chan *c)
 {
 	return iseve() || c->aux == nil;
 }
-

sys/src/9/port/devkprof.c

@@ -216,22 +216,22 @@ kprofwrite(Chan *c, void *a, int32_t n, int64_t m)
 }
 
 Dev kprofdevtab = {
-	'K',
-	"kprof",
-
-	devreset,
-	kprofinit,
-	devshutdown,
-	kprofattach,
-	kprofwalk,
-	kprofstat,
-	kprofopen,
-	devcreate,
-	kprofclose,
-	kprofread,
-	devbread,
-	kprofwrite,
-	devbwrite,
-	devremove,
-	devwstat,
+	.dc = 'K',
+	.name = "kprof",
+
+	.reset = devreset,
+	.init = kprofinit,
+	.shutdown = devshutdown,
+	.attach = kprofattach,
+	.walk = kprofwalk,
+	.stat = kprofstat,
+	.open = kprofopen,
+	.create = devcreate,
+	.close = kprofclose,
+	.read = kprofread,
+	.bread = devbread,
+	.write = kprofwrite,
+	.bwrite = devbwrite,
+	.remove = devremove,
+	.wstat = devwstat,
 };

sys/src/9/port/devmnt.c

@@ -1251,22 +1251,22 @@ rpcattn(void *v)
 }
 
 Dev mntdevtab = {
-	'M',
-	"mnt",
-
-	mntreset,
-	devinit,
-	devshutdown,
-	mntattach,
-	mntwalk,
-	mntstat,
-	mntopen,
-	mntcreate,
-	mntclose,
-	mntread,
-	devbread,
-	mntwrite,
-	devbwrite,
-	mntremove,
-	mntwstat,
+	.dc = 'M',
+	.name = "mnt",
+
+	.reset = mntreset,
+	.init = devinit,
+	.shutdown = devshutdown,
+	.attach = mntattach,
+	.walk = mntwalk,
+	.stat = mntstat,
+	.open = mntopen,
+	.create = mntcreate,
+	.close = mntclose,
+	.read = mntread,
+	.bread = devbread,
+	.write = mntwrite,
+	.bwrite = devbwrite,
+	.remove = mntremove,
+	.wstat = mntwstat,
 };

sys/src/9/port/devmntn.c

@@ -499,22 +499,22 @@ mntchann(void)
 }
 
 Dev mntndevtab = {
-	'N',
-	"mntn",
-
-	mntreset,
-	devinit,
-	devshutdown,
-	mntattach,
-	mntwalk,
-	mntstat,
-	mntopen,
-	mntcreate,
-	mntclose,
-	mntread,
-	devbread,
-	mntwrite,
-	devbwrite,
-	mntremove,
-	mntwstat,
+	.dc = 'N',
+	.name = "mntn",
+
+	.reset = mntreset,
+	.init = devinit,
+	.shutdown = devshutdown,
+	.attach = mntattach,
+	.walk = mntwalk,
+	.stat = mntstat,
+	.open = mntopen,
+	.create = mntcreate,
+	.close = mntclose,
+	.read = mntread,
+	.bread = devbread,
+	.write = mntwrite,
+	.bwrite = devbwrite,
+	.remove = mntremove,
+	.wstat = mntwstat,
 };

sys/src/9/port/devmouse.c

@@ -480,24 +480,24 @@ mousewrite(Chan *c, void *va, int32_t n, int64_t r)
 }
 
 Dev mousedevtab = {
-	'm',
-	"mouse",
-
-	mousereset,
-	mouseinit,
-	devshutdown,
-	mouseattach,
-	mousewalk,
-	mousestat,
-	mouseopen,
-	mousecreate,
-	mouseclose,
-	mouseread,
-	devbread,
-	mousewrite,
-	devbwrite,
-	devremove,
-	devwstat,
+	.dc = 'm',
+	.name = "mouse",
+
+	.reset = mousereset,
+	.init = mouseinit,
+	.shutdown = devshutdown,
+	.attach = mouseattach,
+	.walk = mousewalk,
+	.stat = mousestat,
+	.open = mouseopen,
+	.create = mousecreate,
+	.close = mouseclose,
+	.read = mouseread,
+	.bread = devbread,
+	.write = mousewrite,
+	.bwrite = devbwrite,
+	.remove = devremove,
+	.wstat = devwstat,
 };
 
 void
@@ -775,4 +775,3 @@ mouseresize(void)
 	mouse.resize++;
 	wakeup(&mouse.rend);
 }
-

sys/src/9/port/devpci.c

@@ -246,22 +246,22 @@ pciwrite(Chan *c, void *va, int32_t n, int64_t offset)
 }
 
 Dev pcidevtab = {
-	'$',
-	"pci",
+	.dc = '$',
+	.name = "pci",
 
-	devreset,
-	devinit,
-	devshutdown,
-	pciattach,
-	pciwalk,
-	pcistat,
-	pciopen,
-	devcreate,
-	pciclose,
-	pciread,
-	devbread,
-	pciwrite,
-	devbwrite,
-	devremove,
-	devwstat,
+	.reset = devreset,
+	.init = devinit,
+	.shutdown = devshutdown,
+	.attach = pciattach,
+	.walk = pciwalk,
+	.stat = pcistat,
+	.open = pciopen,
+	.create = devcreate,
+	.close = pciclose,
+	.read = pciread,
+	.bread = devbread,
+	.write = pciwrite,
+	.bwrite = devbwrite,
+	.remove = devremove,
+	.wstat = devwstat,
 };

sys/src/9/port/devpipe.c

@@ -385,22 +385,22 @@ pipebwrite(Chan *c, Block *bp, int64_t mm)
 }
 
 Dev pipedevtab = {
-	'|',
-	"pipe",
-
-	devreset,
-	pipeinit,
-	devshutdown,
-	pipeattach,
-	pipewalk,
-	pipestat,
-	pipeopen,
-	devcreate,
-	pipeclose,
-	piperead,
-	pipebread,
-	pipewrite,
-	pipebwrite,
-	devremove,
-	devwstat,
+	.dc = '|',
+	.name = "pipe",
+
+	.reset = devreset,
+	.init = pipeinit,
+	.shutdown = devshutdown,
+	.attach = pipeattach,
+	.walk = pipewalk,
+	.stat = pipestat,
+	.open = pipeopen,
+	.create = devcreate,
+	.close = pipeclose,
+	.read = piperead,
+	.bread = pipebread,
+	.write = pipewrite,
+	.bwrite = pipebwrite,
+	.remove = devremove,
+	.wstat = devwstat,
 };

sys/src/9/port/devprobe.c

@@ -389,21 +389,21 @@ print("probeinstall in devprobe\n");
 }
 
 Dev probedevtab = {
-	'+',
-	"probe",
-	devreset,
-	devinit,
-	devshutdown,
-	probeattach,
-	probewalk,
-	probestat,
-	probeopen,
-	devcreate,
-	probeclose,
-	proberead,
-	devbread,
-	probewrite,
-	devbwrite,
-	devremove,
-	devwstat,
+	.dc = '+',
+	.name = "probe",
+	.reset = devreset,
+	.init = devinit,
+	.shutdown = devshutdown,
+	.attach = probeattach,
+	.walk = probewalk,
+	.stat = probestat,
+	.open = probeopen,
+	.create = devcreate,
+	.close = probeclose,
+	.read = proberead,
+	.bread = devbread,
+	.write = probewrite,
+	.bwrite = devbwrite,
+	.remove = devremove,
+	.wstat = devwstat,
 };

sys/src/9/port/devproc.c

@@ -1423,24 +1423,24 @@ procwrite(Chan *c, void *va, int32_t n, int64_t off)
 }
 
 Dev procdevtab = {
-	'p',
-	"proc",
-
-	devreset,
-	procinit,
-	devshutdown,
-	procattach,
-	procwalk,
-	procstat,
-	procopen,
-	devcreate,
-	procclose,
-	procread,
-	devbread,
-	procwrite,
-	devbwrite,
-	devremove,
-	procwstat,
+	.dc = 'p',
+	.name = "proc",
+
+	.reset = devreset,
+	.init = procinit,
+	.shutdown = devshutdown,
+	.attach = procattach,
+	.walk = procwalk,
+	.stat = procstat,
+	.open = procopen,
+	.create = devcreate,
+	.close = procclose,
+	.read = procread,
+	.bread = devbread,
+	.write = procwrite,
+	.bwrite = devbwrite,
+	.remove = devremove,
+	.wstat = procwstat,
 };
 
 static Chan*

sys/src/9/port/devregress.c

@@ -134,23 +134,22 @@ regresswrite(Chan *c, void *a, int32_t n, int64_t offset)
 }
 
 Dev regressdevtab = {
-	'Z',
-	"regress",
-
-	devreset,
-	devinit,
-	devshutdown,
-	regressattach,
-	regresswalk,
-	regressstat,
-	regressopen,
-	devcreate,
-	regressclose,
-	regressread,
-	devbread,
-	regresswrite,
-	devbwrite,
-	devremove,
-	devwstat,
+	.dc = 'Z',
+	.name = "regress",
+
+	.reset = devreset,
+	.init = devinit,
+	.shutdown = devshutdown,
+	.attach = regressattach,
+	.walk = regresswalk,
+	.stat = regressstat,
+	.open = regressopen,
+	.create = devcreate,
+	.close = regressclose,
+	.read = regressread,
+	.bread = devbread,
+	.write = regresswrite,
+	.bwrite = devbwrite,
+	.remove = devremove,
+	.wstat = devwstat,
 };
-

sys/src/9/port/devroot.c

@@ -243,23 +243,22 @@ rootwrite(Chan* c, void* v, int32_t n, int64_t m)
 }
 
 Dev rootdevtab = {
-	'/',
-	"root",
+	.dc = '/',
+	.name = "root",
 
-	rootreset,
-	devinit,
-	devshutdown,
-	rootattach,
-	rootwalk,
-	rootstat,
-	rootopen,
-	devcreate,
-	rootclose,
-	rootread,
-	devbread,
-	rootwrite,
-	devbwrite,
-	devremove,
-	devwstat,
+	.reset = rootreset,
+	.init = devinit,
+	.shutdown = devshutdown,
+	.attach = rootattach,
+	.walk = rootwalk,
+	.stat = rootstat,
+	.open = rootopen,
+	.create = devcreate,
+	.close = rootclose,
+	.read = rootread,
+	.bread = devbread,
+	.write = rootwrite,
+	.bwrite = devbwrite,
+	.remove = devremove,
+	.wstat = devwstat,
 };
-

sys/src/9/port/devsd.c

@@ -1525,26 +1525,26 @@ sdconfig(int on, char* spec, DevConf* cf)
 }
 
 Dev sddevtab = {
-	'S',
-	"sd",
-
-	sdreset,
-	devinit,
-	devshutdown,
-	sdattach,
-	sdwalk,
-	sdstat,
-	sdopen,
-	devcreate,
-	sdclose,
-	sdread,
-	devbread,
-	sdwrite,
-	devbwrite,
-	devremove,
-	sdwstat,
-	devpower,
-	sdconfig,	/* probe; only called for pcmcia-like devices */
+	.dc = 'S',
+	.name = "sd",
+
+	.reset = sdreset,
+	.init = devinit,
+	.shutdown = devshutdown,
+	.attach = sdattach,
+	.walk = sdwalk,
+	.stat = sdstat,
+	.open = sdopen,
+	.create = devcreate,
+	.close = sdclose,
+	.read = sdread,
+	.bread = devbread,
+	.write = sdwrite,
+	.bwrite = devbwrite,
+	.remove = devremove,
+	.wstat = sdwstat,
+	.power = devpower,
+	.config = sdconfig,	/* probe; only called for pcmcia-like devices */
 };
 
 /*

sys/src/9/port/devsegment.c

@@ -763,23 +763,22 @@ segmentkproc(void *arg)
 }
 
 Dev segmentdevtab = {
-	'g',
-	"segment",
-
-	devreset,
-	segmentinit,
-	devshutdown,
-	segmentattach,
-	segmentwalk,
-	segmentstat,
-	segmentopen,
-	segmentcreate,
-	segmentclose,
-	segmentread,
-	devbread,
-	segmentwrite,
-	devbwrite,
-	segmentremove,
-	segmentwstat,
+	.dc = 'g',
+	.name = "segment",
+
+	.reset = devreset,
+	.init = segmentinit,
+	.shutdown = devshutdown,
+	.attach = segmentattach,
+	.walk = segmentwalk,
+	.stat = segmentstat,
+	.open = segmentopen,
+	.create = segmentcreate,
+	.close = segmentclose,
+	.read = segmentread,
+	.bread = devbread,
+	.write = segmentwrite,
+	.bwrite = devbwrite,
+	.remove = segmentremove,
+	.wstat = segmentwstat,
 };
-

sys/src/9/port/devsrv.c

@@ -365,22 +365,22 @@ srvwrite(Chan *c, void *va, int32_t n, int64_t mm)
 }
 
 Dev srvdevtab = {
-	's',
-	"srv",
-
-	devreset,
-	srvinit,
-	devshutdown,
-	srvattach,
-	srvwalk,
-	srvstat,
-	srvopen,
-	srvcreate,
-	srvclose,
-	srvread,
-	devbread,
-	srvwrite,
-	devbwrite,
-	srvremove,
-	srvwstat,
+	.dc = 's',
+	.name = "srv",
+
+	.reset = devreset,
+	.init = srvinit,
+	.shutdown = devshutdown,
+	.attach = srvattach,
+	.walk = srvwalk,
+	.stat = srvstat,
+	.open = srvopen,
+	.create = srvcreate,
+	.close = srvclose,
+	.read = srvread,
+	.bread = devbread,
+	.write = srvwrite,
+	.bwrite = devbwrite,
+	.remove = srvremove,
+	.wstat = srvwstat,
 };

sys/src/9/port/devssl.c

@@ -1252,24 +1252,24 @@ sslinit(void)
 }
 
 Dev ssldevtab = {
-	'D',
-	"ssl",
-
-	devreset,
-	sslinit,
-	devshutdown,
-	sslattach,
-	sslwalk,
-	sslstat,
-	sslopen,
-	devcreate,
-	sslclose,
-	sslread,
-	sslbread,
-	sslwrite,
-	sslbwrite,
-	devremove,
-	sslwstat,
+	.dc = 'D',
+	.name = "ssl",
+
+	.reset = devreset,
+	.init = sslinit,
+	.shutdown = devshutdown,
+	.attach = sslattach,
+	.walk = sslwalk,
+	.stat = sslstat,
+	.open = sslopen,
+	.create = devcreate,
+	.close = sslclose,
+	.read = sslread,
+	.bread = sslbread,
+	.write = sslwrite,
+	.bwrite = sslbwrite,
+	.remove = devremove,
+	.wstat = sslwstat,
 };
 
 static Block*

sys/src/9/port/devtls.c

@@ -1765,24 +1765,24 @@ tlsinit(void)
 }
 
 Dev tlsdevtab = {
-	'a',
-	"tls",
-
-	devreset,
-	tlsinit,
-	devshutdown,
-	tlsattach,
-	tlswalk,
-	tlsstat,
-	tlsopen,
-	devcreate,
-	tlsclose,
-	tlsread,
-	tlsbread,
-	tlswrite,
-	tlsbwrite,
-	devremove,
-	tlswstat,
+	.dc = 'a',
+	.name = "tls",
+
+	.reset = devreset,
+	.init = tlsinit,
+	.shutdown = devshutdown,
+	.attach = tlsattach,
+	.walk = tlswalk,
+	.stat = tlsstat,
+	.open = tlsopen,
+	.create = devcreate,
+	.close = tlsclose,
+	.read = tlsread,
+	.bread = tlsbread,
+	.write = tlswrite,
+	.bwrite = tlsbwrite,
+	.remove = devremove,
+	.wstat = tlswstat,
 };
 
 /* get channel associated with an fd */

sys/src/9/port/devtrace.c

@@ -883,21 +883,21 @@ tracewrite(Chan *c, void *a, int32_t n, int64_t mm)
 }
 
 Dev tracedevtab = {
-	'T',
-	"trace",
-	devreset,
-	devinit,
-	devshutdown,
-	traceattach,
-	tracewalk,
-	tracestat,
-	traceopen,
-	devcreate,
-	traceclose,
-	traceread,
-	devbread,
-	tracewrite,
-	devbwrite,
-	devremove,
-	devwstat,
+	.dc = 'T',
+	.name = "trace",
+	.reset = devreset,
+	.init = devinit,
+	.shutdown = devshutdown,
+	.attach = traceattach,
+	.walk = tracewalk,
+	.stat = tracestat,
+	.open = traceopen,
+	.create = devcreate,
+	.close = traceclose,
+	.read = traceread,
+	.bread = devbread,
+	.write = tracewrite,
+	.bwrite = devbwrite,
+	.remove = devremove,
+	.wstat = devwstat,
 };

sys/src/9/port/devuart.c

@@ -546,25 +546,25 @@ uartpower(int on)
 }
 
 Dev uartdevtab = {
-	't',
-	"uart",
-
-	uartreset,
-	devinit,
-	devshutdown,
-	uartattach,
-	uartwalk,
-	uartstat,
-	uartopen,
-	devcreate,
-	uartclose,
-	uartread,
-	devbread,
-	uartwrite,
-	devbwrite,
-	devremove,
-	uartwstat,
-	uartpower,
+	.dc = 't',
+	.name = "uart",
+
+	.reset = uartreset,
+	.init = devinit,
+	.shutdown = devshutdown,
+	.attach = uartattach,
+	.walk = uartwalk,
+	.stat = uartstat,
+	.open = uartopen,
+	.create = devcreate,
+	.close = uartclose,
+	.read = uartread,
+	.bread = devbread,
+	.write = uartwrite,
+	.bwrite = devbwrite,
+	.remove = devremove,
+	.wstat = uartwstat,
+	.power = uartpower,
 };
 
 /*

sys/src/9/port/devwd.c

@@ -131,23 +131,23 @@ wdwrite(Chan* c, void* a, int32_t n, int64_t off)
 }
 
 Dev wddevtab = {
-	'w',
-	"watchdog",
-
-	devreset,
-	devinit,
-	devshutdown,
-	wdattach,
-	wdwalk,
-	wdstat,
-	wdopen,
-	devcreate,
-	wdclose,
-	wdread,
-	devbread,
-	wdwrite,
-	devbwrite,
-	devremove,
-	devwstat,
-	devpower,
+	.dc = 'w',
+	.name = "watchdog",
+
+	.reset = devreset,
+	.init = devinit,
+	.shutdown = devshutdown,
+	.attach = wdattach,
+	.walk = wdwalk,
+	.stat = wdstat,
+	.open = wdopen,
+	.create = devcreate,
+	.close = wdclose,
+	.read = wdread,
+	.bread = devbread,
+	.write = wdwrite,
+	.bwrite = devbwrite,
+	.remove = devremove,
+	.wstat = devwstat,
+	.power = devpower,
 };

sys/src/9/port/devws.c

@@ -161,22 +161,22 @@ wswrite(Chan *c, void *a, int32_t n, int64_t m)
 }
 
 Dev wsdevtab = {
-	'W',
-	"waitstats",
-
-	devreset,
-	devinit,
-	devshutdown,
-	wsattach,
-	wswalk,
-	wsstat,
-	wsopen,
-	devcreate,
-	wsclose,
-	wsread,
-	devbread,
-	wswrite,
-	devbwrite,
-	devremove,
-	devwstat,
+	.dc = 'W',
+	.name = "waitstats",
+
+	.reset = devreset,
+	.init = devinit,
+	.shutdown = devshutdown,
+	.attach = wsattach,
+	.walk = wswalk,
+	.stat = wsstat,
+	.open = wsopen,
+	.create = devcreate,
+	.close = wsclose,
+	.read = wsread,
+	.bread = devbread,
+	.write = wswrite,
+	.bwrite = devbwrite,
+	.remove = devremove,
+	.wstat = devwstat,
 };

sys/src/9/port/devzp.c

@@ -581,26 +581,26 @@ zpzwrite(Chan *c, Kzio io[], int nio, int64_t mm)
 
 
 Dev zpdevtab = {
-	L'∏',
-	"zp",
-
-	devreset,
-	devinit,
-	devshutdown,
-	zpattach,
-	zpwalk,
-	zpstat,
-	zpopen,
-	devcreate,
-	zpclose,
-	zpread,
-	devbread,
-	zpwrite,
-	devbwrite,
-	devremove,
-	devwstat,
-	nil,		/* power */
-	nil,		/* config */
-	zpzread,
-	zpzwrite,
+	.dc = L'∏',
+	.name = "zp",
+
+	.reset = devreset,
+	.init = devinit,
+	.shutdown = devshutdown,
+	.attach = zpattach,
+	.walk = zpwalk,
+	.stat = zpstat,
+	.open = zpopen,
+	.create = devcreate,
+	.close = zpclose,
+	.read = zpread,
+	.bread = devbread,
+	.write = zpwrite,
+	.bwrite = devbwrite,
+	.remove = devremove,
+	.wstat = devwstat,
+	.power = nil,		/* power */
+	.config = nil,		/* config */
+	.zread = zpzread,
+	.zwrite = zpzwrite,
 };

util/fixinit.pl

@@ -0,0 +1,121 @@
+#!/usr/bin/perl -w
+
+use strict;
+use Getopt::Long;
+
+my $file_list;
+my $dry_run = 0;
+
+GetOptions("list-file|l=s"		=> \$file_list,
+		   "dry-run|d"			=> \$dry_run)
+	or die("Error in command line arguments\n");
+
+my @files = @ARGV;
+
+if (defined($file_list)) {
+	die("Unable to open file: " . $file_list) if (!open(FLIST, $file_list));
+
+	while (<FLIST>) {
+		chomp;
+		push(@files, $_);
+	}
+	close(FLIST);
+}
+
+my $matched = 0;
+
+foreach my $ifile (@files) {
+	my $ofile = $ifile . "._tmp_";
+	my $result = process_file($ifile, $ofile);
+
+	if ($result > 0) {
+		print "File match: " . $ifile . "\n";
+		$matched++;
+
+		rename($ofile, $ifile) if (!$dry_run);
+	} else {
+		print "File mismatch: " . $ifile . "\n";
+	}
+}
+print "Matched " . $matched . " file(s) out of " . scalar(@files) . "\n";
+
+exit(0);
+
+
+sub process_file {
+	my ($ifile, $ofile) = @_;
+
+	if (!open(ISF, $ifile)) {
+		print STDERR "Unable to open file: " . $ifile . "\n";
+		return -1;
+	}
+
+	my @lines = <ISF>;
+
+	close(ISF);
+
+	my $num_lines = scalar(@lines);
+
+	while ($num_lines > 0) {
+		last if ($lines[$num_lines - 1] !~ /^\s*[\r\n]*$/);
+		$num_lines--;
+	}
+
+	my $matched = 0;
+	my $indev = -1;
+	my @labels = (
+	        '.dc',
+		'.name',
+		'.reset',
+		'.init',
+		'.shutdown',
+		'.attach',
+		'.walk',
+		'.stat',
+		'.open',
+		'.create',
+		'.close',
+		'.read',
+		'.bread',
+		'.write',
+		'.bwrite',
+		'.remove',
+		'.wstat',
+		'.power',
+		'.config',
+		'.zread',
+		'.zwrite',
+		);
+
+	for (my $i = 0; $i < $num_lines; $i++) {
+		my $ln = $lines[$i];
+
+		next if ($ln =~ /^\s*[\r\n]*$/);
+		if ($ln =~ /^\s*Dev\s+.*tab.*\{/) {
+			$indev = 0;
+		} elsif ($indev >= 0) {
+			if ($ln =~ /^\s*\};/ || $ln =~/^\s*\./) {
+				$indev = -1;
+			} elsif ($ln =~ /^\s*([^\s].*)$/){
+				$lines[$i] = "\t" . $labels[$indev] . " = " . $1 . "\n";
+				$indev++;
+				$matched++;
+			}
+		}
+	}
+	if (!$dry_run) {
+		if ($matched) {
+			die("Unable to create file: " . $ofile) if (!open(OSF, ">" . $ofile));
+
+			for (my $i = 0; $i < $num_lines; $i++) {
+				print OSF $lines[$i];
+			}
+
+			close(OSF);
+		}
+	}
+
+	return $matched;
+}
+
+