From patchwork Tue Mar 2 21:37:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 46718 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]) by ozlabs.org (Postfix) with ESMTP id F267CB7D1E for ; Wed, 3 Mar 2010 09:04:29 +1100 (EST) Received: from localhost ([127.0.0.1]:34571 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nma6N-0008LQ-FX for incoming@patchwork.ozlabs.org; Tue, 02 Mar 2010 16:58:03 -0500 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 Received: from flocke.weilnetz.de (p54ADFEFD.dip.t-dialin.net [84.173.254.253]) by mrelayeu.kundenserver.de (node=mreu0) with ESMTP (Nemesis) id 0MflE8-1O7YcQ1sto-00NByq; Tue, 02 Mar 2010 22:39:54 +0100 Received: from stefan by flocke.weilnetz.de with local (Exim 4.71) (envelope-from ) id 1NmZod-00052D-Nu; Tue, 02 Mar 2010 22:39:43 +0100 From: Stefan Weil To: QEMU Developers X-Mailer: git-send-email 1.7.0 In-Reply-To: <4B7821AC.6080400@mail.berlios.de> References: <4B7821AC.6080400@mail.berlios.de> X-Provags-ID: V01U2FsdGVkX18CrtxJPiZnqMlGvfqef6Lo8cBWNn2T9zhLonI hkN3XHz2bS5TJssre3cbThAWij71O/V3x1Ri4LoDizZPcOMzzE TsqyTX4mHEXib8Z+eRQuwuEY5dBxmdrMNaUz2E3iRBZufuk5xB DKw== X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: mst@redhat.com Subject: [Qemu-devel] [PATCHv3 11/20] eepro100: Use symbolic names for bits in EEPROM id 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 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;