aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/asihpi/hpi_internal.h
diff options
context:
space:
mode:
authorEliot Blennerhassett <eblennerhassett@audioscience.com>2011-02-10 17:26:17 +1300
committerTakashi Iwai <tiwai@suse.de>2011-02-10 18:49:38 +0100
commita287ca2adec995395486a9d0a7d2f099f7b16f05 (patch)
tree23168fec2c4f9c1a128ac73db1c676d407826968 /sound/pci/asihpi/hpi_internal.h
parentbd33c1cad21da3ac3c541e2107a6c46072ca081b (diff)
downloadkernel_samsung_smdk4412-a287ca2adec995395486a9d0a7d2f099f7b16f05.zip
kernel_samsung_smdk4412-a287ca2adec995395486a9d0a7d2f099f7b16f05.tar.gz
kernel_samsung_smdk4412-a287ca2adec995395486a9d0a7d2f099f7b16f05.tar.bz2
ALSA: asihpi - Minor define updates
HPI version 4.05.32 Tweak HPI error code for backward compatibility. Add BUILD to build-related defines. Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/asihpi/hpi_internal.h')
-rw-r--r--sound/pci/asihpi/hpi_internal.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/pci/asihpi/hpi_internal.h b/sound/pci/asihpi/hpi_internal.h
index ca5b844..af678be 100644
--- a/sound/pci/asihpi/hpi_internal.h
+++ b/sound/pci/asihpi/hpi_internal.h
@@ -309,8 +309,8 @@ enum HPI_CONTROL_ATTRIBUTES {
#define HPI_ETHERNET_UDP_PORT (44600) /*!< UDP messaging port */
-/** Base network time out is set to 100 milli-seconds. */
-#define HPI_ETHERNET_TIMEOUT_MS (100)
+/** Default network timeout in milli-seconds. */
+#define HPI_ETHERNET_TIMEOUT_MS 500
/** Locked memory buffer alloc/free phases */
enum HPI_BUFFER_CMDS {
@@ -389,8 +389,7 @@ enum HPI_OBJECT_TYPES {
};
#define HPI_OBJ_FUNCTION_SPACING 0x100
-#define HPI_FUNC_ID(obj, index) \
- (HPI_OBJ_##obj * HPI_OBJ_FUNCTION_SPACING + index)
+#define HPI_FUNC_ID(obj, i) (HPI_OBJ_##obj * HPI_OBJ_FUNCTION_SPACING + i)
#define HPI_EXTRACT_INDEX(fn) (fn & 0xff)