more regs from 2.2 version of specs

1 files changed, 61 insertions, 31 deletions

diff --git a/sys/dev/ic/ac97.h b/sys/dev/ic/ac97.h
index d1e4cba16f0..d928ec0e2a3 100644
--- a/sys/dev/ic/ac97.h
+++ b/sys/dev/ic/ac97.h
@@ -1,9 +1,9 @@
-/*      $OpenBSD: ac97.h,v 1.5 2001/03/03 21:28:28 deraadt Exp $ */
+/*	$OpenBSD: ac97.h,v 1.6 2001/05/16 05:05:19 mickey Exp $	*/
 
 /*
  * Copyright (c) 1999 Constantine Sapuntzakis
  *
- * Author:        Constantine Sapuntzakis <csapuntz@stanford.edu>
+ * 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
@@ -29,7 +29,7 @@
 
 struct ac97_codec_if;
 
-/* 
+/*
  * This is the interface used to attach the AC97 compliant CODEC.
  */
 struct ac97_host_if {
@@ -56,13 +56,13 @@ struct ac97_codec_if_vtbl {
 	int (*mixer_get_port)(struct ac97_codec_if *addr, mixer_ctrl_t *cp);
 	int (*mixer_set_port)(struct ac97_codec_if *addr, mixer_ctrl_t *cp);
 	int (*query_devinfo)(struct ac97_codec_if *addr, mixer_devinfo_t *cp);
-	int (*get_portnum_by_name)(struct ac97_codec_if *addr,
-				      char *class, char *device,
-				      char *qualifier);
+	int (*get_portnum_by_name)(struct ac97_codec_if *addr, char *class,
+	    char *device, char *qualifier);
 
-	/* The AC97 codec driver records the various port settings. This
-	   function can be used to restore the port settings, e.g.
-	   after resume from a laptop suspend to disk.
+	/*
+	 *     The AC97 codec driver records the various port settings.
+	 * This function can be used to restore the port settings, e.g.
+	 * after resume from a laptop suspend to disk.
 	 */
 	void (*restore_ports)(struct ac97_codec_if *addr);
 };
@@ -73,25 +73,55 @@ struct ac97_codec_if {
 
 int ac97_attach __P((struct ac97_host_if *));
 
-#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_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_MODEM_SAMPLE_RATE	0x24
+#define	AC97_REG_POWER			0x26
+	/* Extended Audio Register Set */
+#define	AC97_REG_EXT_AUDIO_ID		0x28
+#define	AC97_REG_EXT_AUDIO_CTRL		0x2a
+#define	AC97_EXT_AUDIO_VRA		0x0001
+#define	AC97_EXT_AUDIO_DRA		0x0002
+#define	AC97_EXT_AUDIO_SPDIF		0x0004
+#define	AC97_EXT_AUDIO_VRM		0x0008
+#define	AC97_EXT_AUDIO_DSA		0x0030
+#define	AC97_EXT_AUDIO_CDAC		0x0040
+#define	AC97_EXT_AUDIO_SDAC		0x0080
+#define	AC97_EXT_AUDIO_LDAC		0x0100
+#define	AC97_EXT_AUDIO_AMAP		0x0200
+#define	AC97_EXT_AUDIO_REV_11		0x0000
+#define	AC97_EXT_AUDIO_REV_22		0x0400
+#define	AC97_EXT_AUDIO_REV_MASK		0x0c00
+#define	AC97_EXT_AUDIO_ID		0xc000
+#define	AC97_EXT_AUDIO_BITS		"\020\01vra\02dra\03spdif\04vrm\05dsa0\06dsa1\07cdac\010sdac\011ldac\012amap\013rev0\014rev1\017id0\020id1"
+#define	AC97_REG_FRONT_DAC_RATE		0x2c
+#define	AC97_REG_SURROUND_DAC_RATE	0x2e
+#define	AC97_REG_PCM_DAC_RATE		0x30
+#define	AC97_REG_PCM_ADC_RATE		0x32
+#define	AC97_REG_MIC_ADC_RATE		0x34
+#define	AC97_REG_CENTER_LFE_VOLUME	0x36
+#define	AC97_REG_SURROUND_VOLUME	0x38
+#define	AC97_REG_SPDIF_CTRL		0x3a
+#define	AC97_REG_SPDIF_CTRL_BITS	"\02\01pro\02/audio\03copy\04pre\014l\017drs\020valid"
+
+#define	AC97_REG_VENDOR_ID1		0x7c
+#define	AC97_REG_VENDOR_ID2		0x7e
+#define	AC97_VENDOR_ID_MASK		0xffffff00
+