summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcg <cg@FreeBSD.org>2000-12-25 02:49:28 +0000
committercg <cg@FreeBSD.org>2000-12-25 02:49:28 +0000
commit1e51ad7c0a01932465db7255de869683e69cb7c7 (patch)
treef8cc4537a84f1f4ef07f284da99a5de5496eb232
parent4b49e441f54f2da20efb27db9e12d530cbef69dc (diff)
downloadFreeBSD-src-1e51ad7c0a01932465db7255de869683e69cb7c7.zip
FreeBSD-src-1e51ad7c0a01932465db7255de869683e69cb7c7.tar.gz
move parametric defines and structure definitions from .h to .c
-rw-r--r--sys/dev/sound/pci/via82c686.c13
-rw-r--r--sys/dev/sound/pci/via82c686.h12
2 files changed, 13 insertions, 12 deletions
diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c686.c
index 0fcea60..5f5a2b1 100644
--- a/sys/dev/sound/pci/via82c686.c
+++ b/sys/dev/sound/pci/via82c686.c
@@ -40,9 +40,22 @@
#define SEGS_PER_CHAN (NSEGS/2)
+#define TIMEOUT 50
+#define VIA_BUFFSIZE 0x4000
+
#undef DEB
#define DEB(x)
+/* we rely on this struct being packed to 64 bits */
+struct via_dma_op {
+ u_int32_t ptr;
+ u_int32_t flags;
+#define VIA_DMAOP_EOL 0x80000000
+#define VIA_DMAOP_FLAG 0x40000000
+#define VIA_DMAOP_STOP 0x20000000
+#define VIA_DMAOP_COUNT(x) ((x)&0x00FFFFFF)
+};
+
struct via_info;
struct via_chinfo {
diff --git a/sys/dev/sound/pci/via82c686.h b/sys/dev/sound/pci/via82c686.h
index 1d85c9b..a1fcf4b 100644
--- a/sys/dev/sound/pci/via82c686.h
+++ b/sys/dev/sound/pci/via82c686.h
@@ -49,15 +49,6 @@
* ftp://ftp.alsa-project.org/pub/manuals/ad/AD1881_0.pdf (example AC'97 codec)
*/
-struct via_dma_op {
- u_int32_t ptr;
- u_int32_t flags;
-#define VIA_DMAOP_EOL 0x80000000
-#define VIA_DMAOP_FLAG 0x40000000
-#define VIA_DMAOP_STOP 0x20000000
-#define VIA_DMAOP_COUNT(x) ((x)&0x00FFFFFF)
-};
-
#define VIA_PCICONF_MISC 0x41
#define VIA_PCICONF_ACLINKENAB 0x80 /* ac link enab */
#define VIA_PCICONF_ACNOTRST 0x40 /* ~(ac reset) */
@@ -102,7 +93,4 @@ struct via_dma_op {
#define AC97_REG_EXT_DAC_RATE 0x2C
#define AC97_REG_EXT_ADC_RATE 0x32
-#define TIMEOUT 50
-#define VIA_BUFFSIZE 0x4000
-
#endif /* _VIA_H */
OpenPOWER on IntegriCloud