At Sun, 22 Nov 2009 17:23:45 +0100,
Krzysztof Helt wrote:
>
> From: Krzysztof Helt <krzysztof.h1@xxxxx>
>
> Move the miro.h header to the include/sound directory. It can
> be used in the Miro PCM20 radio driver (v4l).
>
> Signed-off-by: Krzysztof Helt <krzysztof.h1@xxxxx>
> ---
> This is a part of my effort to restore the PCM20's radio driver.
OK, I applied both patches now.
But, I'm not going to push these for 2.6.33 since it's fairly late for
any new stuff, especially if it's a cross-subsystem one.
The changes are tracked on the master branch of sound git tree, so
don't worry.
Thanks!
Takashi
>
> include/sound/aci.h | 73 ++++++++++++++++++++++++++++++++++++++++++++++
> sound/isa/opti9xx/miro.c | 2 +-
> sound/isa/opti9xx/miro.h | 73 ----------------------------------------------
> 3 files changed, 74 insertions(+), 74 deletions(-)
> create mode 100644 include/sound/aci.h
> delete mode 100644 sound/isa/opti9xx/miro.h
>
> diff --git a/include/sound/aci.h b/include/sound/aci.h
> new file mode 100644
> index 0000000..bb796d0
> --- /dev/null
> +++ b/include/sound/aci.h
> @@ -0,0 +1,73 @@
> +#ifndef _ACI_H_
> +#define _ACI_H_
> +
> +#define ACI_REG_COMMAND 0 /* write register offset */
> +#define ACI_REG_STATUS 1 /* read register offset */
> +#define ACI_REG_BUSY 2 /* busy register offset */
> +#define ACI_REG_RDS 2 /* PCM20: RDS register offset */
> +#define ACI_MINTIME 500 /* ACI time out limit */
> +
> +#define ACI_SET_MUTE 0x0d
> +#define ACI_SET_POWERAMP 0x0f
> +#define ACI_SET_TUNERMUTE 0xa3
> +#define ACI_SET_TUNERMONO 0xa4
> +#define ACI_SET_IDE 0xd0
> +#define ACI_SET_WSS 0xd1
> +#define ACI_SET_SOLOMODE 0xd2
> +#define ACI_SET_PREAMP 0x03
> +#define ACI_GET_PREAMP 0x21
> +#define ACI_WRITE_TUNE 0xa7
> +#define ACI_READ_TUNERSTEREO 0xa8
> +#define ACI_READ_TUNERSTATION 0xa9
> +#define ACI_READ_VERSION 0xf1
> +#define ACI_READ_IDCODE 0xf2
> +#define ACI_INIT 0xff
> +#define ACI_STATUS 0xf0
> +#define ACI_S_GENERAL 0x00
> +#define ACI_ERROR_OP 0xdf
> +
> +/* ACI Mixer */
> +
> +/* These are the values for the right channel GET registers.
> + Add an offset of 0x01 for the left channel register.
> + (left=right+0x01) */
> +
> +#define ACI_GET_MASTER 0x03
> +#define ACI_GET_MIC 0x05
> +#define ACI_GET_LINE 0x07
> +#define ACI_GET_CD 0x09
> +#define ACI_GET_SYNTH 0x0b
> +#define ACI_GET_PCM 0x0d
> +#define ACI_GET_LINE1 0x10 /* Radio on PCM20 */
> +#define ACI_GET_LINE2 0x12
> +
> +#define ACI_GET_EQ1 0x22 /* from Bass ... */
> +#define ACI_GET_EQ2 0x24
> +#define ACI_GET_EQ3 0x26
> +#define ACI_GET_EQ4 0x28
> +#define ACI_GET_EQ5 0x2a
> +#define ACI_GET_EQ6 0x2c
> +#define ACI_GET_EQ7 0x2e /* ... to Treble */
> +
> +/* And these are the values for the right channel SET registers.
> + For left channel access you have to add an offset of 0x08.
> + MASTER is an exception, which needs an offset of 0x01 */
> +
> +#define ACI_SET_MASTER 0x00
> +#define ACI_SET_MIC 0x30
> +#define ACI_SET_LINE 0x31
> +#define ACI_SET_CD 0x34
> +#define ACI_SET_SYNTH 0x33
> +#define ACI_SET_PCM 0x32
> +#define ACI_SET_LINE1 0x35 /* Radio on PCM20 */
> +#define ACI_SET_LINE2 0x36
> +
> +#define ACI_SET_EQ1 0x40 /* from Bass ... */
> +#define ACI_SET_EQ2 0x41
> +#define ACI_SET_EQ3 0x42
> +#define ACI_SET_EQ4 0x43
> +#define ACI_SET_EQ5 0x44
> +#define ACI_SET_EQ6 0x45
> +#define ACI_SET_EQ7 0x46 /* ... to Treble */
> +
> +#endif /* _ACI_H_ */
> diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c
> index db4a4fb..932a067 100644
> --- a/sound/isa/opti9xx/miro.c
> +++ b/sound/isa/opti9xx/miro.c
> @@ -40,7 +40,7 @@
> #define SNDRV_LEGACY_FIND_FREE_IRQ
> #define SNDRV_LEGACY_FIND_FREE_DMA
> #include <sound/initval.h>
> -#include "miro.h"
> +#include <sound/aci.h>
>
> MODULE_AUTHOR("Martin Langer <martin-langer@xxxxxx>");
> MODULE_LICENSE("GPL");
> diff --git a/sound/isa/opti9xx/miro.h b/sound/isa/opti9xx/miro.h
> deleted file mode 100644
> index 6e1385b..0000000
> --- a/sound/isa/opti9xx/miro.h
> +++ /dev/null
> @@ -1,73 +0,0 @@
> -#ifndef _MIRO_H_
> -#define _MIRO_H_
> -
> -#define ACI_REG_COMMAND 0 /* write register offset */
> -#define ACI_REG_STATUS 1 /* read register offset */
> -#define ACI_REG_BUSY 2 /* busy register offset */
> -#define ACI_REG_RDS 2 /* PCM20: RDS register offset */
> -#define ACI_MINTIME 500 /* ACI time out limit */
> -
> -#define ACI_SET_MUTE 0x0d
> -#define ACI_SET_POWERAMP 0x0f
> -#define ACI_SET_TUNERMUTE 0xa3
> -#define ACI_SET_TUNERMONO 0xa4
> -#define ACI_SET_IDE 0xd0
> -#define ACI_SET_WSS 0xd1
> -#define ACI_SET_SOLOMODE 0xd2
> -#define ACI_SET_PREAMP 0x03
> -#define ACI_GET_PREAMP 0x21
> -#define ACI_WRITE_TUNE 0xa7
> -#define ACI_READ_TUNERSTEREO 0xa8
> -#define ACI_READ_TUNERSTATION 0xa9
> -#define ACI_READ_VERSION 0xf1
> -#define ACI_READ_IDCODE 0xf2
> -#define ACI_INIT 0xff
> -#define ACI_STATUS 0xf0
> -#define ACI_S_GENERAL 0x00
> -#define ACI_ERROR_OP 0xdf
> -
> -/* ACI Mixer */
> -
> -/* These are the values for the right channel GET registers.
> - Add an offset of 0x01 for the left channel register.
> - (left=right+0x01) */
> -
> -#define ACI_GET_MASTER 0x03
> -#define ACI_GET_MIC 0x05
> -#define ACI_GET_LINE 0x07
> -#define ACI_GET_CD 0x09
> -#define ACI_GET_SYNTH 0x0b
> -#define ACI_GET_PCM 0x0d
> -#define ACI_GET_LINE1 0x10 /* Radio on PCM20 */
> -#define ACI_GET_LINE2 0x12
> -
> -#define ACI_GET_EQ1 0x22 /* from Bass ... */
> -#define ACI_GET_EQ2 0x24
> -#define ACI_GET_EQ3 0x26
> -#define ACI_GET_EQ4 0x28
> -#define ACI_GET_EQ5 0x2a
> -#define ACI_GET_EQ6 0x2c
> -#define ACI_GET_EQ7 0x2e /* ... to Treble */
> -
> -/* And these are the values for the right channel SET registers.
> - For left channel access you have to add an offset of 0x08.
> - MASTER is an exception, which needs an offset of 0x01 */
> -
> -#define ACI_SET_MASTER 0x00
> -#define ACI_SET_MIC 0x30
> -#define ACI_SET_LINE 0x31
> -#define ACI_SET_CD 0x34
> -#define ACI_SET_SYNTH 0x33
> -#define ACI_SET_PCM 0x32
> -#define ACI_SET_LINE1 0x35 /* Radio on PCM20 */
> -#define ACI_SET_LINE2 0x36
> -
> -#define ACI_SET_EQ1 0x40 /* from Bass ... */
> -#define ACI_SET_EQ2 0x41
> -#define ACI_SET_EQ3 0x42
> -#define ACI_SET_EQ4 0x43
> -#define ACI_SET_EQ5 0x44
> -#define ACI_SET_EQ6 0x45
> -#define ACI_SET_EQ7 0x46 /* ... to Treble */
> -
> -#endif /* _MIRO_H_ */
> --
> 1.6.4
>
>
> ----------------------------------------------------------------------
> Internetowi nie placa! Otworz Konto Direct.
> Kliknij >> http://link.interia.pl/f2448
>
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
