Added more missing exports

- Fixed the exports of _snd_pcm_hw_param*()
- Control deprecated exports
- Add missing _snd_pcm_hw_param_get_mask()

Signed-off-by: Takashi Iwai <tiwai@suse.de>

19 files changed, 37 insertions, 22 deletions

diff --git a/src/Versions b/src/Versions
index a0c919c..41d96df 100644
--- a/src/Versions
+++ b/src/Versions
@@ -11,9 +11,11 @@ ALSA_0.9 {
     __snd_pcm_sw_params_*;
     __snd_*_dlsym_*;
 
-    _snd_mixer_*;
+    _snd_pcm_hw_*;
     _snd_pcm_*_names;
     _snd_pcm_*_descriptions;
+    _snd_mixer_*;
+
   local:
     *;
 };
diff --git a/src/control.h b/src/control.h
index e004544..90e9112 100644
--- a/src/control.h
+++ b/src/control.h
@@ -22,6 +22,7 @@
 #ifndef __ALSA_CONTROL_H
 #define __ALSA_CONTROL_H
 
+#include "recipe.h"
 #include "ctl_func.h"
 
 #include "ctl_macros.h"
diff --git a/src/ctl_abi.c b/src/ctl_abi.c
index 1dd0272..4fedba0 100644
--- a/src/ctl_abi.c
+++ b/src/ctl_abi.c
@@ -1,3 +1,4 @@
+#include "recipe.h"
 #include "ctl_func.h"
 #undef __SALSA_EXPORT_FUNC
 #define __SALSA_EXPORT_FUNC
diff --git a/src/ctl_func.h b/src/ctl_func.h
index f237d1f..52d647c 100644
--- a/src/ctl_func.h
+++ b/src/ctl_func.h
@@ -1,7 +1,6 @@
 /*
  */
 
-#include "recipe.h"
 #include "global.h"
 #include "ctl_types.h"
 
diff --git a/src/global.h b/src/global.h
index 68d78fa..688e4f6 100644
--- a/src/global.h
+++ b/src/global.h
@@ -49,8 +49,10 @@ typedef struct _snd_seq snd_seq_t;
 #endif
 
 #if SALSA_MARK_DEPRECATED
+#define __SALSA_DEPRECATED	__attribute__ ((deprecated))
 #define __SALSA_NOT_IMPLEMENTED	__attribute__ ((deprecated))
 #else
+#define __SALSA_DEPRECATED
 #define __SALSA_NOT_IMPLEMENTED
 #endif
 
diff --git a/src/hwdep.h b/src/hwdep.h
index b9d37be..6153420 100644
--- a/src/hwdep.h
+++ b/src/hwdep.h
@@ -22,6 +22,7 @@
 #ifndef __ALSA_HWDEP_H
 #define __ALSA_HWDEP_H
 
+#include "recipe.h"
 #include "hwdep_func.h"
 
 #include "hwdep_macros.h"
diff --git a/src/hwdep_abi.c b/src/hwdep_abi.c
index 4cd364a..ae0038a 100644
--- a/src/hwdep_abi.c
+++ b/src/hwdep_abi.c
@@ -1,3 +1,4 @@
+#include "recipe.h"
 #include "hwdep_func.h"
 #undef __SALSA_EXPORT_FUNC
 #define __SALSA_EXPORT_FUNC
diff --git a/src/hwdep_func.h b/src/hwdep_func.h
index 154c91c..2edca95 100644
--- a/src/hwdep_func.h
+++ b/src/hwdep_func.h
@@ -1,7 +1,6 @@
 /*
  */
 
-#include "recipe.h"
 #include "global.h"
 #include "hwdep_types.h"
 
diff --git a/src/pcm.h b/src/pcm.h
index cbe827d..535382f 100644
--- a/src/pcm.h
+++ b/src/pcm.h
@@ -22,6 +22,7 @@
 #ifndef __ALSA_PCM_H_INC
 #define __ALSA_PCM_H_INC
 
+#include "recipe.h"
 #include "pcm_func.h"
 
 #include "pcm_macros.h"
diff --git a/src/pcm_abi.c b/src/pcm_abi.c
index e53eb6d..256e38f 100644
--- a/src/pcm_abi.c
+++ b/src/pcm_abi.c
@@ -1,3 +1,5 @@
+#include "recipe.h"
+#undef SALSA_MARK_DEPRECATED
 #include "pcm_func.h"
 #undef __SALSA_EXPORT_FUNC
 #define __SALSA_EXPORT_FUNC
diff --git a/src/pcm_func.h b/src/pcm_func.h
index 6b8a00a..6e407e4 100644
--- a/src/pcm_func.h
+++ b/src/pcm_func.h
@@ -1,7 +1,6 @@
 /*
  */
 
-#include "recipe.h"
 #include "global.h"
 #include "output.h"
 #include "pcm_types.h"
