From df736ad67ac637d339b2442402d2eacb360231fa Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 24 Jul 2024 13:59:05 +0200
Subject: [PATCH] aseqdump: Support of UMP 8-bit SysEx messages

Add the support to dump UMP 8-bit SysEx messages.
A slight code refactoring to share the code snippet between 7bit and
8bit SysEx handling, too.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 seq/aseqdump/aseqdump.c | 42 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 35 insertions(+), 7 deletions(-)

diff --git a/seq/aseqdump/aseqdump.c b/seq/aseqdump/aseqdump.c
index 7be988f..3630941 100644
--- a/seq/aseqdump/aseqdump.c
+++ b/seq/aseqdump/aseqdump.c
@@ -668,13 +668,10 @@ static unsigned char ump_sysex7_data(const unsigned int *ump,
 	return (ump[offset / 4] >> ((3 - (offset & 3)) * 8)) & 0xff;
 }
 
-static void dump_ump_sysex_event(const unsigned int *ump)
+static void dump_ump_sysex_status(const char *prefix, unsigned int status)
 {
-	int i, length;
-
-	printf("Group %2d, ", group_number(snd_ump_msg_group(ump)));
-	printf("SysEx ");
-	switch (snd_ump_sysex_msg_status(ump)) {
+	printf("%s ", prefix);
+	switch (status) {
 	case SND_UMP_SYSEX_STATUS_SINGLE:
 		printf("Single  ");
 		break;
@@ -688,10 +685,17 @@ static void dump_ump_sysex_event(const unsigned int *ump)
 		printf("End     ");
 		break;
 	default:
-		printf("Unknown(0x%x)", snd_ump_sysex_msg_status(ump));
+		printf("(0x%04x)", status);
 		break;
 	}
+}
 
+static void dump_ump_sysex_event(const unsigned int *ump)
+{
+	int i, length;
+
+	printf("Group %2d, ", group_number(snd_ump_msg_group(ump)));
+	dump_ump_sysex_status("SysEx", snd_ump_sysex_msg_status(ump));
 	length = snd_ump_sysex_msg_length(ump);
 	printf(" length %d ", length);
 	for (i = 0; i < length; i++)
@@ -699,6 +703,27 @@ static void dump_ump_sysex_event(const unsigned int *ump)
 	printf("\n");
 }
 
+static unsigned char ump_sysex8_data(const unsigned int *ump,
+				     unsigned int offset)
+{
+	offset += 3;
+	return (ump[offset / 4] >> ((3 - (offset & 3)) * 8)) & 0xff;
+}
+
+static void dump_ump_sysex8_event(const unsigned int *ump)
+{
+	int i, length;
+
+	printf("Group %2d, ", group_number(snd_ump_msg_group(ump)));
+	dump_ump_sysex_status("SysEx8", snd_ump_sysex_msg_status(ump));
+	length = snd_ump_sysex_msg_length(ump);
+	printf(" length %d ", length);
+	printf(" stream %d ", (ump[0] >> 8) & 0xff);
+	for (i = 0; i < length; i++)
+		printf("%s%02x", i ? ":" : "", ump_sysex8_data(ump, i));
+	printf("\n");
+}
+
 static void print_ump_string(const unsigned int *ump, unsigned int fmt,
 			     unsigned int offset, int maxlen)
 {
@@ -965,6 +990,9 @@ static void dump_ump_event(const snd_seq_ump_event_t *ev)
 	case SND_UMP_MSG_TYPE_DATA:
 		dump_ump_sysex_event(ev->ump);
 		break;
+	case SND_UMP_MSG_TYPE_EXTENDED_DATA:
+		dump_ump_sysex8_event(ev->ump);
+		break;
 	case SND_UMP_MSG_TYPE_FLEX_DATA:
 		dump_ump_flex_data_event(ev->ump);
 		break;