From 4a0218d1bd2c6da7f7e0f290f74fc3c8fc6f9826 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Wed, 24 Nov 2021 15:01:11 -0300 Subject: [PATCH] ac97: Change VIA banner to be more consistent with others --- ac97/AC97.EXE | Bin 23914 -> 23876 bytes ac97/ac97.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ac97/AC97.EXE b/ac97/AC97.EXE index 89d215ebae63f9a24bf822c968fa2ec4e1ac8c12..405b0d4f93acdc5052e9ae96ebbc82f7be7029b8 100644 GIT binary patch delta 5631 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 diff --git a/ac97/ac97.c b/ac97/ac97.c index 46b7ce6..391494c 100644 --- a/ac97/ac97.c +++ b/ac97/ac97.c @@ -184,6 +184,7 @@ codec_probe(uint16_t (*codec_read)(uint8_t reg), static void audiopci_codec_wait(multi_t *regval) { + /* Wait for WIP to be cleared. */ for (i = 1; i; i++) { regval->u32 = inl(io_base | 0x14); if (!(regval->u16[1] & 0x4000)) @@ -211,7 +212,7 @@ audiopci_codec_read(uint8_t reg) /* Wait for WIP to be cleared. */ audiopci_codec_wait(®val); - /* Read value. */ + /* Return value read by audiopci_codec_wait. */ return regval.u16[0]; } @@ -244,7 +245,7 @@ audiopci_probe() /* Get revision. */ rev = pci_readb(bus, dev, func, 0x08); - /* Print basic information. */ + /* Print controller information. */ printf("Found AudioPCI %04X revision %02X at bus %02X device %02X function %d\n", this_dev_id, rev, bus, dev, func); printf("Subsystem ID is %04X:%04X\n", pci_readw(bus, dev, func, 0x2c), pci_readw(bus, dev, func, 0x2e)); @@ -297,7 +298,7 @@ via_codec_read(uint8_t reg) /* Wait for Controller Busy to be cleared and Primary Valid to be set. */ via_codec_wait(®val, 0x0200); - /* Read value. */ + /* Return value read by via_codec_wait. */ return regval.u16[0]; } @@ -330,11 +331,10 @@ via_probe() { uint8_t rev, base_rev, is8233; - /* Print basic information. */ + /* Print controller information. */ rev = pci_readb(bus, dev, func, 0x08); base_rev = pci_readb(bus, dev, 0, 0x08); - is8233 = (this_dev_id == 0x3059); - printf("Found VIA %s revision %02X (base %02X) at bus %02X device %02X function %d\n", is8233 ? "8233" : "686", rev, base_rev, bus, dev, func); + printf("Found VIA %04X revision %02X (base %02X) at bus %02X device %02X function %d\n", this_dev_id, rev, base_rev, bus, dev, func); /* Get SGD I/O BAR. */ printf("SGD"); @@ -357,7 +357,7 @@ via_probe() printf("done.\n"); /* Test Codec Shadow I/O BAR on 686. */ - if (!is8233) { + if (this_dev_id == 0x3058) { printf("Codec Shadow"); alt_io_base = get_io_bar(0x1c, 256); @@ -432,7 +432,7 @@ intel_probe() { uint8_t rev; - /* Print basic information. */ + /* Print controller information. */ rev = pci_readb(bus, dev, func, 0x08); printf("Found Intel %04X revision %02X at bus %02X device %02X function %d\n", this_dev_id, rev, bus, dev, func);