[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 07/15] ac97: convert to new PCI API
From: |
malc |
Subject: |
Re: [Qemu-devel] [PATCH 07/15] ac97: convert to new PCI API |
Date: |
Wed, 10 Feb 2010 01:45:52 +0300 (MSK) |
User-agent: |
Alpine 2.00 (LNX 1167 2008-08-23) |
On Tue, 9 Feb 2010, Anthony Liguori wrote:
> - fixed bug with size of registered ioport regions
>
> Signed-off-by: Anthony Liguori <address@hidden>
> ---
> hw/ac97.c | 146
> +++++++++++++++++++++++++------------------------------------
> 1 files changed, 60 insertions(+), 86 deletions(-)
>
> diff --git a/hw/ac97.c b/hw/ac97.c
> index 4319bc8..9fdf591 100644
> --- a/hw/ac97.c
> +++ b/hw/ac97.c
> @@ -223,7 +223,7 @@ static void fetch_bd (AC97LinkState *s, AC97BusMasterRegs
> *r)
> {
> uint8_t b[8];
>
> - cpu_physical_memory_read (r->bdbar + r->civ * 8, b, 8);
> + pci_memory_read (&s->dev, r->bdbar + r->civ * 8, b, 8);
> r->bd_valid = 1;
> r->bd.addr = le32_to_cpu (*(uint32_t *) &b[0]) & ~3;
> r->bd.ctl_len = le32_to_cpu (*(uint32_t *) &b[4]);
> @@ -569,50 +569,35 @@ static void mixer_reset (AC97LinkState *s)
>
> /**
> * Native audio mixer
> - * I/O Reads
> */
> -static uint32_t nam_readb (void *opaque, uint32_t addr)
> -{
> - AC97LinkState *s = opaque;
> - dolog ("U nam readb %#x\n", addr);
> - s->cas = 0;
> - return ~0U;
> -}
>
> -static uint32_t nam_readw (void *opaque, uint32_t addr)
> +static uint32_t nam_read (PCIDevice *dev, pcibus_t addr, int size)
> {
> - AC97LinkState *s = opaque;
> - uint32_t val = ~0U;
> - uint32_t index = addr - s->base[0];
> - s->cas = 0;
> - val = mixer_load (s, index);
> - return val;
> -}
> + AC97LinkState *s = DO_UPCAST (AC97LinkState, dev, dev);
> + uint32_t value;
> +
> + if (size == 2) {
> + value = mixer_load (s, addr);
> + } else {
> + dolog ("U nam read[%d] %#" FMT_PCIBUS "\n", size, addr);
> + s->cas = 0;
> + value = ~0U;
> + }
>
Yeah right, and then PCI SIG adds qword accessors and all hell breaks
loose, this interface sucks..
[..snip..]
--
mailto:address@hidden
- [Qemu-devel] [PATCH 0/15][RFC] New PCI interfaces, Anthony Liguori, 2010/02/09
- [Qemu-devel] [PATCH 01/15] pci: add new bus functions, Anthony Liguori, 2010/02/09
- [Qemu-devel] [PATCH 02/15] rtl8139: convert to new PCI interfaces, Anthony Liguori, 2010/02/09
- [Qemu-devel] [PATCH 05/15] wdt_i6300esb: fix io type leakage, Anthony Liguori, 2010/02/09
- [Qemu-devel] [PATCH 07/15] ac97: convert to new PCI API, Anthony Liguori, 2010/02/09
- Re: [Qemu-devel] [PATCH 07/15] ac97: convert to new PCI API,
malc <=
- Re: [Qemu-devel] [PATCH 07/15] ac97: convert to new PCI API, Anthony Liguori, 2010/02/09
- Re: [Qemu-devel] [PATCH 07/15] ac97: convert to new PCI API, malc, 2010/02/09
- Re: [Qemu-devel] [PATCH 07/15] ac97: convert to new PCI API, Anthony Liguori, 2010/02/09
- Re: [Qemu-devel] [PATCH 07/15] ac97: convert to new PCI API, malc, 2010/02/09
- Re: [Qemu-devel] [PATCH 07/15] ac97: convert to new PCI API, Anthony Liguori, 2010/02/09
- Re: [Qemu-devel] [PATCH 07/15] ac97: convert to new PCI API, malc, 2010/02/09
- Re: [Qemu-devel] [PATCH 07/15] ac97: convert to new PCI API, Anthony Liguori, 2010/02/11
[Qemu-devel] [PATCH 06/15] wdt_i6300esb: convert to new pci inteface, Anthony Liguori, 2010/02/09
[Qemu-devel] [PATCH 04/15] e1000: convert to new pci interface, Anthony Liguori, 2010/02/09
[Qemu-devel] [PATCH 09/15] eepro100: convert to new pci interface, Anthony Liguori, 2010/02/09