aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorEliot Blennerhassett <eblennerhassett@audioscience.com>2011-07-21 23:52:55 -0400
committerTakashi Iwai <tiwai@suse.de>2011-07-22 01:52:15 -0400
commitb7f12482ca54353fbd8ea2fa3ca1ce996dcb5a3c (patch)
treea716a2e96f892c1cb753024cc0469dde809882c5 /sound
parent33162d2dfa8e8f5596f3106057df68c6533acfc6 (diff)
ALSA: asihpi - Add new node and message defines
Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/asihpi/hpi.h15
-rw-r--r--sound/pci/asihpi/hpi_internal.h6
2 files changed, 15 insertions, 6 deletions
diff --git a/sound/pci/asihpi/hpi.h b/sound/pci/asihpi/hpi.h
index 255429c32c1c..9538f1297578 100644
--- a/sound/pci/asihpi/hpi.h
+++ b/sound/pci/asihpi/hpi.h
@@ -211,8 +211,12 @@ enum HPI_SOURCENODES {
211 HPI_SOURCENODE_COBRANET = 109, 211 HPI_SOURCENODE_COBRANET = 109,
212 HPI_SOURCENODE_ANALOG = 110, /**< analog input node. */ 212 HPI_SOURCENODE_ANALOG = 110, /**< analog input node. */
213 HPI_SOURCENODE_ADAPTER = 111, /**< adapter node. */ 213 HPI_SOURCENODE_ADAPTER = 111, /**< adapter node. */
214 /** RTP stream input node - This node is a destination for
215 packets of RTP audio samples from other devices. */
216 HPI_SOURCENODE_RTP_DESTINATION = 112,
217 HPI_SOURCENODE_GP_IN = 113, /**< general purpose input. */
214 /* !!!Update this AND hpidebug.h if you add a new sourcenode type!!! */ 218 /* !!!Update this AND hpidebug.h if you add a new sourcenode type!!! */
215 HPI_SOURCENODE_LAST_INDEX = 111 /**< largest ID */ 219 HPI_SOURCENODE_LAST_INDEX = 113 /**< largest ID */
216 /* AX6 max sourcenode types = 15 */ 220 /* AX6 max sourcenode types = 15 */
217}; 221};
218 222
@@ -228,7 +232,7 @@ enum HPI_DESTNODES {
228 HPI_DESTNODE_NONE = 200, 232 HPI_DESTNODE_NONE = 200,
229 /** In Stream (Record) node. */ 233 /** In Stream (Record) node. */
230 HPI_DESTNODE_ISTREAM = 201, 234 HPI_DESTNODE_ISTREAM = 201,
231 HPI_DESTNODE_LINEOUT = 202, /**< line out node. */ 235 HPI_DESTNODE_LINEOUT = 202, /**< line out node. */
232 HPI_DESTNODE_AESEBU_OUT = 203, /**< AES/EBU output node. */ 236 HPI_DESTNODE_AESEBU_OUT = 203, /**< AES/EBU output node. */
233 HPI_DESTNODE_RF = 204, /**< RF output node. */ 237 HPI_DESTNODE_RF = 204, /**< RF output node. */
234 HPI_DESTNODE_SPEAKER = 205, /**< speaker output node. */ 238 HPI_DESTNODE_SPEAKER = 205, /**< speaker output node. */
@@ -236,9 +240,12 @@ enum HPI_DESTNODES {
236 Audio samples from the device are sent out on the Cobranet network.*/ 240 Audio samples from the device are sent out on the Cobranet network.*/
237 HPI_DESTNODE_COBRANET = 206, 241 HPI_DESTNODE_COBRANET = 206,
238 HPI_DESTNODE_ANALOG = 207, /**< analog output node. */ 242 HPI_DESTNODE_ANALOG = 207, /**< analog output node. */
239 243 /** RTP stream output node - This node is a source for
244 packets of RTP audio samples that are sent to other devices. */
245 HPI_DESTNODE_RTP_SOURCE = 208,
246 HPI_DESTNODE_GP_OUT = 209, /**< general purpose output node. */
240 /* !!!Update this AND hpidebug.h if you add a new destnode type!!! */ 247 /* !!!Update this AND hpidebug.h if you add a new destnode type!!! */
241 HPI_DESTNODE_LAST_INDEX = 207 /**< largest ID */ 248 HPI_DESTNODE_LAST_INDEX = 209 /**< largest ID */
242 /* AX6 max destnode types = 15 */ 249 /* AX6 max destnode types = 15 */
243}; 250};
244 251
diff --git a/sound/pci/asihpi/hpi_internal.h b/sound/pci/asihpi/hpi_internal.h
index 93d2908d957a..d497030c160f 100644
--- a/sound/pci/asihpi/hpi_internal.h
+++ b/sound/pci/asihpi/hpi_internal.h
@@ -1,7 +1,7 @@
1/****************************************************************************** 1/******************************************************************************
2 2
3 AudioScience HPI driver 3 AudioScience HPI driver
4 Copyright (C) 1997-2010 AudioScience Inc. <support@audioscience.com> 4 Copyright (C) 1997-2011 AudioScience Inc. <support@audioscience.com>
5 5
6 This program is free software; you can redistribute it and/or modify 6 This program is free software; you can redistribute it and/or modify
7 it under the terms of version 2 of the GNU General Public License as 7 it under the terms of version 2 of the GNU General Public License as
@@ -361,7 +361,9 @@ enum HPI_MESSAGE_TYPES {
361 HPI_TYPE_REQUEST = 1, 361 HPI_TYPE_REQUEST = 1,
362 HPI_TYPE_RESPONSE = 2, 362 HPI_TYPE_RESPONSE = 2,
363 HPI_TYPE_DATA = 3, 363 HPI_TYPE_DATA = 3,
364 HPI_TYPE_SSX2BYPASS_MESSAGE = 4 364 HPI_TYPE_SSX2BYPASS_MESSAGE = 4,
365 HPI_TYPE_COMMAND = 5,
366 HPI_TYPE_NOTIFICATION = 6
365}; 367};
366 368
367enum HPI_OBJECT_TYPES { 369enum HPI_OBJECT_TYPES {