Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 284112
b: refs/heads/master
c: 502f271
h: refs/heads/master
v: v3
  • Loading branch information
Eliot Blennerhassett authored and Takashi Iwai committed Dec 22, 2011
1 parent b8048ab commit ba68c52
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 09c728aced2bb212ce060a91c28d2ee40a6bf33c
refs/heads/master: 502f271ae3d61cbe8ae75a11f28f17174d7bd380
3 changes: 1 addition & 2 deletions trunk/sound/pci/asihpi/asihpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1317,7 +1317,7 @@ static const char * const asihpi_src_names[] = {
"Analog",
"Adapter",
"RTP",
"GPI",
"Internal"
};

compile_time_assert(
Expand All @@ -1335,7 +1335,6 @@ static const char * const asihpi_dst_names[] = {
"Net",
"Analog",
"RTP",
"GPO",
};

compile_time_assert(
Expand Down
5 changes: 2 additions & 3 deletions trunk/sound/pci/asihpi/hpi.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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 */
};

Expand Down

0 comments on commit ba68c52

Please sign in to comment.