From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NmZng-0004Cd-O4 for qemu-devel@nongnu.org; Tue, 02 Mar 2010 16:38:44 -0500 Received: from [199.232.76.173] (port=46545 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NmZng-0004C5-6B for qemu-devel@nongnu.org; Tue, 02 Mar 2010 16:38:44 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NmZne-0004ss-8g for qemu-devel@nongnu.org; Tue, 02 Mar 2010 16:38:43 -0500 Received: from moutng.kundenserver.de ([212.227.17.8]:49827) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NmZnd-0004sm-Og for qemu-devel@nongnu.org; Tue, 02 Mar 2010 16:38:42 -0500 From: Stefan Weil Date: Tue, 2 Mar 2010 22:37:42 +0100 Message-Id: <1267565880-18382-2-git-send-email-weil@mail.berlios.de> In-Reply-To: <4B7821AC.6080400@mail.berlios.de> References: <4B7821AC.6080400@mail.berlios.de> Subject: [Qemu-devel] [PATCHv3 02/20] eepro100: Add missing SCB register names List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developers Cc: mst@redhat.com 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: -- 1.7.0