diff options
| author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2010-11-23 12:01:55 +0530 |
|---|---|---|
| committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2010-11-23 12:01:55 +0530 |
| commit | 99021ee71173b95afdd9b2af6bcdafdb53eb82c1 (patch) | |
| tree | 74685f62d42eadd741c41a5f371eeb2eecc9cdea /include | |
| parent | 5d3ad2e2d95632f31b2cb0ae045fe53f85d7565a (diff) | |
| parent | b4d50aa63c58b8affa08f60f4dba415040845371 (diff) | |
merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Change-Id: Ibd208fc6b803bbf729d1f554839ebaee8c8461ce
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/tegra_audio.h | 36 | ||||
| -rw-r--r-- | include/video/tegrafb.h | 3 |
2 files changed, 12 insertions, 27 deletions
diff --git a/include/linux/tegra_audio.h b/include/linux/tegra_audio.h index 0ca6250beac4..db4661aacb4f 100644 --- a/include/linux/tegra_audio.h +++ b/include/linux/tegra_audio.h @@ -36,39 +36,21 @@ struct tegra_audio_in_config { #define TEGRA_AUDIO_IN_GET_CONFIG _IOR(TEGRA_AUDIO_MAGIC, 3, \ struct tegra_audio_in_config *) -struct tegra_audio_buf_config { - unsigned size; /* order */ - unsigned threshold; /* order */ - unsigned chunk; /* order */ -}; - -#define TEGRA_AUDIO_IN_SET_BUF_CONFIG _IOW(TEGRA_AUDIO_MAGIC, 4, \ - const struct tegra_audio_buf_config *) -#define TEGRA_AUDIO_IN_GET_BUF_CONFIG _IOR(TEGRA_AUDIO_MAGIC, 5, \ - struct tegra_audio_buf_config *) - -#define TEGRA_AUDIO_OUT_SET_BUF_CONFIG _IOW(TEGRA_AUDIO_MAGIC, 6, \ - const struct tegra_audio_buf_config *) -#define TEGRA_AUDIO_OUT_GET_BUF_CONFIG _IOR(TEGRA_AUDIO_MAGIC, 7, \ - struct tegra_audio_buf_config *) - -struct tegra_audio_error_counts { - unsigned late_dma; - unsigned full_empty; /* empty for playback, full for recording */ -}; - -#define TEGRA_AUDIO_IN_GET_ERROR_COUNT _IOR(TEGRA_AUDIO_MAGIC, 8, \ - struct tegra_audio_error_counts *) - -#define TEGRA_AUDIO_OUT_GET_ERROR_COUNT _IOR(TEGRA_AUDIO_MAGIC, 9, \ - struct tegra_audio_error_counts *) +#define TEGRA_AUDIO_IN_SET_NUM_BUFS _IOW(TEGRA_AUDIO_MAGIC, 4, \ + const unsigned int *) +#define TEGRA_AUDIO_IN_GET_NUM_BUFS _IOW(TEGRA_AUDIO_MAGIC, 5, \ + unsigned int *) +#define TEGRA_AUDIO_OUT_SET_NUM_BUFS _IOW(TEGRA_AUDIO_MAGIC, 6, \ + const unsigned int *) +#define TEGRA_AUDIO_OUT_GET_NUM_BUFS _IOW(TEGRA_AUDIO_MAGIC, 7, \ + unsigned int *) #define TEGRA_AUDIO_OUT_FLUSH _IO(TEGRA_AUDIO_MAGIC, 10) #define TEGRA_AUDIO_BIT_FORMAT_DEFAULT 0 #define TEGRA_AUDIO_BIT_FORMAT_DSP 1 #define TEGRA_AUDIO_SET_BIT_FORMAT _IOW(TEGRA_AUDIO_MAGIC, 11, \ - unsigned int *) + const unsigned int *) #define TEGRA_AUDIO_GET_BIT_FORMAT _IOR(TEGRA_AUDIO_MAGIC, 12, \ unsigned int *) diff --git a/include/video/tegrafb.h b/include/video/tegrafb.h index 79578c3d7bd4..b9861bc7953a 100644 --- a/include/video/tegrafb.h +++ b/include/video/tegrafb.h @@ -55,7 +55,10 @@ struct tegra_fb_windowattr { __u32 buff_id; __u32 blend; __u32 offset; + __u32 offset_u; + __u32 offset_v; __u32 stride; + __u32 stride_uv; __u32 pixformat; __u32 x; __u32 y; |