Re: [9front] [PATCH] Fix nusb/audio /dev entries

[Arne Meyer <meyer.arne83@netcologne.de>]

[-- Attachment #1: Type: text/plain, Size: 274 bytes --]

Ok,

how about this? Bring audio more in line with the rest of nusb. Postfix all
the device nodes with U<hname> so we can have as much usb audio devices as we like
and are not dependent on bind order. 
The nusbaudio script can be put in termrc to provide the "old" behavior.

[-- Attachment #2: nusbaudio.patch --]
[-- Type: application/octet-stream, Size: 1430 bytes --]

diff 34e7b54c139826b55713702910a1280e6651df60 uncommitted
--- /dev/null
+++ b/rc/bin/nusbaudio
@@ -1,0 +1,28 @@
+#!/bin/rc
+
+if(! test -e /dev/audio)
+	aux/stub /dev/audio
+if(! test -e /dev/volume)
+	aux/stub /dev/volume
+
+@{
+	rfork e
+	fn attach {
+		switch($4){
+		case *01
+			sleep 2
+			bind /dev/audioU$5 /dev/audio
+			bind /dev/volumeU$5 /dev/volume
+		}
+	}
+
+	fn detach {
+		switch($4){
+		case *01
+			unmount /dev/audio
+			unmount /dev/volume
+		}
+	}
+
+	rc < '#σ/usb/usbevent' &
+}
--- a/sys/src/cmd/nusb/audio/audio.c
+++ b/sys/src/cmd/nusb/audio/audio.c
@@ -365,6 +365,7 @@
 	int dir = e->dir;
 	Aconf *c;
 	Range *f;
+	char buf[32];
 
 	for(;e != nil; e = e->next){
 		c = e->iface->aux;
@@ -395,9 +396,12 @@
 	devctl(d, "sampledelay %d", audiodelay);
 	devctl(d, "hz %d", speed);
 	if(e->dir==Ein)
-		devctl(d, "name audioin");
+		snprint(buf, sizeof buf, "name audioinU%s", audiodev->hname); 
 	else
-		devctl(d, "name audio");
+		snprint(buf, sizeof buf, "name audioU%s", audiodev->hname);
+	
+	devctl(d, buf);
+
 	return d;
 }
 
@@ -549,7 +553,8 @@
 		sysfatal("no output stream found");
 
 	fs.tree = alloctree(user, "usb", DMDIR|0555, nil);
-	createfile(fs.tree->root, "volume", user, 0666, nil);
+	snprint(buf, sizeof buf, "volumeU%s", audiodev->hname);
+	createfile(fs.tree->root, buf, user, 0666, nil);
 
 	snprint(buf, sizeof buf, "%d.audio", audiodev->id);
 	postsharesrv(&fs, nil, "usb", buf);