From: linux@audioscience.com
To: patch@alsa-project.org
Cc: tiwai@suse.de,
Eliot Blennerhassett <eblennerhassett@audioscience.com>,
alsa-devel@alsa-project.org
Subject: [PATCH 10/15] ALSA: asihpi - Add new node and message defines
Date: Fri, 22 Jul 2011 15:52:55 +1200 [thread overview]
Message-ID: <1311306785-23116-21-git-send-email-linux@audioscience.com> (raw)
In-Reply-To: <1311306785-23116-1-git-send-email-linux@audioscience.com>
From: Eliot Blennerhassett <eblennerhassett@audioscience.com>
Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>
---
sound/pci/asihpi/hpi.h | 15 +++++++++++----
sound/pci/asihpi/hpi_internal.h | 6 ++++--
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/sound/pci/asihpi/hpi.h b/sound/pci/asihpi/hpi.h
index 255429c..9538f12 100644
--- a/sound/pci/asihpi/hpi.h
+++ b/sound/pci/asihpi/hpi.h
@@ -211,8 +211,12 @@ enum HPI_SOURCENODES {
HPI_SOURCENODE_COBRANET = 109,
HPI_SOURCENODE_ANALOG = 110, /**< analog input node. */
HPI_SOURCENODE_ADAPTER = 111, /**< adapter node. */
+ /** RTP stream input node - This node is a destination for
+ packets of RTP audio samples from other devices. */
+ HPI_SOURCENODE_RTP_DESTINATION = 112,
+ HPI_SOURCENODE_GP_IN = 113, /**< general purpose input. */
/* !!!Update this AND hpidebug.h if you add a new sourcenode type!!! */
- HPI_SOURCENODE_LAST_INDEX = 111 /**< largest ID */
+ HPI_SOURCENODE_LAST_INDEX = 113 /**< largest ID */
/* AX6 max sourcenode types = 15 */
};
@@ -228,7 +232,7 @@ enum HPI_DESTNODES {
HPI_DESTNODE_NONE = 200,
/** In Stream (Record) node. */
HPI_DESTNODE_ISTREAM = 201,
- HPI_DESTNODE_LINEOUT = 202, /**< line out node. */
+ HPI_DESTNODE_LINEOUT = 202, /**< line out node. */
HPI_DESTNODE_AESEBU_OUT = 203, /**< AES/EBU output node. */
HPI_DESTNODE_RF = 204, /**< RF output node. */
HPI_DESTNODE_SPEAKER = 205, /**< speaker output node. */
@@ -236,9 +240,12 @@ enum HPI_DESTNODES {
Audio samples from the device are sent out on the Cobranet network.*/
HPI_DESTNODE_COBRANET = 206,
HPI_DESTNODE_ANALOG = 207, /**< analog output node. */
-
+ /** RTP stream output node - This node is a source for
+ packets of RTP audio samples that are sent to other devices. */
+ HPI_DESTNODE_RTP_SOURCE = 208,
+ HPI_DESTNODE_GP_OUT = 209, /**< general purpose output node. */
/* !!!Update this AND hpidebug.h if you add a new destnode type!!! */
- HPI_DESTNODE_LAST_INDEX = 207 /**< largest ID */
+ HPI_DESTNODE_LAST_INDEX = 209 /**< largest ID */
/* AX6 max destnode types = 15 */
};
diff --git a/sound/pci/asihpi/hpi_internal.h b/sound/pci/asihpi/hpi_internal.h
index 93d2908..d497030 100644
--- a/sound/pci/asihpi/hpi_internal.h
+++ b/sound/pci/asihpi/hpi_internal.h
@@ -1,7 +1,7 @@
/******************************************************************************
AudioScience HPI driver
- Copyright (C) 1997-2010 AudioScience Inc. <support@audioscience.com>
+ Copyright (C) 1997-2011 AudioScience Inc. <support@audioscience.com>
This program is free software; you can redistribute it and/or modify
it under the terms of version 2 of the GNU General Public License as
@@ -361,7 +361,9 @@ enum HPI_MESSAGE_TYPES {
HPI_TYPE_REQUEST = 1,
HPI_TYPE_RESPONSE = 2,
HPI_TYPE_DATA = 3,
- HPI_TYPE_SSX2BYPASS_MESSAGE = 4
+ HPI_TYPE_SSX2BYPASS_MESSAGE = 4,
+ HPI_TYPE_COMMAND = 5,
+ HPI_TYPE_NOTIFICATION = 6
};
enum HPI_OBJECT_TYPES {
--
1.7.0.4
next prev parent reply other threads:[~2011-07-22 3:52 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-22 3:52 [PATCH 00/15] ALSA: asihpi - update from HPI 4.06 to 4.08 linux
2011-07-22 3:52 ` [PATCH 01/15] ALSA: asihpi - Give more meaningful name to hpi request message type linux
2011-07-22 3:52 ` [PATCH 01/15] " linux
2011-07-22 3:52 ` [PATCH 02/15] ALSA: asihpi - Increase request and response buffer sizes linux
2011-07-22 3:52 ` [PATCH 02/15] " linux
2011-07-22 3:52 ` [PATCH 03/15] ALSA: asihpi - Remove controlex structs and associated special data transfer code linux
2011-07-22 3:52 ` [PATCH 03/15] " linux
2011-07-22 3:52 ` [PATCH 04/15] ALSA: asihpi - DSP code loader API now independent of OS linux
2011-07-22 5:56 ` Takashi Iwai
2011-07-22 3:52 ` [PATCH 04/15] " linux
2011-07-22 3:52 ` [PATCH 05/15] ALSA: asihpi - Revise snd_pcm_debug_name, get rid of DEBUG_NAME macro linux
2011-07-22 3:52 ` [PATCH 05/15] " linux
2011-07-22 3:52 ` [PATCH 06/15] ALSA: asihpi - Remove spurious adapter index check linux
2011-07-22 3:52 ` [PATCH 06/15] " linux
2011-07-22 3:52 ` [PATCH 07/15] ALSA: asihpi - Remove unused structures, macros and functions linux
2011-07-22 3:52 ` [PATCH 07/15] " linux
2011-07-22 3:52 ` [PATCH 08/15] ALSA: asihpi - Fix minor typos and spelling linux
2011-07-22 3:52 ` [PATCH 08/15] " linux
2011-07-22 3:52 ` [PATCH 09/15] ALSA: asihpi - Make local function static linux
2011-07-22 3:52 ` [PATCH 09/15] " linux
2011-07-22 3:52 ` [PATCH 10/15] Add new node and message defines linux
2011-07-22 3:52 ` linux [this message]
2011-07-22 3:52 ` [PATCH 11/15] ALSA: asihpi - Explicitly include mutex.h linux
2011-07-22 3:52 ` [PATCH 11/15] " linux
2011-07-22 3:52 ` [PATCH 12/15] ALSA: asihpi - Use size_t for sizeof result linux
2011-07-22 3:52 ` [PATCH 12/15] " linux
2011-07-22 3:53 ` [PATCH 13/15] ALSA: asihpi - Control name updates linux
2011-07-22 3:53 ` [PATCH 13/15] " linux
2011-07-22 3:53 ` [PATCH 14/15] Add volume mute controls linux
2011-07-22 3:53 ` [PATCH 14/15] ALSA: asihpi - " linux
2011-07-22 6:01 ` Takashi Iwai
2011-07-22 3:53 ` [PATCH 15/15] ALSA: asihpi - HPI version 4.08 linux
2011-07-22 3:53 ` [PATCH 15/15] " linux
2011-07-22 4:04 ` Please ignore duplicates Eliot Blennerhassett
2011-07-22 6:03 ` [PATCH 00/15] ALSA: asihpi - update from HPI 4.06 to 4.08 Takashi Iwai
[not found] ` <4E28F717.90204@audioscience.com>
2011-07-22 6:06 ` asihpi - update from HPI 4.06 to 4.08 - Firmware Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1311306785-23116-21-git-send-email-linux@audioscience.com \
--to=linux@audioscience.com \
--cc=alsa-devel@alsa-project.org \
--cc=eblennerhassett@audioscience.com \
--cc=patch@alsa-project.org \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.