renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-16 01:24:08 +08:00
Code

ALSA: asihpi - Minor define updates

Browse Source 
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>
This commit is contained in:
Eliot Blennerhassett 2011-02-10 17:26:17 +13:00 committed by Takashi Iwai
parent bd33c1cad2
commit a287ca2ade
3 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sound/pci/asihpi/hpi.h
View File

@ -43,14 +43,15 @@ i.e 3.05.02 is a development version
#define HPI_VER_RELEASE(v) ((int)(v & 0xFF)) #define HPI_VER_RELEASE(v) ((int)(v & 0xFF))
/* Use single digits for versions less that 10 to avoid octal. */ /* Use single digits for versions less that 10 to avoid octal. */
#define HPI_VER HPI_VERSION_CONSTRUCTOR(4L, 5, 19) #define HPI_VER HPI_VERSION_CONSTRUCTOR(4L, 5, 32)
#define HPI_VER_STRING "4.05.19" #define HPI_VER_STRING "4.05.32"
/* Library version as documented in hpi-api-versions.txt */ /* Library version as documented in hpi-api-versions.txt */
#define HPI_LIB_VER HPI_VERSION_CONSTRUCTOR(9, 0, 0) #define HPI_LIB_VER HPI_VERSION_CONSTRUCTOR(9, 0, 0)
#include <linux/types.h> #include <linux/types.h>
#define HPI_EXCLUDE_DEPRECATED #define HPI_BUILD_EXCLUDE_DEPRECATED
#define HPI_BUILD_KERNEL_MODE
/******************************************************************************/ /******************************************************************************/
/******** HPI API DEFINITIONS *****/ /******** HPI API DEFINITIONS *****/
@ -933,11 +934,9 @@ enum HPI_ERROR_CODES {
/** Adapter number out of range or not set properly. */ /** Adapter number out of range or not set properly. */
HPI_ERROR_BAD_ADAPTER_NUMBER = 202, HPI_ERROR_BAD_ADAPTER_NUMBER = 202,
/** 2 adapters with the same adapter number. */ /** 2 adapters with the same adapter number. */
HPI_DUPLICATE_ADAPTER_NUMBER = 203, HPI_ERROR_DUPLICATE_ADAPTER_NUMBER = 203,
/** DSP code failed to bootload. (unused?) */ /** DSP code failed to bootload. (unused?) */
HPI_ERROR_DSP_BOOTLOAD = 204, HPI_ERROR_DSP_BOOTLOAD = 204,
/** Communication with DSP failed */
HPI_ERROR_DSP_COMMUNICATION = 205,
/** Couldn't find or open the DSP code file. */ /** Couldn't find or open the DSP code file. */
HPI_ERROR_DSP_FILE_NOT_FOUND = 206, HPI_ERROR_DSP_FILE_NOT_FOUND = 206,
/** Internal DSP hardware error. */ /** Internal DSP hardware error. */
@ -1056,8 +1055,18 @@ enum HPI_ERROR_CODES {
/** hpioct32.c can't obtain mutex */ /** hpioct32.c can't obtain mutex */
HPI_ERROR_MUTEX_TIMEOUT = 700, HPI_ERROR_MUTEX_TIMEOUT = 700,
/** errors from HPI backends have values >= this */ /** Backend errors used to be greater than this.
HPI_ERROR_BACKEND_BASE = 900 \deprecated Now, all backends return only errors defined here in hpi.h
*/
HPI_ERROR_BACKEND_BASE = 900,
/** Communication with DSP failed */
HPI_ERROR_DSP_COMMUNICATION = 900
/* Note that the dsp communication error is set to this value so that
it remains compatible with any software that expects such errors
to be backend errors i.e. >= 900.
Do not define any new error codes with values > 900.
*/
}; };
/** \defgroup maximums HPI maximum values /** \defgroup maximums HPI maximum values

7
sound/pci/asihpi/hpi_internal.h
View File

@ -309,8 +309,8 @@ enum HPI_CONTROL_ATTRIBUTES {
#define HPI_ETHERNET_UDP_PORT (44600) /*!< UDP messaging port */ #define HPI_ETHERNET_UDP_PORT (44600) /*!< UDP messaging port */
/** Base network time out is set to 100 milli-seconds. */ /** Default network timeout in milli-seconds. */
#define HPI_ETHERNET_TIMEOUT_MS (100) #define HPI_ETHERNET_TIMEOUT_MS 500
/** Locked memory buffer alloc/free phases */ /** Locked memory buffer alloc/free phases */
enum HPI_BUFFER_CMDS { enum HPI_BUFFER_CMDS {
@ -389,8 +389,7 @@ enum HPI_OBJECT_TYPES {
}; };
#define HPI_OBJ_FUNCTION_SPACING 0x100 #define HPI_OBJ_FUNCTION_SPACING 0x100
#define HPI_FUNC_ID(obj, index) \ #define HPI_FUNC_ID(obj, i) (HPI_OBJ_##obj * HPI_OBJ_FUNCTION_SPACING + i)
(HPI_OBJ_##obj * HPI_OBJ_FUNCTION_SPACING + index)
#define HPI_EXTRACT_INDEX(fn) (fn & 0xff) #define HPI_EXTRACT_INDEX(fn) (fn & 0xff)

6
sound/pci/asihpi/hpios.h
View File

@ -27,9 +27,7 @@ HPI Operating System Specific macros for Linux Kernel driver
#define HPI_OS_LINUX_KERNEL #define HPI_OS_LINUX_KERNEL
#define HPI_OS_DEFINED #define HPI_OS_DEFINED
#define HPI_KERNEL_MODE #define HPI_BUILD_KERNEL_MODE
#define HPI_REASSIGN_DUPLICATE_ADAPTER_IDX
#include <linux/io.h> #include <linux/io.h>
#include <asm/system.h> #include <asm/system.h>
@ -142,7 +140,7 @@ static inline void cond_unlock(struct hpios_spinlock *l)
#define hpios_dsplock_unlock(obj) cond_unlock(&(obj)->dsp_lock) #define hpios_dsplock_unlock(obj) cond_unlock(&(obj)->dsp_lock)
#ifdef CONFIG_SND_DEBUG #ifdef CONFIG_SND_DEBUG
#define HPI_DEBUG #define HPI_BUILD_DEBUG
#endif #endif
#define HPI_ALIST_LOCKING #define HPI_ALIST_LOCKING