From patchwork Sun Feb 14 16:16:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 45322 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 65920B7B98 for ; Mon, 15 Feb 2010 04:01:45 +1100 (EST) Received: from localhost ([127.0.0.1]:58029 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NghV1-000283-8Z for incoming@patchwork.ozlabs.org; Sun, 14 Feb 2010 11:39:11 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NghAa-0006Cb-2T for qemu-devel@nongnu.org; Sun, 14 Feb 2010 11:18:04 -0500 Received: from [199.232.76.173] (port=43079 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NghAZ-0006CP-Jt for qemu-devel@nongnu.org; Sun, 14 Feb 2010 11:18:03 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NghAY-000279-Aq for qemu-devel@nongnu.org; Sun, 14 Feb 2010 11:18:03 -0500 Received: from moutng.kundenserver.de ([212.227.17.8]:54313) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NghAX-000275-Qm for qemu-devel@nongnu.org; Sun, 14 Feb 2010 11:18:02 -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 0LZlXA-1O66su2QDk-00m4sV; Sun, 14 Feb 2010 17:18:00 +0100 Received: from stefan by flocke.weilnetz.de with local (Exim 4.71) (envelope-from ) id 1NghAL-0005VM-QT; Sun, 14 Feb 2010 17:17:49 +0100 From: Stefan Weil To: QEMU Developers Date: Sun, 14 Feb 2010 17:16:20 +0100 Message-Id: <1266164189-21062-11-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1266164189-21062-10-git-send-email-weil@mail.berlios.de> References: <4B7821AC.6080400@mail.berlios.de> <1266164189-21062-1-git-send-email-weil@mail.berlios.de> <1266164189-21062-2-git-send-email-weil@mail.berlios.de> <1266164189-21062-3-git-send-email-weil@mail.berlios.de> <1266164189-21062-4-git-send-email-weil@mail.berlios.de> <1266164189-21062-5-git-send-email-weil@mail.berlios.de> <1266164189-21062-6-git-send-email-weil@mail.berlios.de> <1266164189-21062-7-git-send-email-weil@mail.berlios.de> <1266164189-21062-8-git-send-email-weil@mail.berlios.de> <1266164189-21062-9-git-send-email-weil@mail.berlios.de> <1266164189-21062-10-git-send-email-weil@mail.berlios.de> X-Provags-ID: V01U2FsdGVkX19wRJDSMSEM/PiouJNDdHuhH1KxJsW5vgEe9YE lnybav7QFyxYxgJRLXMLf1hPYIAkkNnAplWQPgcLv3eQcoPyp4 bm1PCwVwWEueru74Ks4QGzW5eNh1jVh1ijUCM/Jw7wIDJkZBaZ 8jw== X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: 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 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 c647322..01bcd6d 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;