From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LWC6G-0004sz-Rn
	for qemu-devel@nongnu.org; Sun, 08 Feb 2009 11:01:40 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LWC6G-0004sc-B1
	for qemu-devel@nongnu.org; Sun, 08 Feb 2009 11:01:40 -0500
Received: from [199.232.76.173] (port=48008 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LWC6G-0004sU-2Y
	for qemu-devel@nongnu.org; Sun, 08 Feb 2009 11:01:40 -0500
Received: from savannah.gnu.org ([199.232.41.3]:50215 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1LWC6F-0004r2-Lm
	for qemu-devel@nongnu.org; Sun, 08 Feb 2009 11:01:39 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LWC6F-0001vQ-6o
	for qemu-devel@nongnu.org; Sun, 08 Feb 2009 16:01:39 +0000
Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <blueswir1@savannah.gnu.org>) id 1LWC6E-0001vL-Ty
	for qemu-devel@nongnu.org; Sun, 08 Feb 2009 16:01:39 +0000
MIME-Version: 1.0
Errors-To: blueswir1
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Blue Swirl <blauwirbel@gmail.com>
Message-Id: <E1LWC6E-0001vL-Ty@cvs.savannah.gnu.org>
Date: Sun, 08 Feb 2009 16:01:38 +0000
Subject: [Qemu-devel] [6562] Fix UniNorth
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 6562
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6562
Author:   blueswir1
Date:     2009-02-08 16:01:38 +0000 (Sun, 08 Feb 2009)

Log Message:
-----------
Fix UniNorth

Modified Paths:
--------------
    trunk/hw/unin_pci.c

Modified: trunk/hw/unin_pci.c
===================================================================
--- trunk/hw/unin_pci.c	2009-02-08 16:01:01 UTC (rev 6561)
+++ trunk/hw/unin_pci.c	2009-02-08 16:01:38 UTC (rev 6562)
@@ -44,22 +44,13 @@
                                          uint32_t val)
 {
     UNINState *s = opaque;
-    int i;
 
     UNIN_DPRINTF("config_writel addr " TARGET_FMT_plx " val %x\n", addr, val);
 #ifdef TARGET_WORDS_BIGENDIAN
     val = bswap32(val);
 #endif
 
-    for (i = 11; i < 32; i++) {
-        if ((val & (1 << i)) != 0)
-            break;
-    }
-#if 0
-    s->config_reg = 0x80000000 | (1 << 16) | (val & 0x7FC) | (i << 11);
-#else
-    s->config_reg = 0x80000000 | (0 << 16) | (val & 0x7FC) | (i << 11);
-#endif
+    s->config_reg = val;
 }
 
 static uint32_t pci_unin_main_config_readl (void *opaque,
@@ -67,10 +58,8 @@
 {
     UNINState *s = opaque;
     uint32_t val;
-    int devfn;
 
-    devfn = (s->config_reg >> 8) & 0xFF;
-    val = (1 << (devfn >> 3)) | ((devfn & 0x07) << 8) | (s->config_reg & 0xFC);
+    val = s->config_reg;
 #ifdef TARGET_WORDS_BIGENDIAN
     val = bswap32(val);
 #endif