diff options
| author | Eliot Blennerhassett <eblennerhassett@audioscience.com> | 2011-12-22 13:38:39 +1300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-12-22 08:13:02 +0100 |
| commit | 502f271ae3d61cbe8ae75a11f28f17174d7bd380 (patch) | |
| tree | f40944deee19670e9fda355ae54e038be158edf3 /sound/pci/asihpi | |
| parent | 09c728aced2bb212ce060a91c28d2ee40a6bf33c (diff) | |
| download | linux-502f271ae3d61cbe8ae75a11f28f17174d7bd380.tar.bz2 | |
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.c | 3 | ||||
| -rw-r--r-- | sound/pci/asihpi/hpi.h | 5 |
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[] = { "Analog", "Adapter", "RTP", - "GPI", + "Internal" }; compile_time_assert( @@ -1335,7 +1335,6 @@ static const char * const asihpi_dst_names[] = { "Net", "Analog", "RTP", - "GPO", }; compile_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 { /** 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. */ + HPI_SOURCENODE_INTERNAL = 113, /**< node internal to the device. */ /* !!!Update this AND hpidebug.h if you add a new sourcenode type!!! */ HPI_SOURCENODE_LAST_INDEX = 113 /**< largest ID */ /* AX6 max sourcenode types = 15 */ @@ -224,9 +224,8 @@ enum HPI_DESTNODES { /** 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 = 209 /**< largest ID */ + HPI_DESTNODE_LAST_INDEX = 208 /**< largest ID */ /* AX6 max destnode types = 15 */ }; |