From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NmZp8-0004ZO-GX for qemu-devel@nongnu.org; Tue, 02 Mar 2010 16:40:14 -0500 Received: from [199.232.76.173] (port=37828 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NmZp8-0004ZB-2I for qemu-devel@nongnu.org; Tue, 02 Mar 2010 16:40:14 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NmZp6-0004x9-Ei for qemu-devel@nongnu.org; Tue, 02 Mar 2010 16:40:13 -0500 Received: from moutng.kundenserver.de ([212.227.17.10]:56882) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NmZp5-0004x5-UL for qemu-devel@nongnu.org; Tue, 02 Mar 2010 16:40:12 -0500 From: Stefan Weil Date: Tue, 2 Mar 2010 22:37:51 +0100 Message-Id: <1267565880-18382-11-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 11/20] eepro100: Use symbolic names for bits in EEPROM id List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developers Cc: mst@redhat.com V2 - Use UPPER_CASE for enum values Signed-off-by: Stefan Weil --- hw/eepro100.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/hw/eepro100.c b/hw/eepro100.c index c2ff569..2a871b8 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -272,6 +272,21 @@ typedef enum { EEPROM_SMBUS_ADDR = 0x90, } EEPROMOffset; +/* Bit values for EEPROM ID word. */ +typedef enum { + EEPROM_ID_MDM = BIT(0), /* Modem */ + EEPROM_ID_STB = BIT(1), /* Standby Enable */ + EEPROM_ID_WMR = BIT(2), /* ??? */ + EEPROM_ID_WOL = BIT(5), /* Wake on LAN */ + EEPROM_ID_DPD = BIT(6), /* Deep Power Down */ + EEPROM_ID_ALT = BIT(7), /* */ + /* BITS(10, 8) device revision */ + EEPROM_ID_BD = BIT(11), /* boot disable */ + EEPROM_ID_ID = BIT(13), /* id bit */ + /* BITS(15, 14) signature */ + EEPROM_ID_VALID = BIT(14), /* signature for valid eeprom */ +} eeprom_id_bit; + /* Default values for MDI (PHY) registers */ static const uint16_t eepro100_mdi_default[] = { /* MDI Registers 0 - 6, 7 */ @@ -643,7 +658,7 @@ static void nic_selective_reset(EEPRO100State * s) uint16_t *eeprom_contents = eeprom93xx_data(s->eeprom); //~ eeprom93xx_reset(s->eeprom); memcpy(eeprom_contents, s->conf.macaddr.a, 6); - eeprom_contents[EEPROM_ID] = 0x4000; + eeprom_contents[EEPROM_ID] = EEPROM_ID_VALID; if (s->device == i82557B || s->device == i82557C) eeprom_contents[5] = 0x0100; eeprom_contents[EEPROM_PHY_ID] = 1; -- 1.7.0