sys: improve /dev/snd/seq and /dev/snd/timer descriptions

5 files changed, 58 insertions, 14 deletions

diff --git a/sys/sndseq.txt b/sys/sndseq.txt
index 40ad7118d..7240e9ca0 100644
--- a/sys/sndseq.txt
+++ b/sys/sndseq.txt
@@ -50,6 +50,14 @@ snd_seq_port_flags = SNDRV_SEQ_PORT_FLG_GIVEN_PORT, SNDRV_SEQ_PORT_FLG_TIMESTAMP
 snd_seq_sub_flags = SNDRV_SEQ_PORT_SUBS_EXCLUSIVE, SNDRV_SEQ_PORT_SUBS_TIMESTAMP, SNDRV_SEQ_PORT_SUBS_TIME_REAL
 snd_seq_timer_type = SNDRV_SEQ_TIMER_ALSA, SNDRV_SEQ_TIMER_MIDI_CLOCK, SNDRV_SEQ_TIMER_MIDI_TICK
 snd_seq_remove_mode = SNDRV_SEQ_REMOVE_INPUT, SNDRV_SEQ_REMOVE_OUTPUT, SNDRV_SEQ_REMOVE_DEST, SNDRV_SEQ_REMOVE_DEST_CHANNEL, SNDRV_SEQ_REMOVE_TIME_BEFORE, SNDRV_SEQ_REMOVE_TIME_AFTER, SNDRV_SEQ_REMOVE_TIME_TICK, SNDRV_SEQ_REMOVE_EVENT_TYPE, SNDRV_SEQ_REMOVE_IGNORE_OFF, SNDRV_SEQ_REMOVE_TAG_MATCH
