From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LfELC-00024E-1r for qemu-devel@nongnu.org; Thu, 05 Mar 2009 09:14:26 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LfEL9-00022k-FL for qemu-devel@nongnu.org; Thu, 05 Mar 2009 09:14:23 -0500 Received: from [199.232.76.173] (port=51876 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LfEL8-00022b-7H for qemu-devel@nongnu.org; Thu, 05 Mar 2009 09:14:22 -0500 Received: from ns1.suse.de ([195.135.220.2]:49858 helo=mx1.suse.de) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LfEL7-0004nl-HT for qemu-devel@nongnu.org; Thu, 05 Mar 2009 09:14:22 -0500 From: Alexander Graf Date: Thu, 5 Mar 2009 15:14:11 +0100 Message-Id: <1236262454-6293-5-git-send-email-agraf@suse.de> In-Reply-To: <1236262454-6293-4-git-send-email-agraf@suse.de> References: <1236262454-6293-1-git-send-email-agraf@suse.de> <1236262454-6293-2-git-send-email-agraf@suse.de> <1236262454-6293-3-git-send-email-agraf@suse.de> <1236262454-6293-4-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH 4/7] Activate uninorth AGP bridge Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, Alexander Graf Linux tries to poke the AGP bridge port and is pretty sad when it can't, so let's activate the old code again and throw out the bit modifications, as we don't really do anything with the values anyways. Signed-off-by: Alexander Graf --- hw/unin_pci.c | 27 ++++++++------------------- 1 files changed, 8 insertions(+), 19 deletions(-) diff --git a/hw/unin_pci.c b/hw/unin_pci.c index 949e63f..c734f1c 100644 --- a/hw/unin_pci.c +++ b/hw/unin_pci.c @@ -92,17 +92,12 @@ static CPUReadMemoryFunc *pci_unin_main_read[] = { &pci_host_data_readl, }; -#if 0 - static void pci_unin_config_writel (void *opaque, target_phys_addr_t addr, uint32_t val) { UNINState *s = opaque; -#ifdef TARGET_WORDS_BIGENDIAN - val = bswap32(val); -#endif - s->config_reg = 0x80000000 | (val & ~0x00000001); + s->config_reg = val; } static uint32_t pci_unin_config_readl (void *opaque, @@ -111,12 +106,7 @@ static uint32_t pci_unin_config_readl (void *opaque, UNINState *s = opaque; uint32_t val; - val = (s->config_reg | 0x00000001) & ~0x80000000; -#ifdef TARGET_WORDS_BIGENDIAN - val = bswap32(val); -#endif - - return val; + return s->config_reg; } static CPUWriteMemoryFunc *pci_unin_config_write[] = { @@ -131,6 +121,7 @@ static CPUReadMemoryFunc *pci_unin_config_read[] = { &pci_unin_config_readl, }; +#if 0 static CPUWriteMemoryFunc *pci_unin_write[] = { &pci_host_pci_writeb, &pci_host_pci_writew, @@ -233,18 +224,17 @@ PCIBus *pci_pmac_init(qemu_irq *pic) d->config[0x27] = 0x7F; // d->config[0x34] = 0xdc // capabilities_pointer #endif -#if 0 // XXX: not needed for now + /* Uninorth AGP bus */ - s = &pci_bridge[1]; pci_mem_config = cpu_register_io_memory(0, pci_unin_config_read, pci_unin_config_write, s); - pci_mem_data = cpu_register_io_memory(0, pci_unin_read, - pci_unin_write, s); + pci_mem_data = cpu_register_io_memory(0, pci_unin_main_read, + pci_unin_main_write, s); cpu_register_physical_memory(0xf0800000, 0x1000, pci_mem_config); cpu_register_physical_memory(0xf0c00000, 0x1000, pci_mem_data); - d = pci_register_device("Uni-north AGP", sizeof(PCIDevice), 0, 11 << 3, - NULL, NULL); + d = pci_register_device(s->bus, "Uni-north AGP", sizeof(PCIDevice), + 11 << 3, NULL, NULL); pci_config_set_vendor_id(d->config, PCI_VENDOR_ID_APPLE); pci_config_set_device_id(d->config, PCI_DEVICE_ID_APPLE_UNI_N_AGP); d->config[0x08] = 0x00; // revision @@ -253,7 +243,6 @@ PCIBus *pci_pmac_init(qemu_irq *pic) d->config[0x0D] = 0x10; // latency_timer d->config[0x0E] = 0x00; // header_type // d->config[0x34] = 0x80; // capabilities_pointer -#endif #if 0 // XXX: not needed for now /* Uninorth internal bus */ -- 1.6.0.2