i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added rev 10 for VT8233, debug traces

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3085 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2003-04-21 00:02:23 +00:00
parent f924ff50f5
commit 6d6c8c465a
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c
+4 -5
View File
@@ -228,11 +228,11 @@ auvia_stream_curaddr(auvia_stream *stream)
uint32 addr; uint32 addr;
if(IS_8233(&stream->card->config)) { if(IS_8233(&stream->card->config)) {
addr = auvia_reg_read_32(&stream->card->config, stream->base + AUVIA_RP_DMAOPS_BASE); addr = auvia_reg_read_32(&stream->card->config, stream->base + AUVIA_RP_DMAOPS_BASE);
//TRACE(("auvia_stream_curaddr %p\n", addr)); TRACE(("stream_curaddr %p, phy_base %p\n", addr, (uint32)stream->dmaops_phy_base));
//TRACE(("auvia_stream_curaddr %p\n", (uint32)stream->dmaops_phy_base));
return (addr - (uint32)stream->dmaops_phy_base - 4) / 8; return (addr - (uint32)stream->dmaops_phy_base - 4) / 8;
} else { } else {
addr = auvia_reg_read_32(&stream->card->config, stream->base + AUVIA_RP_DMAOPS_BASE); 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; return (addr - (uint32)stream->dmaops_phy_base - 8) / 8;
} }
} }
@@ -374,8 +374,7 @@ int32 auvia_int(void *arg)
//TRACE(("interrupt\n")); //TRACE(("interrupt\n"));
curblk = auvia_stream_curaddr(stream); curblk = auvia_stream_curaddr(stream);
//TRACE(("AUVIA_RPSTAT_INTR at trigblk %lu\n", curblk)); TRACE(("RPSTAT_INTR at trigblk %lu, stream->trigblk %lu\n", curblk, stream->trigblk));
//TRACE(("AUVIA_RPSTAT_INTR at stream->trigblk %lu\n", stream->trigblk));
if (curblk == stream->trigblk) { if (curblk == stream->trigblk) {
//TRACE(("AUVIA_RPSTAT_INTR at trigblk %lu\n", curblk)); //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); auvia_reg_write_8(&card->config, stream->base + AUVIA_RP_STAT, AUVIA_RPSTAT_INTR);
} }
} else { } 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) if(gotone)
src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.h
+1
View File
@@ -52,6 +52,7 @@
#define VIATECH_82C686_AC97_DEVICE_ID 0x3058 /* Via Technologies VT82C686 AC97 */ #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_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_8233C 0x20
#define VIATECH_8233_AC97_REV_8233 0x30 #define VIATECH_8233_AC97_REV_8233 0x30
#define VIATECH_8233_AC97_REV_8233A 0x40 #define VIATECH_8233_AC97_REV_8233A 0x40
src/add-ons/kernel/drivers/audio/ac97/auvia/multi.c
+3
View File
@@ -642,6 +642,9 @@ auvia_get_description(auvia_dev *card, multi_description *data)
strncpy(data->friendly_name, FRIENDLY_NAME_686, 32); strncpy(data->friendly_name, FRIENDLY_NAME_686, 32);
else if(IS_8233(&card->config)) { else if(IS_8233(&card->config)) {
switch(card->info.revision) { 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: case VIATECH_8233_AC97_REV_8233C:
strncpy(data->friendly_name, FRIENDLY_NAME_8233C, 32); strncpy(data->friendly_name, FRIENDLY_NAME_8233C, 32);
break; break;