History

Merge branch 'for-next' into topic/hda-core

Takashi Iwai committed 11 years ago

Commit 3372dbd2 parents bc465aa 967b130166 files · +4283 −5504Browse files

Showing the changes to include/uapi (5 of 166 files). Show all

Unified · Split

5 files
  1. include/uapi/sound/asequencer.h +1 −0
  2. include/uapi/sound/asound.h +34 −5
  3. include/uapi/sound/compress_offload.h +1 −1
  4. include/uapi/sound/emu10k1.h +1 −2
  5. include/uapi/sound/hdspm.h +6 −0
include/uapi/sound/asequencer.h+1−0
@@ -22,6 +22,7 @@ · 21 unmodified lines
2222 #ifndef _UAPI__SOUND_ASEQUENCER_H
2323 #define _UAPI__SOUND_ASEQUENCER_H
2424
25+#include <sound/asound.h>
2526
2627 /** version of the sequencer */
2728 #define SNDRV_SEQ_VERSION SNDRV_PROTOCOL_VERSION (1, 0, 1)
include/uapi/sound/asound.h+34−5
@@ -25,6 +25,9 @@ · 24 unmodified lines
2525
2626 #include <linux/types.h>
2727
28+#ifndef __KERNEL__
29+#include <stdlib.h>
30+#endif
2831
2932 /*
3033 * protocol version
@@ -140,7 +143,7 @@ struct snd_hwdep_dsp_image { · 109 unmodified lines
140143 * *
141144 *****************************************************************************/
142145
143−#define SNDRV_PCM_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 12)
146+#define SNDRV_PCM_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 13)
144147
145148 typedef unsigned long snd_pcm_uframes_t;
146149 typedef signed long snd_pcm_sframes_t;
@@ -267,10 +270,17 @@ typedef int __bitwise snd_pcm_subformat_t; · 120 unmodified lines
267270 #define SNDRV_PCM_INFO_JOINT_DUPLEX 0x00200000 /* playback and capture stream are somewhat correlated */
268271 #define SNDRV_PCM_INFO_SYNC_START 0x00400000 /* pcm support some kind of sync go */
269272 #define SNDRV_PCM_INFO_NO_PERIOD_WAKEUP 0x00800000 /* period wakeup can be disabled */
270−#define SNDRV_PCM_INFO_HAS_WALL_CLOCK 0x01000000 /* has audio wall clock for audio/system time sync */
273+#define SNDRV_PCM_INFO_HAS_WALL_CLOCK 0x01000000 /* (Deprecated)has audio wall clock for audio/system time sync */
274+#define SNDRV_PCM_INFO_HAS_LINK_ATIME 0x01000000 /* report hardware link audio time, reset on startup */
275+#define SNDRV_PCM_INFO_HAS_LINK_ABSOLUTE_ATIME 0x02000000 /* report absolute hardware link audio time, not reset on startup */
276+#define SNDRV_PCM_INFO_HAS_LINK_ESTIMATED_ATIME 0x04000000 /* report estimated link audio time */
277+#define SNDRV_PCM_INFO_HAS_LINK_SYNCHRONIZED_ATIME 0x08000000 /* report synchronized audio/system time */
278+
271279 #define SNDRV_PCM_INFO_DRAIN_TRIGGER 0x40000000 /* internal kernel flag - trigger in drain */
272280 #define SNDRV_PCM_INFO_FIFO_IN_FRAMES 0x80000000 /* internal kernel flag - FIFO size is in frames */
273281
282+
283+
274284 typedef int __bitwise snd_pcm_state_t;
275285 #define SNDRV_PCM_STATE_OPEN ((__force snd_pcm_state_t) 0) /* stream is open */
276286 #define SNDRV_PCM_STATE_SETUP ((__force snd_pcm_state_t) 1) /* stream has a setup */
@@ -408,6 +418,22 @@ struct snd_pcm_channel_info { · 131 unmodified lines
408418 unsigned int step; /* samples distance in bits */
409419 };
410420
421+enum {
422+ /*
423+ * first definition for backwards compatibility only,
424+ * maps to wallclock/link time for HDAudio playback and DEFAULT/DMA time for everything else
425+ */
426+ SNDRV_PCM_AUDIO_TSTAMP_TYPE_COMPAT = 0,
427+
428+ /* timestamp definitions */
429+ SNDRV_PCM_AUDIO_TSTAMP_TYPE_DEFAULT = 1, /* DMA time, reported as per hw_ptr */
430+ SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK = 2, /* link time reported by sample or wallclock counter, reset on startup */
431+ SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK_ABSOLUTE = 3, /* link time reported by sample or wallclock counter, not reset on startup */
432+ SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK_ESTIMATED = 4, /* link time estimated indirectly */
433+ SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK_SYNCHRONIZED = 5, /* link time synchronized with system time */
434+ SNDRV_PCM_AUDIO_TSTAMP_TYPE_LAST = SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK_SYNCHRONIZED
435+};
436+
411437 struct snd_pcm_status {
412438 snd_pcm_state_t state; /* stream state */
413439 struct timespec trigger_tstamp; /* time when stream was started/stopped/paused */
@@ -419,9 +445,11 @@ struct snd_pcm_status { · 5 unmodified lines
419445 snd_pcm_uframes_t avail_max; /* max frames available on hw since last status */
420446 snd_pcm_uframes_t overrange; /* count of ADC (capture) overrange detections from last status */
421447 snd_pcm_state_t suspended_state; /* suspended stream state */
422− __u32 reserved_alignment; /* must be filled with zero */
423− struct timespec audio_tstamp; /* from sample counter or wall clock */
424− unsigned char reserved[56-sizeof(struct timespec)]; /* must be filled with zero */
448+ __u32 audio_tstamp_data; /* needed for 64-bit alignment, used for configs/report to/from userspace */
449+ struct timespec audio_tstamp; /* sample counter, wall clock, PHC or on-demand sync'ed */
450+ struct timespec driver_tstamp; /* useful in case reference system tstamp is reported with delay */
451+ __u32 audio_tstamp_accuracy; /* in ns units, only valid if indicated in audio_tstamp_data */
452+ unsigned char reserved[52-2*sizeof(struct timespec)]; /* must be filled with zero */
425453 };
426454
427455 struct snd_pcm_mmap_status {
@@ -534,6 +562,7 @@ enum { · 106 unmodified lines
534562 #define SNDRV_PCM_IOCTL_DELAY _IOR('A', 0x21, snd_pcm_sframes_t)
535563 #define SNDRV_PCM_IOCTL_HWSYNC _IO('A', 0x22)
536564 #define SNDRV_PCM_IOCTL_SYNC_PTR _IOWR('A', 0x23, struct snd_pcm_sync_ptr)
565+#define SNDRV_PCM_IOCTL_STATUS_EXT _IOWR('A', 0x24, struct snd_pcm_status)
537566 #define SNDRV_PCM_IOCTL_CHANNEL_INFO _IOR('A', 0x32, struct snd_pcm_channel_info)
538567 #define SNDRV_PCM_IOCTL_PREPARE _IO('A', 0x40)
539568 #define SNDRV_PCM_IOCTL_RESET _IO('A', 0x41)
include/uapi/sound/compress_offload.h+1−1
@@ -75,7 +75,7 @@ struct snd_compr_tstamp { · 74 unmodified lines
7575 /**
7676 * struct snd_compr_avail - avail descriptor
7777 * @avail: Number of bytes available in ring buffer for writing/reading
78− * @tstamp: timestamp infomation
78+ * @tstamp: timestamp information
7979 */
8080 struct snd_compr_avail {
8181 __u64 avail;
include/uapi/sound/emu10k1.h+1−2
@@ -23,8 +23,7 @@ · 22 unmodified lines
2323 #define _UAPI__SOUND_EMU10K1_H
2424
2525 #include <linux/types.h>
26−
27−
26+#include <sound/asound.h>
2827
2928 /*
3029 * ---- FX8010 ----
include/uapi/sound/hdspm.h+6−0
@@ -20,6 +20,12 @@ · 19 unmodified lines
2020 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
2121 */
2222
23+#ifdef __KERNEL__
24+#include <linux/types.h>
25+#else
26+#include <stdint.h>
27+#endif
28+
2329 /* Maximum channels is 64 even on 56Mode you have 64playbacks to matrix */
2430 #define HDSPM_MAX_CHANNELS 64
2531

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t