--- margi2/margi.c 2001/06/06 13:38:05 1.16 +++ margi2/margi.c 2001/08/05 11:02:13 1.17 @@ -189,18 +189,14 @@ void DACSetFrequency(struct cvdv_cards * } -int MargiFreeBuffers(struct cvdv_cards *card, int isB) +int MargiFreeBuffers(struct cvdv_cards *card) { MDEBUG(1, ": -- MargiFreeBuffers\n"); - if(isB){ - ring_destroy(&(card->rbufB)); - card->use_ringB = 0; - } - if (isB == 2 || isB == 0){ - ring_destroy(&(card->rbufA)); - card->use_ringA = 0; - } + ring_destroy(&(card->rbufB)); + card->use_ringB = 0; + ring_destroy(&(card->rbufA)); + card->use_ringA = 0; return 0; } @@ -210,7 +206,6 @@ int MargiSetBuffers(struct cvdv_cards *c { int err = 0; - MargiFreeBuffers(card,isB); MDEBUG(0, ": -- MargiSetBuffers(%d) %d\n", size, isB); @@ -222,7 +217,7 @@ int MargiSetBuffers(struct cvdv_cards *c if (!err) card->use_ringA = 1; } - MDEBUG(0,"error: %d use_ringA: %d use_ringB: %d\n",err, + MDEBUG(0,"set buffers: %d use_ringA: %d use_ringB: %d\n",err, card->use_ringA,card->use_ringB); return err; } @@ -837,7 +832,7 @@ void CardDeInit(struct cvdv_cards *card) { CloseCard(card); MargiFlush(card); - MargiFreeBuffers(card,2); + MargiFreeBuffers(card); L64014RemoveIntr(card); card_init(card, 0);