From patchwork Sun Feb 14 16:16:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 45310 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4D9DAB7D15 for ; Mon, 15 Feb 2010 03:20:45 +1100 (EST) Received: from localhost ([127.0.0.1]:49828 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NghD8-0006l1-6C for incoming@patchwork.ozlabs.org; Sun, 14 Feb 2010 11:20:42 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ngh9H-0005xG-Ru for qemu-devel@nongnu.org; Sun, 14 Feb 2010 11:16:43 -0500 Received: from [199.232.76.173] (port=43056 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ngh9H-0005x8-5b for qemu-devel@nongnu.org; Sun, 14 Feb 2010 11:16:43 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Ngh9E-00021b-Jd for qemu-devel@nongnu.org; Sun, 14 Feb 2010 11:16:43 -0500 Received: from moutng.kundenserver.de ([212.227.17.8]:52488) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Ngh9E-00021L-2C for qemu-devel@nongnu.org; Sun, 14 Feb 2010 11:16:40 -0500 Received: from flocke.weilnetz.de (p54ADCA6B.dip.t-dialin.net [84.173.202.107]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0LqWEj-1OBvAT1mBl-00eSCn; Sun, 14 Feb 2010 17:16:36 +0100 Received: from stefan by flocke.weilnetz.de with local (Exim 4.71) (envelope-from ) id 1Ngh99-0005Ue-Ew; Sun, 14 Feb 2010 17:16:35 +0100 From: Stefan Weil To: QEMU Developers Date: Sun, 14 Feb 2010 17:16:11 +0100 Message-Id: <1266164189-21062-2-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1266164189-21062-1-git-send-email-weil@mail.berlios.de> References: <4B7821AC.6080400@mail.berlios.de> <1266164189-21062-1-git-send-email-weil@mail.berlios.de> X-Provags-ID: V01U2FsdGVkX1++HteoMZrJjd3ugwnEtLYl2wsrKB5WFuoGKqe mhqu3oLzF4PNBNF6ZblIgAmlMtQ7oQpY824e77HS6eWr/JbuBK e47pNC5WgTiDoOr0t2jc0GTjXz10XSJDT1PYVYKe8tmYZimml1 KPQ== X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Subject: [Qemu-devel] [PATCH 02/20] eepro100: Add missing SCB register names X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Some system control block registers were addressed using their offset value. Use symbolic names now and clean the documentation. Signed-off-by: Stefan Weil --- hw/eepro100.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/hw/eepro100.c b/hw/eepro100.c index 6580ca8..124bc49 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -125,16 +125,20 @@ /* Offsets to the various registers. All accesses need not be longword aligned. */ enum speedo_offsets { - SCBStatus = 0, + SCBStatus = 0, /* Status Word. */ SCBAck = 1, SCBCmd = 2, /* Rx/Command Unit command and status. */ SCBIntmask = 3, SCBPointer = 4, /* General purpose pointer. */ SCBPort = 8, /* Misc. commands and operands. */ - SCBflash = 12, SCBeeprom = 14, /* EEPROM and flash memory control. */ + SCBflash = 12, /* Flash memory control. */ + SCBeeprom = 14, /* EEPROM control. */ SCBCtrlMDI = 16, /* MDI interface control. */ SCBEarlyRx = 20, /* Early receive byte count. */ - SCBFlow = 24, + SCBFlow = 24, /* Flow Control. */ + SCBpmdr = 27, /* Power Management Driver. */ + SCBgctrl = 28, /* General Control. */ + SCBgstat = 29, /* General Status. */ }; /* A speedo3 transmit buffer descriptor with two buffers... */ @@ -1333,11 +1337,11 @@ static uint8_t eepro100_read1(EEPRO100State * s, uint32_t addr) case SCBeeprom: val = eepro100_read_eeprom(s); break; - case 0x1b: /* PMDR (power management driver register) */ + case SCBpmdr: /* Power Management Driver Register */ val = 0; TRACE(OTHER, logout("addr=%s val=0x%02x\n", regname(addr), val)); break; - case 0x1d: /* general status register */ + case SCBgstat: /* General Status Register */ /* 100 Mbps full duplex, valid link */ val = 0x07; TRACE(OTHER, logout("addr=General Status val=%02x\n", val)); @@ -1431,7 +1435,7 @@ static void eepro100_write1(EEPRO100State * s, uint32_t addr, uint8_t val) case SCBFlow: /* does not exist on 82557 */ case SCBFlow + 1: case SCBFlow + 2: - case SCBFlow + 3: + case SCBpmdr: /* does not exist on 82557 */ TRACE(OTHER, logout("addr=%s val=0x%02x\n", regname(addr), val)); break; case SCBeeprom: