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

* handles correctly failures during setup

Browse Source 
* style fixes


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33276 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2009-09-24 22:39:38 +00:00
parent b5d916002b
commit 65c7c7c383
1 changed files with 73 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c
+73 -36
View File
@@ -82,6 +82,7 @@ auvia_mem_new(auvia_dev *card, size_t size)
return mem; return mem;
} }
static void static void
auvia_mem_delete(auvia_mem *mem) auvia_mem_delete(auvia_mem *mem)
{ {
@@ -90,6 +91,7 @@ auvia_mem_delete(auvia_mem *mem)
free(mem); free(mem);
} }
static void * static void *
auvia_mem_alloc(auvia_dev *card, size_t size) auvia_mem_alloc(auvia_dev *card, size_t size)
{ {
@@ -104,6 +106,7 @@ auvia_mem_alloc(auvia_dev *card, size_t size)
return mem; return mem;
} }
static void static void
auvia_mem_free(auvia_dev *card, void *ptr) auvia_mem_free(auvia_dev *card, void *ptr)
{ {
@@ -143,7 +146,8 @@ auvia_stream_set_audioparms(auvia_stream *stream, uint8 channels,
sample_size = stream->b16 + 1; sample_size = stream->b16 + 1;
frame_size = sample_size * stream->channels; frame_size = sample_size * stream->channels;
stream->buffer = auvia_mem_alloc(stream->card, stream->bufframes * frame_size * stream->bufcount); stream->buffer = auvia_mem_alloc(stream->card, stream->bufframes
* frame_size * stream->bufcount);
stream->trigblk = 0; /* This shouldn't be needed */ stream->trigblk = 0; /* This shouldn't be needed */
stream->blkmod = stream->bufcount; stream->blkmod = stream->bufcount;
@@ -152,6 +156,7 @@ auvia_stream_set_audioparms(auvia_stream *stream, uint8 channels,
return B_OK; return B_OK;
} }
status_t status_t
auvia_stream_commit_parms(auvia_stream *stream) auvia_stream_commit_parms(auvia_stream *stream)
{ {
@@ -175,27 +180,34 @@ auvia_stream_commit_parms(auvia_stream *stream)
(uint32)stream->dmaops_phy_base); (uint32)stream->dmaops_phy_base);
if(stream->use & AUVIA_USE_RECORD) if(stream->use & AUVIA_USE_RECORD)
auvia_codec_write(&stream->card->config, AC97_PCM_L_R_ADC_RATE, (uint16)stream->sample_rate); auvia_codec_write(&stream->card->config, AC97_PCM_L_R_ADC_RATE,
(uint16)stream->sample_rate);
else else
auvia_codec_write(&stream->card->config, AC97_PCM_FRONT_DAC_RATE, (uint16)stream->sample_rate); auvia_codec_write(&stream->card->config, AC97_PCM_FRONT_DAC_RATE,
(uint16)stream->sample_rate);
if(IS_8233(&stream->card->config)) { if(IS_8233(&stream->card->config)) {
if(stream->base != AUVIA_8233_MP_BASE) { if(stream->base != AUVIA_8233_MP_BASE) {
value = auvia_reg_read_32(&stream->card->config, stream->base + AUVIA_8233_RP_RATEFMT); value = auvia_reg_read_32(&stream->card->config, stream->base
value &= ~(AUVIA_8233_RATEFMT_48K | AUVIA_8233_RATEFMT_STEREO | AUVIA_8233_RATEFMT_16BIT); + AUVIA_8233_RP_RATEFMT);
value &= ~(AUVIA_8233_RATEFMT_48K | AUVIA_8233_RATEFMT_STEREO
| AUVIA_8233_RATEFMT_16BIT);
if(stream->use & AUVIA_USE_PLAY) if(stream->use & AUVIA_USE_PLAY)
value |= AUVIA_8233_RATEFMT_48K * (stream->sample_rate / 20) / (48000 / 20); value |= AUVIA_8233_RATEFMT_48K * (stream->sample_rate / 20)
/ (48000 / 20);
value |= (stream->channels == 2 ? AUVIA_8233_RATEFMT_STEREO : 0) value |= (stream->channels == 2 ? AUVIA_8233_RATEFMT_STEREO : 0)
| (stream->b16 ? AUVIA_8233_RATEFMT_16BIT : 0); | (stream->b16 ? AUVIA_8233_RATEFMT_16BIT : 0);
auvia_reg_write_32(&stream->card->config, stream->base + AUVIA_8233_RP_RATEFMT, value); auvia_reg_write_32(&stream->card->config, stream->base
+ AUVIA_8233_RP_RATEFMT, value);
} else { } else {
static const uint32 slottab[7] = {0, 0xff000011, 0xff000021, 0xff000521, static const uint32 slottab[7] = {0, 0xff000011, 0xff000021,
0xff004321, 0xff054321, 0xff654321}; 0xff000521, 0xff004321, 0xff054321, 0xff654321};
value = (stream->b16 ? AUVIA_8233_MP_FORMAT_16BIT : AUVIA_8233_MP_FORMAT_8BIT) value = (stream->b16 ? AUVIA_8233_MP_FORMAT_16BIT : AUVIA_8233_MP_FORMAT_8BIT)
| ((stream->channels << 4) & AUVIA_8233_MP_FORMAT_CHANNEL_MASK) ; | ((stream->channels << 4) & AUVIA_8233_MP_FORMAT_CHANNEL_MASK) ;
auvia_reg_write_8(&stream->card->config, stream->base + AUVIA_8233_OFF_MP_FORMAT, value); auvia_reg_write_8(&stream->card->config, stream->base
auvia_reg_write_32(&stream->card->config, stream->base + AUVIA_8233_OFF_MP_STOP, + AUVIA_8233_OFF_MP_FORMAT, value);
slottab[stream->channels]); auvia_reg_write_32(&stream->card->config, stream->base
+ AUVIA_8233_OFF_MP_STOP, slottab[stream->channels]);
} }
} }
//auvia_codec_write(&stream->card->config, AC97_SPDIF_CONTROL, (uint16)stream->sample_rate); //auvia_codec_write(&stream->card->config, AC97_SPDIF_CONTROL, (uint16)stream->sample_rate);
@@ -203,6 +215,7 @@ auvia_stream_commit_parms(auvia_stream *stream)
return B_OK; return B_OK;
} }
status_t status_t
auvia_stream_get_nth_buffer(auvia_stream *stream, uint8 chan, uint8 buf, auvia_stream_get_nth_buffer(auvia_stream *stream, uint8 chan, uint8 buf,
char** buffer, size_t *stride) char** buffer, size_t *stride)
@@ -220,6 +233,7 @@ auvia_stream_get_nth_buffer(auvia_stream *stream, uint8 chan, uint8 buf,
return B_OK; return B_OK;
} }
static uint32 static uint32
auvia_stream_curaddr(auvia_stream *stream) auvia_stream_curaddr(auvia_stream *stream)
{ {
@@ -235,6 +249,7 @@ auvia_stream_curaddr(auvia_stream *stream)
} }
} }
void void
auvia_stream_start(auvia_stream *stream, void (*inth) (void *), void *inthparam) auvia_stream_start(auvia_stream *stream, void (*inth) (void *), void *inthparam)
{ {
@@ -258,10 +273,12 @@ auvia_stream_start(auvia_stream *stream, void (*inth) (void *), void *inthparam)
| (stream->b16 == 1 ? AUVIA_RPMODE_16BIT : 0) | (stream->b16 == 1 ? AUVIA_RPMODE_16BIT : 0)
| AUVIA_RPMODE_INTR_FLAG | AUVIA_RPMODE_INTR_EOL | AUVIA_RPMODE_AUTOSTART; | AUVIA_RPMODE_INTR_FLAG | AUVIA_RPMODE_INTR_EOL | AUVIA_RPMODE_AUTOSTART;
auvia_reg_write_8(&stream->card->config, stream->base + AUVIA_RP_MODE, regvalue); auvia_reg_write_8(&stream->card->config, stream->base + AUVIA_RP_MODE, regvalue);
auvia_reg_write_8(&stream->card->config, stream->base + AUVIA_RP_CONTROL, AUVIA_RPCTRL_START); auvia_reg_write_8(&stream->card->config, stream->base + AUVIA_RP_CONTROL,
AUVIA_RPCTRL_START);
} }
} }
void void
auvia_stream_halt(auvia_stream *stream) auvia_stream_halt(auvia_stream *stream)
{ {
@@ -269,9 +286,11 @@ auvia_stream_halt(auvia_stream *stream)
stream->state &= ~AUVIA_STATE_STARTED; stream->state &= ~AUVIA_STATE_STARTED;
auvia_reg_write_8(&stream->card->config, stream->base + AUVIA_RP_CONTROL, AUVIA_RPCTRL_TERMINATE); auvia_reg_write_8(&stream->card->config, stream->base + AUVIA_RP_CONTROL,
AUVIA_RPCTRL_TERMINATE);
} }
auvia_stream * auvia_stream *
auvia_stream_new(auvia_dev *card, uint8 use, uint32 bufframes, uint8 bufcount) auvia_stream_new(auvia_dev *card, uint8 use, uint32 bufframes, uint8 bufcount)
{ {
@@ -332,6 +351,7 @@ auvia_stream_new(auvia_dev *card, uint8 use, uint32 bufframes, uint8 bufcount)
return stream; return stream;
} }
void void
auvia_stream_delete(auvia_stream *stream) auvia_stream_delete(auvia_stream *stream)
{ {
@@ -388,7 +408,8 @@ 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(("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)
@@ -446,14 +467,18 @@ auvia_init(auvia_dev * card)
{ {
uint32 pr; uint32 pr;
pr = (*pci->read_pci_config)(card->info.bus, card->info.device, card->info.function, AUVIA_PCICONF_JUNK, 4); pr = (*pci->read_pci_config)(card->info.bus, card->info.device,
card->info.function, AUVIA_PCICONF_JUNK, 4);
PRINT(("AUVIA_PCICONF_JUNK before: %lx\n", pr)); PRINT(("AUVIA_PCICONF_JUNK before: %lx\n", pr));
pr &= ~AUVIA_PCICONF_ENABLES; pr &= ~AUVIA_PCICONF_ENABLES;
pr |= AUVIA_PCICONF_ACLINKENAB | AUVIA_PCICONF_ACNOTRST | AUVIA_PCICONF_ACVSR | AUVIA_PCICONF_ACSGD; pr |= AUVIA_PCICONF_ACLINKENAB | AUVIA_PCICONF_ACNOTRST
| AUVIA_PCICONF_ACVSR | AUVIA_PCICONF_ACSGD;
pr &= ~(AUVIA_PCICONF_ACFM | AUVIA_PCICONF_ACSB); pr &= ~(AUVIA_PCICONF_ACFM | AUVIA_PCICONF_ACSB);
(*pci->write_pci_config)(card->info.bus, card->info.device, card->info.function, AUVIA_PCICONF_JUNK, 4, pr ); (*pci->write_pci_config)(card->info.bus, card->info.device,
card->info.function, AUVIA_PCICONF_JUNK, 4, pr );
snooze(100); snooze(100);
pr = (*pci->read_pci_config)(card->info.bus, card->info.device, card->info.function, AUVIA_PCICONF_JUNK, 4); pr = (*pci->read_pci_config)(card->info.bus, card->info.device,
card->info.function, AUVIA_PCICONF_JUNK, 4);
PRINT(("AUVIA_PCICONF_JUNK after: %lx\n", pr)); PRINT(("AUVIA_PCICONF_JUNK after: %lx\n", pr));
if(IS_8233(&card->config)) { if(IS_8233(&card->config)) {
@@ -479,6 +504,16 @@ auvia_init(auvia_dev * card)
return B_OK; return B_OK;
} }
static void
auvia_shutdown(auvia_dev *card)
{
PRINT(("shutdown(%p)\n", card));
ac97_detach(card->config.ac97);
remove_io_interrupt_handler(card->config.irq, auvia_int, card);
}
static status_t static status_t
auvia_setup(auvia_dev * card) auvia_setup(auvia_dev * card)
{ {
@@ -499,13 +534,17 @@ auvia_setup(auvia_dev * card)
if(card->info.device_id == VIATECH_8233_AC97_DEVICE_ID) if(card->info.device_id == VIATECH_8233_AC97_DEVICE_ID)
card->config.type |= TYPE_8233; card->config.type |= TYPE_8233;
PRINT(("%s deviceid = %#04x chiprev = %x model = %x enhanced at %lx\n", card->name, card->info.device_id, PRINT(("%s deviceid = %#04x chiprev = %x model = %x enhanced at %lx\n",
card->info.revision, card->info.u.h0.subsystem_id, card->config.nabmbar)); card->name, card->info.device_id, card->info.revision,
card->info.u.h0.subsystem_id, card->config.nabmbar));
cmd = (*pci->read_pci_config)(card->info.bus, card->info.device, card->info.function, PCI_command, 2); cmd = (*pci->read_pci_config)(card->info.bus, card->info.device,
card->info.function, PCI_command, 2);
PRINT(("PCI command before: %x\n", cmd)); PRINT(("PCI command before: %x\n", cmd));
(*pci->write_pci_config)(card->info.bus, card->info.device, card->info.function, PCI_command, 2, cmd | PCI_command_io); (*pci->write_pci_config)(card->info.bus, card->info.device,
cmd = (*pci->read_pci_config)(card->info.bus, card->info.device, card->info.function, PCI_command, 2); card->info.function, PCI_command, 2, cmd | PCI_command_io);
cmd = (*pci->read_pci_config)(card->info.bus, card->info.device,
card->info.function, PCI_command, 2);
PRINT(("PCI command after: %x\n", cmd)); PRINT(("PCI command after: %x\n", cmd));
/* attach the codec */ /* attach the codec */
@@ -515,10 +554,17 @@ auvia_setup(auvia_dev * card)
card->config.subvendor_id, card->config.subsystem_id); card->config.subvendor_id, card->config.subsystem_id);
PRINT(("installing interrupt : %lx\n", card->config.irq)); PRINT(("installing interrupt : %lx\n", card->config.irq));
install_io_interrupt_handler(card->config.irq, auvia_int, card, 0); err = install_io_interrupt_handler(card->config.irq, auvia_int, card, 0);
if (err != B_OK) {
PRINT(("failed to install interrupt\n"));
ac97_detach(card->config.ac97);
return err;
}
if ((err = auvia_init(card))) if ((err = auvia_init(card))) {
return (err); auvia_shutdown(card);
return err;
}
PRINT(("init_driver done\n")); PRINT(("init_driver done\n"));
@@ -574,15 +620,6 @@ init_driver(void)
} }
static void
auvia_shutdown(auvia_dev *card)
{
PRINT(("shutdown(%p)\n", card));
ac97_detach(card->config.ac97);
remove_io_interrupt_handler(card->config.irq, auvia_int, card);
}
void void
uninit_driver(void) uninit_driver(void)
{ {