Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move register definitions into ac97reg.h

Browse Source
This commit is contained in:
thorpej 2000-05-15 01:32:03 +00:00
parent 1838aef29c
commit 706ee091ed
2 changed files with 65 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sys/dev/ic/ac97.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ac97.c,v 1.9 2000/05/15 01:27:44 thorpej Exp $ */
/* $NetBSD: ac97.c,v 1.10 2000/05/15 01:32:03 thorpej Exp $ */
/* $OpenBSD: ac97.c,v 1.2 1999/09/21 16:06:27 csapuntz Exp $ */
/*
@ -67,30 +67,9 @@
#include <sys/audioio.h>
#include <dev/audio_if.h>
#include <dev/ic/ac97var.h>
#define AC97_REG_RESET 0x00
#define AC97_SOUND_ENHANCEMENT(reg) (((reg) >> 10) & 0x1f)
#define AC97_REG_MASTER_VOLUME 0x02
#define AC97_REG_HEADPHONE_VOLUME 0x04
#define AC97_REG_MASTER_VOLUME_MONO 0x06
#define AC97_REG_MASTER_TONE 0x08
#define AC97_REG_PCBEEP_VOLUME 0x0a
#define AC97_REG_PHONE_VOLUME 0x0c
#define AC97_REG_MIC_VOLUME 0x0e
#define AC97_REG_LINEIN_VOLUME 0x10
#define AC97_REG_CD_VOLUME 0x12
#define AC97_REG_VIDEO_VOLUME 0x14
#define AC97_REG_AUX_VOLUME 0x16
#define AC97_REG_PCMOUT_VOLUME 0x18
#define AC97_REG_RECORD_SELECT 0x1a
#define AC97_REG_RECORD_GAIN 0x1c
#define AC97_REG_RECORD_GAIN_MIC 0x1e
#define AC97_REG_GP 0x20
#define AC97_REG_3D_CONTROL 0x22
#define AC97_REG_POWER 0x26
#define AC97_REG_VENDOR_ID1 0x7c
#define AC97_REG_VENDOR_ID2 0x7e
#include <dev/ic/ac97reg.h>
#include <dev/ic/ac97var.h>
static struct audio_mixer_enum ac97_on_off = { 2,
{ { { AudioNoff } , 0 },
@ -290,17 +269,6 @@ struct ac97_codec_if_vtbl ac97civ = {
ac97_get_portnum_by_name
};
#define AC97_CODEC_ID(a0, a1, a2, x) \
(((a0) << 24) | ((a1) << 16) | ((a2) << 8) | (x))
#define AC97_GET_CODEC_ID(id, cp) \
do { \
(cp)[0] = ((id) >> 24) & 0xff; \
(cp)[1] = ((id) >> 16) & 0xff; \
(cp)[2] = ((id) >> 8) & 0xff; \
(cp)[3] = (id) & 0xff; \
} while (0)
static const struct ac97_codecid {
u_int32_t id;
const char *name;

62
sys/dev/ic/ac97reg.h Normal file
View File

@ -0,0 +1,62 @@
/* $NetBSD: ac97reg.h,v 1.1 2000/05/15 01:32:03 thorpej Exp $ */
/*
* Copyright (c) 1999 Constantine Sapuntzakis
*
* Author: Constantine Sapuntzakis <csapuntz@stanford.edu>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY CONSTANTINE SAPUNTZAKIS AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#define AC97_REG_RESET 0x00
#define AC97_SOUND_ENHANCEMENT(reg) (((reg) >> 10) & 0x1f)
#define AC97_REG_MASTER_VOLUME 0x02
#define AC97_REG_HEADPHONE_VOLUME 0x04
#define AC97_REG_MASTER_VOLUME_MONO 0x06
#define AC97_REG_MASTER_TONE 0x08
#define AC97_REG_PCBEEP_VOLUME 0x0a
#define AC97_REG_PHONE_VOLUME 0x0c
#define AC97_REG_MIC_VOLUME 0x0e
#define AC97_REG_LINEIN_VOLUME 0x10
#define AC97_REG_CD_VOLUME 0x12
#define AC97_REG_VIDEO_VOLUME 0x14
#define AC97_REG_AUX_VOLUME 0x16
#define AC97_REG_PCMOUT_VOLUME 0x18
#define AC97_REG_RECORD_SELECT 0x1a
#define AC97_REG_RECORD_GAIN 0x1c
#define AC97_REG_RECORD_GAIN_MIC 0x1e
#define AC97_REG_GP 0x20
#define AC97_REG_3D_CONTROL 0x22
#define AC97_REG_POWER 0x26
#define AC97_REG_VENDOR_ID1 0x7c
#define AC97_REG_VENDOR_ID2 0x7e
#define AC97_CODEC_ID(a0, a1, a2, x) \
(((a0) << 24) | ((a1) << 16) | ((a2) << 8) | (x))
#define AC97_GET_CODEC_ID(id, cp) \
do { \
(cp)[0] = ((id) >> 24) & 0xff; \
(cp)[1] = ((id) >> 16) & 0xff; \
(cp)[2] = ((id) >> 8) & 0xff; \
(cp)[3] = (id) & 0xff; \
} while (0)