From patchwork Tue Mar 2 18:42:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 46688 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 EC386B7D27 for ; Wed, 3 Mar 2010 05:45:12 +1100 (EST) Received: from localhost ([127.0.0.1]:44462 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NmX4a-0004Yr-N7 for incoming@patchwork.ozlabs.org; Tue, 02 Mar 2010 13:44:00 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NmX45-0004YS-Ez for qemu-devel@nongnu.org; Tue, 02 Mar 2010 13:43:29 -0500 Received: from [199.232.76.173] (port=48868 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NmX45-0004YF-6F for qemu-devel@nongnu.org; Tue, 02 Mar 2010 13:43:29 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NmX43-0003ie-FV for qemu-devel@nongnu.org; Tue, 02 Mar 2010 13:43:28 -0500 Received: from moutng.kundenserver.de ([212.227.17.10]:61253) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NmX42-0003iK-KZ for qemu-devel@nongnu.org; Tue, 02 Mar 2010 13:43:27 -0500 Received: from flocke.weilnetz.de (p54ADFEFD.dip.t-dialin.net [84.173.254.253]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0Ldbog-1NMrH40xqU-00i2DB; Tue, 02 Mar 2010 19:43:00 +0100 Received: from stefan by flocke.weilnetz.de with local (Exim 4.71) (envelope-from ) id 1NmX3b-0003Dq-Bw; Tue, 02 Mar 2010 19:42:59 +0100 From: Stefan Weil To: QEMU Developers X-Mailer: git-send-email 1.7.0 In-Reply-To: <1266164189-21062-11-git-send-email-weil@mail.berlios.de> References: <1266164189-21062-11-git-send-email-weil@mail.berlios.de> X-Provags-ID: V01U2FsdGVkX1/nHUIzAGcBGSGVoYmD/twepwCT69iNBYEECx8 nF/ymxNJZ5dODmoPhscxvDxcVhc4EaoYlqmhEwRvwFzyMJdkd+ ut/B2Inkhwaksw/zB5k4TB3XnxJwYcL3IeH+1acXehr0USsr7P ZAg== X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: mst@redhat.com Subject: [Qemu-devel] [PATCH 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;