diff options
| -rw-r--r-- | src/device/azalia_device.c | 33 | ||||
| -rw-r--r-- | src/include/device/azalia_device.h | 1 |
2 files changed, 24 insertions, 10 deletions
diff --git a/src/device/azalia_device.c b/src/device/azalia_device.c index 8e5998cdeb..5a3a5ded04 100644 --- a/src/device/azalia_device.c +++ b/src/device/azalia_device.c @@ -188,12 +188,33 @@ static int wait_for_valid(u8 *base) return -1; } +static int azalia_write_verb(u8 *base, u32 verb) +{ + if (wait_for_ready(base) < 0) + return -1; + + write32(base + HDA_IC_REG, verb); + + return wait_for_valid(base); +} + +int azalia_program_verb_table(u8 *base, const u32 *verbs, u32 verb_size) +{ + if (!verbs) + return 0; + + for (u32 i = 0; i < verb_size; i++) { + if (azalia_write_verb(base, verbs[i]) < 0) + return -1; + } + return 0; +} + static void codec_init(struct device *dev, u8 *base, int addr) { u32 reg32; const u32 *verb; u32 verb_size; - int i; printk(BIOS_DEBUG, "azalia_audio: Initializing codec #%d\n", addr); @@ -223,15 +244,7 @@ static void codec_init(struct device *dev, u8 *base, int addr) printk(BIOS_DEBUG, "azalia_audio: verb_size: %u\n", verb_size); /* 3 */ - for (i = 0; i < verb_size; i++) { - if (wait_for_ready(base) < 0) - return; - - write32(base + HDA_IC_REG, verb[i]); - - if (wait_for_valid(base) < 0) - return; - } + azalia_program_verb_table(base, verb, verb_size); printk(BIOS_DEBUG, "azalia_audio: verb loaded.\n"); } diff --git a/src/include/device/azalia_device.h b/src/include/device/azalia_device.h index 1b4e769c3f..ce8c0d193e 100644 --- a/src/include/device/azalia_device.h +++ b/src/include/device/azalia_device.h @@ -22,6 +22,7 @@ int azalia_set_bits(void *port, u32 mask, u32 val); int azalia_enter_reset(u8 *base); int azalia_exit_reset(u8 *base); u32 azalia_find_verb(const u32 *verb_table, u32 verb_table_bytes, u32 viddid, const u32 **verb); +int azalia_program_verb_table(u8 *base, const u32 *verbs, u32 verb_size); void azalia_audio_init(struct device *dev); extern struct device_operations default_azalia_audio_ops; |