ALSA: asihpi - Add new node and message defines

Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/asihpi/hpi.h b/sound/pci/asihpi/hpi.h
index 255429c32c1c6999db64ad529338167f9857d7f4..9538f1297578a1a88b689e70034080c2a578e520 100644 (file)
--- 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 93d2908d957ac9ce41d5358c414305a83d6a2149..d497030c160fb951bd5148bd067d1b77bda2b6a6 100644 (file)
--- 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 {