From 6d6c8c465aca2c8346e6a2cfb5b25682cf7537c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Mon, 21 Apr 2003 00:02:23 +0000 Subject: [PATCH] Added rev 10 for VT8233, debug traces git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3085 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c | 9 ++++----- src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.h | 1 + src/add-ons/kernel/drivers/audio/ac97/auvia/multi.c | 3 +++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c b/src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c index f5892d3124..9bb50c51c2 100644 --- a/src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c +++ b/src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c @@ -228,11 +228,11 @@ auvia_stream_curaddr(auvia_stream *stream) uint32 addr; if(IS_8233(&stream->card->config)) { addr = auvia_reg_read_32(&stream->card->config, stream->base + AUVIA_RP_DMAOPS_BASE); - //TRACE(("auvia_stream_curaddr %p\n", addr)); - //TRACE(("auvia_stream_curaddr %p\n", (uint32)stream->dmaops_phy_base)); + TRACE(("stream_curaddr %p, phy_base %p\n", addr, (uint32)stream->dmaops_phy_base)); return (addr - (uint32)stream->dmaops_phy_base - 4) / 8; } else { addr = auvia_reg_read_32(&stream->card->config, stream->base + AUVIA_RP_DMAOPS_BASE); + TRACE(("stream_curaddr %p, phy_base %p\n", addr, (uint32)stream->dmaops_phy_base)); return (addr - (uint32)stream->dmaops_phy_base - 8) / 8; } } @@ -374,8 +374,7 @@ int32 auvia_int(void *arg) //TRACE(("interrupt\n")); curblk = auvia_stream_curaddr(stream); - //TRACE(("AUVIA_RPSTAT_INTR at trigblk %lu\n", curblk)); - //TRACE(("AUVIA_RPSTAT_INTR at stream->trigblk %lu\n", stream->trigblk)); + TRACE(("RPSTAT_INTR at trigblk %lu, stream->trigblk %lu\n", curblk, stream->trigblk)); if (curblk == stream->trigblk) { //TRACE(("AUVIA_RPSTAT_INTR at trigblk %lu\n", curblk)); @@ -389,7 +388,7 @@ int32 auvia_int(void *arg) auvia_reg_write_8(&card->config, stream->base + AUVIA_RP_STAT, AUVIA_RPSTAT_INTR); } } else { - TRACE(("AUVIA_SGD_SHADOW %x %x\n", card->interrupt_mask, auvia_reg_read_32(&card->config, AUVIA_SGD_SHADOW))); + TRACE(("SGD_SHADOW %x %x\n", card->interrupt_mask, auvia_reg_read_32(&card->config, AUVIA_SGD_SHADOW))); } if(gotone) diff --git a/src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.h b/src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.h index fa01fd1007..46a6ca8d57 100644 --- a/src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.h +++ b/src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.h @@ -52,6 +52,7 @@ #define VIATECH_82C686_AC97_DEVICE_ID 0x3058 /* Via Technologies VT82C686 AC97 */ #define VIATECH_8233_AC97_DEVICE_ID 0x3059 /* Via Technologies VT8233 AC97 */ +#define VIATECH_8233_AC97_REV_8233_10 0x10 /* rev 10 */ #define VIATECH_8233_AC97_REV_8233C 0x20 #define VIATECH_8233_AC97_REV_8233 0x30 #define VIATECH_8233_AC97_REV_8233A 0x40 diff --git a/src/add-ons/kernel/drivers/audio/ac97/auvia/multi.c b/src/add-ons/kernel/drivers/audio/ac97/auvia/multi.c index 3129febc15..4785ce1187 100644 --- a/src/add-ons/kernel/drivers/audio/ac97/auvia/multi.c +++ b/src/add-ons/kernel/drivers/audio/ac97/auvia/multi.c @@ -642,6 +642,9 @@ auvia_get_description(auvia_dev *card, multi_description *data) strncpy(data->friendly_name, FRIENDLY_NAME_686, 32); else if(IS_8233(&card->config)) { switch(card->info.revision) { + case VIATECH_8233_AC97_REV_8233_10: + strncpy(data->friendly_name, FRIENDLY_NAME_8233, 32); + break; case VIATECH_8233_AC97_REV_8233C: strncpy(data->friendly_name, FRIENDLY_NAME_8233C, 32); break;