diff --git a/src/pcm_macros.h b/src/pcm_macros.h
index a0cb3d6..0d6b899 100644
--- a/src/pcm_macros.h
+++ b/src/pcm_macros.h
@@ -177,7 +177,7 @@ int _snd_pcm_hwsync(snd_pcm_t *pcm)
 
 /* exported: snd_pcm_hwsync() is now deprecated */
 __SALSA_EXPORT_FUNC
-__attribute__ ((deprecated))
+__SALSA_DEPRECATED
 int snd_pcm_hwsync(snd_pcm_t *pcm)
 {
 	return _snd_pcm_hwsync(pcm);
@@ -1644,7 +1644,7 @@ int snd_pcm_hw_params_set_buffer_size_last(snd_pcm_t *pcm,
 
 
 __SALSA_EXPORT_FUNC
-__attribute__ ((deprecated))
+__SALSA_DEPRECATED
 int snd_pcm_hw_params_get_tick_time(const snd_pcm_hw_params_t *params,
 				    unsigned int *val, int *dir)
 {
@@ -1652,7 +1652,7 @@ int snd_pcm_hw_params_get_tick_time(const snd_pcm_hw_params_t *params,
 }
 
 __SALSA_EXPORT_FUNC
-__attribute__ ((deprecated))
+__SALSA_DEPRECATED
 int snd_pcm_hw_params_get_tick_time_min(const snd_pcm_hw_params_t *params,
 					unsigned int *val, int *dir)
 {
@@ -1660,7 +1660,7 @@ int snd_pcm_hw_params_get_tick_time_min(const snd_pcm_hw_params_t *params,
 }
 
 __SALSA_EXPORT_FUNC
-__attribute__ ((deprecated))
+__SALSA_DEPRECATED
 int snd_pcm_hw_params_get_tick_time_max(const snd_pcm_hw_params_t *params,
 					unsigned int *val, int *dir)
 {
@@ -1668,7 +1668,7 @@ int snd_pcm_hw_params_get_tick_time_max(const snd_pcm_hw_params_t *params,
 }
 
 __SALSA_EXPORT_FUNC
-__attribute__ ((deprecated))
+__SALSA_DEPRECATED
 int snd_pcm_hw_params_test_tick_time(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
 				     unsigned int val, int dir)
 {
@@ -1677,7 +1677,7 @@ int snd_pcm_hw_params_test_tick_time(snd_pcm_t *pcm, snd_pcm_hw_params_t *params
 }
 
 __SALSA_EXPORT_FUNC
-__attribute__ ((deprecated))
+__SALSA_DEPRECATED
 int snd_pcm_hw_params_set_tick_time(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
 				    unsigned int val, int dir)
 {
@@ -1686,7 +1686,7 @@ int snd_pcm_hw_params_set_tick_time(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
 }
 
 __SALSA_EXPORT_FUNC
-__attribute__ ((deprecated))
+__SALSA_DEPRECATED
 int snd_pcm_hw_params_set_tick_time_min(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
 					unsigned int *val, int *dir)
 {
@@ -1695,7 +1695,7 @@ int snd_pcm_hw_params_set_tick_time_min(snd_pcm_t *pcm, snd_pcm_hw_params_t *par
 }
 
 __SALSA_EXPORT_FUNC
-__attribute__ ((deprecated))
+__SALSA_DEPRECATED
 int snd_pcm_hw_params_set_tick_time_max(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
 					unsigned int *val, int *dir)
 {
@@ -1704,7 +1704,7 @@ int snd_pcm_hw_params_set_tick_time_max(snd_pcm_t *pcm, snd_pcm_hw_params_t *par
 }
 
 __SALSA_EXPORT_FUNC
-__attribute__ ((deprecated))
+__SALSA_DEPRECATED
 int snd_pcm_hw_params_set_tick_time_minmax(snd_pcm_t *pcm,
 					   snd_pcm_hw_params_t *params,
 					   unsigned int *min, int *mindir,
@@ -1715,7 +1715,7 @@ int snd_pcm_hw_params_set_tick_time_minmax(snd_pcm_t *pcm,
 }
 
 __SALSA_EXPORT_FUNC
-__attribute__ ((deprecated))
+__SALSA_DEPRECATED
 int snd_pcm_hw_params_set_tick_time_near(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
 					 unsigned int *val, int *dir)
 {
@@ -1724,7 +1724,7 @@ int snd_pcm_hw_params_set_tick_time_near(snd_pcm_t *pcm, snd_pcm_hw_params_t *pa
 }
 
 __SALSA_EXPORT_FUNC
-__attribute__ ((deprecated))
+__SALSA_DEPRECATED
 int snd_pcm_hw_params_set_tick_time_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
 					  unsigned int *val, int *dir)
 {
@@ -1733,7 +1733,7 @@ int snd_pcm_hw_params_set_tick_time_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *p
 }
 
 __SALSA_EXPORT_FUNC
-__attribute__ ((deprecated))
+__SALSA_DEPRECATED
 int snd_pcm_hw_params_set_tick_time_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
 					 unsigned int *val, int *dir)
 {
@@ -1776,7 +1776,7 @@ int snd_pcm_sw_params_get_tstamp_mode(const snd_pcm_sw_params_t *params,
 }
 
 __SALSA_EXPORT_FUNC
-__attribute__ ((deprecated))
+__SALSA_DEPRECATED
 int snd_pcm_sw_params_set_sleep_min(snd_pcm_t *pcm, snd_pcm_sw_params_t *params,
 				    unsigned int val)
 {
@@ -1785,7 +1785,7 @@ int snd_pcm_sw_params_set_sleep_min(snd_pcm_t *pcm, snd_pcm_sw_params_t *params,
 }
 
 __SALSA_EXPORT_FUNC
-__attribute__ ((deprecated))
+__SALSA_DEPRECATED
 int snd_pcm_sw_params_get_sleep_min(const snd_pcm_sw_params_t *params,
 				    unsigned int *val)
 {
@@ -1817,7 +1817,7 @@ int snd_pcm_sw_params_get_avail_min(const snd_pcm_sw_params_t *params,
 
 
 __SALSA_EXPORT_FUNC
-__attribute__ ((deprecated))
+__SALSA_DEPRECATED
 int snd_pcm_sw_params_set_xfer_align(snd_pcm_t *pcm, snd_pcm_sw_params_t *params,
 				     snd_pcm_uframes_t val)
 {
@@ -1826,7 +1826,7 @@ int snd_pcm_sw_params_set_xfer_align(snd_pcm_t *pcm, snd_pcm_sw_params_t *params
 }
 
 __SALSA_EXPORT_FUNC
-__attribute__ ((deprecated))
+__SALSA_DEPRECATED
 int snd_pcm_sw_params_get_xfer_align(const snd_pcm_sw_params_t *params,
 				     snd_pcm_uframes_t *val)
 {
diff --git a/src/pcm_params.c b/src/pcm_params.c
index 298dd3e..b0d490c 100644
--- a/src/pcm_params.c
+++ b/src/pcm_params.c
@@ -928,6 +928,11 @@ int _snd_pcm_hw_param_set_near(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
 	return err;
 }
 
+snd_mask_t *_snd_pcm_hw_param_get_mask(snd_pcm_hw_params_t *params, int var)
+{
+	return hw_param_mask(params, var);
+}
+
 static int snd_pcm_hw_params_choose(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
 {
 	struct param_choice {
diff --git a/src/rawmidi.h b/src/rawmidi.h
index 2c3607d..5d29446 100644
--- a/src/rawmidi.h
+++ b/src/rawmidi.h
@@ -22,6 +22,7 @@
 #ifndef __ALSA_RAWMIDI_H
 #define __ALSA_RAWMIDI_H
 
+#include "recipe.h"
 #include "rawmidi_func.h"
 
 #include "rawmidi_macros.h"
diff --git a/src/rawmidi_abi.c b/src/rawmidi_abi.c
index deeae47..c36ab8f 100644
--- a/src/rawmidi_abi.c
+++ b/src/rawmidi_abi.c
@@ -1,3 +1,4 @@
+#include "recipe.h"
 #include "rawmidi_func.h"
 #undef __SALSA_EXPORT_FUNC
 #define __SALSA_EXPORT_FUNC
diff --git a/src/rawmidi_func.h b/src/rawmidi_func.h
index 4c84236..6122ee2 100644
--- a/src/rawmidi_func.h
+++ b/src/rawmidi_func.h
@@ -1,7 +1,6 @@
 /*
  */
 
-#include "recipe.h"
 #include "global.h"
 #include "rawmidi_types.h"
 
diff --git a/src/timer.h b/src/timer.h
index c70e8e0..5c51571 100644
--- a/src/timer.h
+++ b/src/timer.h
@@ -22,6 +22,7 @@
 #ifndef __ALSA_TIMER_H
 #define __ALSA_TIMER_H
 
+#include "recipe.h"
 #include "timer_func.h"
 
 #include "timer_macros.h"
diff --git a/src/timer_abi.c b/src/timer_abi.c
index e579523..4783595 100644
--- a/src/timer_abi.c
+++ b/src/timer_abi.c
@@ -1,3 +1,4 @@
+#include "recipe.h"
 #include "timer_func.h"
 #undef __SALSA_EXPORT_FUNC
 #define __SALSA_EXPORT_FUNC
diff --git a/src/timer_func.h b/src/timer_func.h
index 7942b19..b9faaf4 100644
--- a/src/timer_func.h
+++ b/src/timer_func.h
@@ -1,7 +1,6 @@
 /*
  */
 
-#include "recipe.h"
 #include "global.h"
 #include "hcontrol.h"
 #include "timer_types.h"