+snd_timer_class = SNDRV_TIMER_CLASS_NONE, SNDRV_TIMER_CLASS_SLAVE, SNDRV_TIMER_CLASS_GLOBAL, SNDRV_TIMER_CLASS_CARD, SNDRV_TIMER_CLASS_PCM
+snd_timer_sclass = SNDRV_TIMER_SCLASS_NONE, SNDRV_TIMER_SCLASS_APPLICATION, SNDRV_TIMER_SCLASS_SEQUENCER, SNDRV_TIMER_SCLASS_OSS_SEQUENCER
+snd_timer_dev = SNDRV_TIMER_GLOBAL_SYSTEM, SNDRV_TIMER_GLOBAL_RTC, SNDRV_TIMER_GLOBAL_HPET, SNDRV_TIMER_GLOBAL_HRTIMER
+snd_seq_subs_type = SNDRV_SEQ_QUERY_SUBS_READ, SNDRV_SEQ_QUERY_SUBS_WRITE
+
+snd_seq_client_name = "client0", "client1"
+snd_seq_port_name = "port0", "port1"
+snd_seq_queue_name = "queue0", "queue1"
 
 snd_seq_system_info {
 	queues	int32
@@ -72,8 +80,7 @@ snd_seq_running_info {
 snd_seq_client_info {
 	client	int32
 	type	flags[snd_seq_client_type, int32]
-#TODO: need something like fixed-size embeded string.
-	name	array[int8, 64]
+	name	string[snd_seq_client_name, 64]
 	filter	flags[snd_seq_filter, int32]
 	mfilt	array[int8, 8]
 	evfilt	array[int8, 32]
@@ -84,8 +91,7 @@ snd_seq_client_info {
 
 snd_seq_port_info {
 	addr	snd_seq_addr
-#TODO: need something like fixed-size embeded string.
-	name	array[int8, 64]
+	name	string[snd_seq_port_name, 64]
 	cap	flags[snd_seq_port_cap, int32]
 	type	flags[snd_seq_port_type, int32]
 	chans	int32
@@ -113,8 +119,7 @@ snd_seq_queue_info {
 	queue	int32
 	owner	int32
 	locked	int32
-#TODO: need something like fixed-size embeded string.
-	name	array[int8, 64]
+	name	string[snd_seq_queue_name, 64]
 	flags	int32
 	pad	array[const[0, int8], 60]
 }
@@ -137,10 +142,10 @@ snd_seq_queue_timer {
 }
 
 snd_timer_id {
-	class	int32
-	subcl	int32
+	class	flags[snd_timer_class, int32]
+	sclass	flags[snd_timer_sclass, int32]
 	card	int32
-	dev	int32
+	dev	flags[snd_timer_dev, int32]
 	subdev	int32
 }
 
@@ -172,8 +177,6 @@ snd_seq_remove_events {
 	pad	array[const[0, int32], 10]
 }
 
-snd_seq_subs_type = SNDRV_SEQ_QUERY_SUBS_READ, SNDRV_SEQ_QUERY_SUBS_WRITE
-
 snd_seq_query_subs {
 	root	snd_seq_addr
 	type	flags[snd_seq_subs_type, int32]
diff --git a/sys/sndseq_amd64.const b/sys/sndseq_amd64.const
index 844ee6a72..d2f86a0b7 100644
--- a/sys/sndseq_amd64.const
+++ b/sys/sndseq_amd64.const
@@ -80,6 +80,19 @@ SNDRV_SEQ_REMOVE_TIME_TICK = 64
 SNDRV_SEQ_TIMER_ALSA = 0
 SNDRV_SEQ_TIMER_MIDI_CLOCK = 1
 SNDRV_SEQ_TIMER_MIDI_TICK = 2
+SNDRV_TIMER_CLASS_CARD = 2
+SNDRV_TIMER_CLASS_GLOBAL = 1
+SNDRV_TIMER_CLASS_NONE = 18446744073709551615
+SNDRV_TIMER_CLASS_PCM = 3
+SNDRV_TIMER_CLASS_SLAVE = 0
+SNDRV_TIMER_GLOBAL_HPET = 2
+SNDRV_TIMER_GLOBAL_HRTIMER = 3
+SNDRV_TIMER_GLOBAL_RTC = 1
+SNDRV_TIMER_GLOBAL_SYSTEM = 0
+SNDRV_TIMER_SCLASS_APPLICATION = 1
+SNDRV_TIMER_SCLASS_NONE = 0
+SNDRV_TIMER_SCLASS_OSS_SEQUENCER = 3
+SNDRV_TIMER_SCLASS_SEQUENCER = 2
 USER_CLIENT = 1
 __NR_ioctl = 16
 __NR_write = 1
diff --git a/sys/sndseq_arm64.const b/sys/sndseq_arm64.const
index fd81f0154..c6be95681 100644
--- a/sys/sndseq_arm64.const
+++ b/sys/sndseq_arm64.const
@@ -80,6 +80,19 @@ SNDRV_SEQ_REMOVE_TIME_TICK = 64
 SNDRV_SEQ_TIMER_ALSA = 0
 SNDRV_SEQ_TIMER_MIDI_CLOCK = 1
 SNDRV_SEQ_TIMER_MIDI_TICK = 2
+SNDRV_TIMER_CLASS_CARD = 2
+SNDRV_TIMER_CLASS_GLOBAL = 1
+SNDRV_TIMER_CLASS_NONE = 18446744073709551615
+SNDRV_TIMER_CLASS_PCM = 3
+SNDRV_TIMER_CLASS_SLAVE = 0
+SNDRV_TIMER_GLOBAL_HPET = 2
+SNDRV_TIMER_GLOBAL_HRTIMER = 3
+SNDRV_TIMER_GLOBAL_RTC = 1
+SNDRV_TIMER_GLOBAL_SYSTEM = 0
+SNDRV_TIMER_SCLASS_APPLICATION = 1
+SNDRV_TIMER_SCLASS_NONE = 0
+SNDRV_TIMER_SCLASS_OSS_SEQUENCER = 3
+SNDRV_TIMER_SCLASS_SEQUENCER = 2
 USER_CLIENT = 1
 __NR_ioctl = 29
 __NR_write = 64
diff --git a/sys/sndseq_ppc64le.const b/sys/sndseq_ppc64le.const
index e41da609c..7520e1a37 100644
--- a/sys/sndseq_ppc64le.const
+++ b/sys/sndseq_ppc64le.const
@@ -80,6 +80,19 @@ SNDRV_SEQ_REMOVE_TIME_TICK = 64
 SNDRV_SEQ_TIMER_ALSA = 0
 SNDRV_SEQ_TIMER_MIDI_CLOCK = 1
 SNDRV_SEQ_TIMER_MIDI_TICK = 2
+SNDRV_TIMER_CLASS_CARD = 2
+SNDRV_TIMER_CLASS_GLOBAL = 1
+SNDRV_TIMER_CLASS_NONE = 18446744073709551615
+SNDRV_TIMER_CLASS_PCM = 3
+SNDRV_TIMER_CLASS_SLAVE = 0
+SNDRV_TIMER_GLOBAL_HPET = 2
+SNDRV_TIMER_GLOBAL_HRTIMER = 3
+SNDRV_TIMER_GLOBAL_RTC = 1
+SNDRV_TIMER_GLOBAL_SYSTEM = 0
+SNDRV_TIMER_SCLASS_APPLICATION = 1
+SNDRV_TIMER_SCLASS_NONE = 0
+SNDRV_TIMER_SCLASS_OSS_SEQUENCER = 3
+SNDRV_TIMER_SCLASS_SEQUENCER = 2
 USER_CLIENT = 1
 __NR_ioctl = 54
 __NR_write = 4
diff --git a/sys/sndtimer.txt b/sys/sndtimer.txt
index f7eebc2af..1ce8a5f68 100644
--- a/sys/sndtimer.txt
+++ b/sys/sndtimer.txt
@@ -25,13 +25,15 @@ ioctl$SNDRV_TIMER_IOCTL_PAUSE(fd fd_sndtimer, cmd const[SNDRV_TIMER_IOCTL_PAUSE]
 snd_timer_flags = SNDRV_TIMER_PSFLG_AUTO, SNDRV_TIMER_PSFLG_EXCLUSIVE, SNDRV_TIMER_PSFLG_EARLY_EVENT
 snd_timer_filter = SNDRV_TIMER_EVENT_RESOLUTION, SNDRV_TIMER_EVENT_TICK, SNDRV_TIMER_EVENT_START, SNDRV_TIMER_EVENT_STOP, SNDRV_TIMER_EVENT_CONTINUE, SNDRV_TIMER_EVENT_PAUSE, SNDRV_TIMER_EVENT_EARLY, SNDRV_TIMER_EVENT_SUSPEND, SNDRV_TIMER_EVENT_RESUME, SNDRV_TIMER_EVENT_MSTART, SNDRV_TIMER_EVENT_MSTOP, SNDRV_TIMER_EVENT_MCONTINUE, SNDRV_TIMER_EVENT_MPAUSE, SNDRV_TIMER_EVENT_MSUSPEND, SNDRV_TIMER_EVENT_MRESUME
 
+snd_timer_id_str = "id0", "id1"
+snd_timer_name = "timer0", "timer1"
+
 snd_timer_ginfo {
 	tid	snd_timer_id
 	flags	int32
 	card	int32
-# TODO: the following two fields should be a fixed-size embeded string.
-	id	array[int8, 64]
-	name	array[int8, 80]
+	id	string[snd_timer_id_str, 64]
+	name	string[snd_timer_name, 80]
 	pad1	const[0, intptr]
 	res	intptr
 	resmin	intptr