From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1L6Szg-0002VF-5R
	for qemu-devel@nongnu.org; Sat, 29 Nov 2008 11:48:32 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1L6Sze-0002Ue-Nu
	for qemu-devel@nongnu.org; Sat, 29 Nov 2008 11:48:31 -0500
Received: from [199.232.76.173] (port=51503 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1L6Sze-0002UX-Jy
	for qemu-devel@nongnu.org; Sat, 29 Nov 2008 11:48:30 -0500
Received: from savannah.gnu.org ([199.232.41.3]:56809 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 1L6Sze-0000oI-9Q
	for qemu-devel@nongnu.org; Sat, 29 Nov 2008 11:48:30 -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 1L6Szd-0000kF-Nv
	for qemu-devel@nongnu.org; Sat, 29 Nov 2008 16:48:29 +0000
Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <blueswir1@savannah.gnu.org>) id 1L6Szd-0000kB-I2
	for qemu-devel@nongnu.org; Sat, 29 Nov 2008 16:48:29 +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: <E1L6Szd-0000kB-I2@cvs.savannah.gnu.org>
Date: Sat, 29 Nov 2008 16:48:29 +0000
Subject: [Qemu-devel] [5812] Fix configuration 2 register (esp_2_cfg2.diff):
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: 5812
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5812
Author:   blueswir1
Date:     2008-11-29 16:48:29 +0000 (Sat, 29 Nov 2008)

Log Message:
-----------
Fix configuration 2 register (esp_2_cfg2.diff):
According to http://www.ibiblio.org/pub/historic-linux/early-ports/Sparc/NCR/NCR53C9X.txt,
"Any bit pattern written to this register may be read back and should be identical"

Signed-off-by: Herve Poussineau <hpoussin@reactos.org>

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

Modified: trunk/hw/esp.c
===================================================================
--- trunk/hw/esp.c	2008-11-29 16:45:28 UTC (rev 5811)
+++ trunk/hw/esp.c	2008-11-29 16:48:29 UTC (rev 5812)
@@ -144,8 +144,6 @@
 
 #define CFG1_RESREPT 0x40
 
-#define CFG2_MASK 0x15
-
 #define TCHI_FAS100A 0x4
 
 static void esp_raise_irq(ESPState *s)
@@ -552,10 +550,7 @@
         break;
     case ESP_WCCF ... ESP_WTEST:
         break;
-    case ESP_CFG2:
-        s->rregs[saddr] = val & CFG2_MASK;
-        break;
-    case ESP_CFG3 ... ESP_RES4:
+    case ESP_CFG2 ... ESP_RES4:
         s->rregs[saddr] = val;
         break;
     default: