Commit a287ca2a authored by Eliot Blennerhassett's avatar Eliot Blennerhassett Committed by Takashi Iwai
Browse files

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: default avatarEliot Blennerhassett <eblennerhassett@audioscience.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent bd33c1ca

sound/pci/asihpi/hpi.h

+17 −8
Original line number Diff line number Diff line
@@ -43,14 +43,15 @@ i.e 3.05.02 is a development version 
#define HPI_VER_RELEASE(v) ((int)(v & 0xFF))



/* Use single digits for versions less that 10 to avoid octal. */

#define HPI_VER HPI_VERSION_CONSTRUCTOR(4L, 5, 19)

#define HPI_VER_STRING "4.05.19"

#define HPI_VER HPI_VERSION_CONSTRUCTOR(4L, 5, 32)

#define HPI_VER_STRING "4.05.32"



/* Library version as documented in hpi-api-versions.txt */

#define HPI_LIB_VER  HPI_VERSION_CONSTRUCTOR(9, 0, 0)



#include <linux/types.h>

#define HPI_EXCLUDE_DEPRECATED

#define HPI_BUILD_EXCLUDE_DEPRECATED

#define HPI_BUILD_KERNEL_MODE



/******************************************************************************/

/********       HPI API DEFINITIONS                                       *****/
@@ -933,11 +934,9 @@ enum HPI_ERROR_CODES { 
	/** Adapter number out of range or not set properly. */

	HPI_ERROR_BAD_ADAPTER_NUMBER = 202,

	/** 2 adapters with the same adapter number. */

	HPI_DUPLICATE_ADAPTER_NUMBER = 203,

	HPI_ERROR_DUPLICATE_ADAPTER_NUMBER = 203,

	/** DSP code failed to bootload. (unused?) */

	HPI_ERROR_DSP_BOOTLOAD = 204,

	/** Communication with DSP failed */

	HPI_ERROR_DSP_COMMUNICATION = 205,

	/** Couldn't find or open the DSP code file. */

	HPI_ERROR_DSP_FILE_NOT_FOUND = 206,

	/** Internal DSP hardware error. */
@@ -1056,8 +1055,18 @@ enum HPI_ERROR_CODES { 
	/** hpioct32.c can't obtain mutex */

	HPI_ERROR_MUTEX_TIMEOUT = 700,



	/** errors from HPI backends have values >= this */

	HPI_ERROR_BACKEND_BASE = 900

	/** Backend errors used to be greater than this.

	    \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

sound/pci/asihpi/hpi_internal.h

+3 −4
Original line number Diff line number Diff line
@@ -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)

sound/pci/asihpi/hpios.h

+2 −4
Original line number Diff line number Diff line
@@ -27,9 +27,7 @@ HPI Operating System Specific macros for Linux Kernel driver 
#define HPI_OS_LINUX_KERNEL



#define HPI_OS_DEFINED

#define HPI_KERNEL_MODE



#define HPI_REASSIGN_DUPLICATE_ADAPTER_IDX

#define HPI_BUILD_KERNEL_MODE



#include <linux/io.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)



#ifdef CONFIG_SND_DEBUG

#define HPI_DEBUG

#define HPI_BUILD_DEBUG

#endif



#define HPI_ALIST_LOCKING