xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ac97: fix probe code

Browse source
This commit is contained in:
cinap_lenrek 2011-05-19 17:00:58 +00:00
parent f5b15ebcd3
commit e1400c2d5b
1 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
sys/src/9/pc/audioac97.c
View file

@ -70,6 +70,10 @@ struct Ctlr {
int hardrate;
int attachok;
/* for probe */
Pcidev *pcidev;
Ctlr *next;
};
#define iorl(c, r) (inl((c)->port+(r)))
@ -483,20 +487,34 @@ sethwp(Ctlr *ctlr, long off, void *ptr)
static int
ac97reset(Audio *adev)
{
static int ncards = 1;
int i, irq, tbdf;
static Ctlr *cards = nil;
Pcidev *p;
int i, irq, tbdf;
Ctlr *ctlr;
ulong ctl, stat = 0;
p = nil;
for(i = 0; i < ncards; i++)
if((p = ac97match(p)) == nil)
return -1;
ncards++;
/* make a list of all ac97 cards if not already done */
if(cards == nil){
p = nil;
while(p = ac97match(p)){
ctlr = xspanalloc(sizeof(Ctlr), 8, 0);
memset(ctlr, 0, sizeof(Ctlr));
ctlr->pcidev = p;
ctlr->next = cards;
cards = ctlr;
}
}
ctlr = xspanalloc(sizeof(Ctlr), 8, 0);
memset(ctlr, 0, sizeof(Ctlr));
/* pick a card from the list */
for(ctlr = cards; ctlr; ctlr = ctlr->next){
if(p = ctlr->pcidev){
ctlr->pcidev = nil;
goto Found;
}
}
return -1;
Found:
adev->ctlr = ctlr;
ctlr->targetrate = 44100;
ctlr->hardrate = 44100;