aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/asihpi
diff options
context:
space:
mode:
authorEliot Blennerhassett <eblennerhassett@audioscience.com>2011-12-21 19:38:39 -0500
committerTakashi Iwai <tiwai@suse.de>2011-12-22 02:13:02 -0500
commit502f271ae3d61cbe8ae75a11f28f17174d7bd380 (patch)
treef40944deee19670e9fda355ae54e038be158edf3 /sound/pci/asihpi
parent09c728aced2bb212ce060a91c28d2ee40a6bf33c (diff)
ALSA: asihpi - Update node types.
Add "Internal" node type. Remove GPI and GPO node types. Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/asihpi')
-rw-r--r--sound/pci/asihpi/asihpi.c3
-rw-r--r--sound/pci/asihpi/hpi.h5
2 files changed, 3 insertions, 5 deletions
diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c
index 62f094c0ef08..f56a1b8358b1 100644
--- a/sound/pci/asihpi/asihpi.c
+++ b/sound/pci/asihpi/asihpi.c
@@ -1317,7 +1317,7 @@ static const char * const asihpi_src_names[] = {
1317 "Analog", 1317 "Analog",
1318 "Adapter", 1318 "Adapter",
1319 "RTP", 1319 "RTP",
1320 "GPI", 1320 "Internal"
1321}; 1321};
1322 1322
1323compile_time_assert( 1323compile_time_assert(
@@ -1335,7 +1335,6 @@ static const char * const asihpi_dst_names[] = {
1335 "Net", 1335 "Net",
1336 "Analog", 1336 "Analog",
1337 "RTP", 1337 "RTP",
1338 "GPO",
1339}; 1338};
1340 1339
1341compile_time_assert( 1340compile_time_assert(
diff --git a/sound/pci/asihpi/hpi.h b/sound/pci/asihpi/hpi.h
index 771493798764..867c144fed31 100644
--- a/sound/pci/asihpi/hpi.h
+++ b/sound/pci/asihpi/hpi.h
@@ -195,7 +195,7 @@ enum HPI_SOURCENODES {
195 /** RTP stream input node - This node is a destination for 195 /** RTP stream input node - This node is a destination for
196 packets of RTP audio samples from other devices. */ 196 packets of RTP audio samples from other devices. */
197 HPI_SOURCENODE_RTP_DESTINATION = 112, 197 HPI_SOURCENODE_RTP_DESTINATION = 112,
198 HPI_SOURCENODE_GP_IN = 113, /**< general purpose input. */ 198 HPI_SOURCENODE_INTERNAL = 113, /**< node internal to the device. */
199 /* !!!Update this AND hpidebug.h if you add a new sourcenode type!!! */ 199 /* !!!Update this AND hpidebug.h if you add a new sourcenode type!!! */
200 HPI_SOURCENODE_LAST_INDEX = 113 /**< largest ID */ 200 HPI_SOURCENODE_LAST_INDEX = 113 /**< largest ID */
201 /* AX6 max sourcenode types = 15 */ 201 /* AX6 max sourcenode types = 15 */
@@ -224,9 +224,8 @@ enum HPI_DESTNODES {
224 /** RTP stream output node - This node is a source for 224 /** RTP stream output node - This node is a source for
225 packets of RTP audio samples that are sent to other devices. */ 225 packets of RTP audio samples that are sent to other devices. */
226 HPI_DESTNODE_RTP_SOURCE = 208, 226 HPI_DESTNODE_RTP_SOURCE = 208,
227 HPI_DESTNODE_GP_OUT = 209, /**< general purpose output node. */
228 /* !!!Update this AND hpidebug.h if you add a new destnode type!!! */ 227 /* !!!Update this AND hpidebug.h if you add a new destnode type!!! */
229 HPI_DESTNODE_LAST_INDEX = 209 /**< largest ID */ 228 HPI_DESTNODE_LAST_INDEX = 208 /**< largest ID */
230 /* AX6 max destnode types = 15 */ 229 /* AX6 max destnode types = 15 */
231}; 230};
232 231