diff options
Diffstat (limited to 'sound/pci/asihpi/hpi.h')
-rw-r--r-- | sound/pci/asihpi/hpi.h | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/sound/pci/asihpi/hpi.h b/sound/pci/asihpi/hpi.h index 255429c32c1..f2072728899 100644 --- a/sound/pci/asihpi/hpi.h +++ b/sound/pci/asihpi/hpi.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 |
@@ -42,12 +42,11 @@ i.e 3.05.02 is a development version | |||
42 | #define HPI_VER_MINOR(v) ((int)((v >> 8) & 0xFF)) | 42 | #define HPI_VER_MINOR(v) ((int)((v >> 8) & 0xFF)) |
43 | #define HPI_VER_RELEASE(v) ((int)(v & 0xFF)) | 43 | #define HPI_VER_RELEASE(v) ((int)(v & 0xFF)) |
44 | 44 | ||
45 | /* Use single digits for versions less that 10 to avoid octal. */ | 45 | #define HPI_VER HPI_VERSION_CONSTRUCTOR(4L, 8, 0) |
46 | #define HPI_VER HPI_VERSION_CONSTRUCTOR(4L, 6, 0) | 46 | #define HPI_VER_STRING "4.08.00" |
47 | #define HPI_VER_STRING "4.06.00" | ||
48 | 47 | ||
49 | /* Library version as documented in hpi-api-versions.txt */ | 48 | /* Library version as documented in hpi-api-versions.txt */ |
50 | #define HPI_LIB_VER HPI_VERSION_CONSTRUCTOR(9, 0, 0) | 49 | #define HPI_LIB_VER HPI_VERSION_CONSTRUCTOR(10, 0, 0) |
51 | 50 | ||
52 | #include <linux/types.h> | 51 | #include <linux/types.h> |
53 | #define HPI_BUILD_EXCLUDE_DEPRECATED | 52 | #define HPI_BUILD_EXCLUDE_DEPRECATED |
@@ -211,8 +210,12 @@ enum HPI_SOURCENODES { | |||
211 | HPI_SOURCENODE_COBRANET = 109, | 210 | HPI_SOURCENODE_COBRANET = 109, |
212 | HPI_SOURCENODE_ANALOG = 110, /**< analog input node. */ | 211 | HPI_SOURCENODE_ANALOG = 110, /**< analog input node. */ |
213 | HPI_SOURCENODE_ADAPTER = 111, /**< adapter node. */ | 212 | HPI_SOURCENODE_ADAPTER = 111, /**< adapter node. */ |
213 | /** RTP stream input node - This node is a destination for | ||
214 | packets of RTP audio samples from other devices. */ | ||
215 | HPI_SOURCENODE_RTP_DESTINATION = 112, | ||
216 | HPI_SOURCENODE_GP_IN = 113, /**< general purpose input. */ | ||
214 | /* !!!Update this AND hpidebug.h if you add a new sourcenode type!!! */ | 217 | /* !!!Update this AND hpidebug.h if you add a new sourcenode type!!! */ |
215 | HPI_SOURCENODE_LAST_INDEX = 111 /**< largest ID */ | 218 | HPI_SOURCENODE_LAST_INDEX = 113 /**< largest ID */ |
216 | /* AX6 max sourcenode types = 15 */ | 219 | /* AX6 max sourcenode types = 15 */ |
217 | }; | 220 | }; |
218 | 221 | ||
@@ -228,7 +231,7 @@ enum HPI_DESTNODES { | |||
228 | HPI_DESTNODE_NONE = 200, | 231 | HPI_DESTNODE_NONE = 200, |
229 | /** In Stream (Record) node. */ | 232 | /** In Stream (Record) node. */ |
230 | HPI_DESTNODE_ISTREAM = 201, | 233 | HPI_DESTNODE_ISTREAM = 201, |
231 | HPI_DESTNODE_LINEOUT = 202, /**< line out node. */ | 234 | HPI_DESTNODE_LINEOUT = 202, /**< line out node. */ |
232 | HPI_DESTNODE_AESEBU_OUT = 203, /**< AES/EBU output node. */ | 235 | HPI_DESTNODE_AESEBU_OUT = 203, /**< AES/EBU output node. */ |
233 | HPI_DESTNODE_RF = 204, /**< RF output node. */ | 236 | HPI_DESTNODE_RF = 204, /**< RF output node. */ |
234 | HPI_DESTNODE_SPEAKER = 205, /**< speaker output node. */ | 237 | HPI_DESTNODE_SPEAKER = 205, /**< speaker output node. */ |
@@ -236,9 +239,12 @@ enum HPI_DESTNODES { | |||
236 | Audio samples from the device are sent out on the Cobranet network.*/ | 239 | Audio samples from the device are sent out on the Cobranet network.*/ |
237 | HPI_DESTNODE_COBRANET = 206, | 240 | HPI_DESTNODE_COBRANET = 206, |
238 | HPI_DESTNODE_ANALOG = 207, /**< analog output node. */ | 241 | HPI_DESTNODE_ANALOG = 207, /**< analog output node. */ |
239 | 242 | /** RTP stream output node - This node is a source for | |
243 | packets of RTP audio samples that are sent to other devices. */ | ||
244 | HPI_DESTNODE_RTP_SOURCE = 208, | ||
245 | HPI_DESTNODE_GP_OUT = 209, /**< general purpose output node. */ | ||
240 | /* !!!Update this AND hpidebug.h if you add a new destnode type!!! */ | 246 | /* !!!Update this AND hpidebug.h if you add a new destnode type!!! */ |
241 | HPI_DESTNODE_LAST_INDEX = 207 /**< largest ID */ | 247 | HPI_DESTNODE_LAST_INDEX = 209 /**< largest ID */ |
242 | /* AX6 max destnode types = 15 */ | 248 | /* AX6 max destnode types = 15 */ |
243 | }; | 249 | }; |
244 | 250 | ||