From patchwork Mon Apr 29 17:00:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 163074 Delivered-To: patch@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp2161259ill; Mon, 29 Apr 2019 10:28:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqz96NsB061NiILuheYoIIi3VNT/OqmHX1TYhi/yZQ6vfEXlFzK14e4GpjXkEOBZ23sCsQvu X-Received: by 2002:a5d:6249:: with SMTP id m9mr20603355wrv.255.1556558908363; Mon, 29 Apr 2019 10:28:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556558908; cv=none; d=google.com; s=arc-20160816; b=NnbdCrZ9Qhp/dp9+Ai7Y8Tt9KqbLDzfpFhxsu8kuBasnZNxSi8JTB9O9W23sj9ecp6 woFqbL8gGbcp+ei4iPTGfkPhDDYFC+sllBTKauBwfupGEVYEGF+u21hPxZWKg+iD35k2 CSlvqU4yFLb0712LnbKn1rbeod9gYuYfblsTdOaB6BFPR/qp7l3sTxz+qAeDkJ/gmonl RUx2qtD/hZi36at9rJ6a38ZLHYmznDm0sBvV11MDqsYUABtYVd62qEYvN9hH0hMnVzXe iBFzQF2/BDQeY6jHqI0OaJuaOUK41gHIzS2MC5IkJrkCJCVaI72f/s4S0DfWn46f7snP sgUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=e6cX6fnSzBtaurvS4e29cr5VA7TdSpTfD1NyQiLf/7M=; b=hS1dAr9sUhnqcMEV1Gx6PEzb6e0dMCWgl+EQseqTAJzQIIKexTDvF6Fj8swHK7ZS+s ZxIakqunmtyst6+2ijAd2LCjB2MP6T0jHRGmz/Qr5SlRJ1depZs5S5XTFxN4cnDbJcfK 3J8S1vP69InGYmyRPzCtn0pMrCOOIefv8CnWZTj/c3ltOX2cDO7MJYwaoClySG/0xuZU Vj2J4aWNjFAz4O+DsQDQ6QEplDZJOGgUK7VupoYnIeWhAcLQ9od5B3KKJk73mzRADOZg b6SHcZYfwTS1b3U8gQZ2YmS/c7lhlHq0IVsLneDb2aOeQ0zsc9dOwe+LicP4+qgy81oH rfEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="rWFRK2G/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c11si23930911wrx.179.2019.04.29.10.28.28 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 29 Apr 2019 10:28:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="rWFRK2G/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:60989 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLA4p-0003Nz-AU for patch@linaro.org; Mon, 29 Apr 2019 13:28:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34513) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hL9ew-0004yJ-96 for qemu-devel@nongnu.org; Mon, 29 Apr 2019 13:01:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hL9et-0006o5-Bi for qemu-devel@nongnu.org; Mon, 29 Apr 2019 13:01:41 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:33206) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hL9er-0006f8-Nv for qemu-devel@nongnu.org; Mon, 29 Apr 2019 13:01:39 -0400 Received: by mail-wr1-x432.google.com with SMTP id s18so17188172wrp.0 for ; Mon, 29 Apr 2019 10:01:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=e6cX6fnSzBtaurvS4e29cr5VA7TdSpTfD1NyQiLf/7M=; b=rWFRK2G/5uqhuxn77SyShKkdIykaLClZYB5eDyJRo/DtXcL3p63cVBaUjEtPlOJssB AI/udNnicsi3zQ8HEjRNFpHMSiurroOOK6D341CNeQkCpqqKfpwAMiPFRITuTEdRi/BG GXnIVIdg+UTzLcB/3Kkc2az+bFHae42R0QLMMajXeeTKzfS8gZNqusnUEZxK8RZM0aoh 1nDG5cKBr9d8MAySOFCA4GR4PemiJxW0/Urxbecrrvgh3E22gRYI7BE0Z8vjBRkINJqc zwPZVR8QEPHrV7GImtKGsID1TcwHSJdgNGNXhBPiH6v1vcWW+51d3vv4eXhMm8GdCrH2 Purw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=e6cX6fnSzBtaurvS4e29cr5VA7TdSpTfD1NyQiLf/7M=; b=k4u5VqgEXBDxHvvHNs8YbMlbm2tQ5PULcpnr86TzorcqYHZ88ymwNR5+oa8i33Xv8x s6DghFecTRIqs4Qc38/w5E2YcPCw01w7fQeEAMkwQE5XtYz2E8uSIVUENoDmdy8UdESv MSoML50FwkpCUWCBc3Nw1ziXNCT1Y1RBDhrxaGnkslMrt1fRyE33gP5t2LXa2pp+Lb1g MPSBQFDdOmMjsoQxF+HriI6qcRmlhBxX0BEvy4mGTn7mCho+XILEgLsA6qFnCD7UkZwP caSBImm5+uktA7fi2/BHJUYCDp/Zq/0dzCfMXC37UZSlbkCz+1UIzSeYqWrchRpbF+fx /HLA== X-Gm-Message-State: APjAAAXASLJSsYiJpPkzM5YeAXbwhmpyExzt+qzOdJ9xtXfNkPJw/AaH r8sK+jC8ZteVKalkEMqQh9rude73e5Y= X-Received: by 2002:a5d:4e86:: with SMTP id e6mr4845305wru.59.1556557282488; Mon, 29 Apr 2019 10:01:22 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id a13sm36896wmj.39.2019.04.29.10.01.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Apr 2019 10:01:21 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 29 Apr 2019 18:00:27 +0100 Message-Id: <20190429170030.11323-40-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190429170030.11323-1-peter.maydell@linaro.org> References: <20190429170030.11323-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::432 Subject: [Qemu-devel] [PULL 39/42] hw/devices: Move LAN9118 declarations into a new header X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Reviewed-by: Markus Armbruster Signed-off-by: Philippe Mathieu-Daudé Message-id: 20190412165416.7977-10-philmd@redhat.com Signed-off-by: Peter Maydell --- include/hw/devices.h | 3 --- include/hw/net/lan9118.h | 19 +++++++++++++++++++ hw/arm/kzm.c | 2 +- hw/arm/mps2.c | 2 +- hw/arm/realview.c | 1 + hw/arm/vexpress.c | 2 +- hw/net/lan9118.c | 2 +- 7 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 include/hw/net/lan9118.h -- 2.20.1 diff --git a/include/hw/devices.h b/include/hw/devices.h index ba9034050b4..ebc45c87997 100644 --- a/include/hw/devices.h +++ b/include/hw/devices.h @@ -8,7 +8,4 @@ /* smc91c111.c */ void smc91c111_init(NICInfo *, uint32_t, qemu_irq); -/* lan9118.c */ -void lan9118_init(NICInfo *, uint32_t, qemu_irq); - #endif diff --git a/include/hw/net/lan9118.h b/include/hw/net/lan9118.h new file mode 100644 index 00000000000..d13d8cd3d22 --- /dev/null +++ b/include/hw/net/lan9118.h @@ -0,0 +1,19 @@ +/* + * SMSC LAN9118 Ethernet interface emulation + * + * Copyright (c) 2009 CodeSourcery, LLC. + * Written by Paul Brook + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#ifndef HW_NET_LAN9118_H +#define HW_NET_LAN9118_H + +#include "hw/irq.h" +#include "net/net.h" + +void lan9118_init(NICInfo *, uint32_t, qemu_irq); + +#endif diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c index 864c7bd4114..139934c4ecf 100644 --- a/hw/arm/kzm.c +++ b/hw/arm/kzm.c @@ -22,7 +22,7 @@ #include "qemu/error-report.h" #include "exec/address-spaces.h" #include "net/net.h" -#include "hw/devices.h" +#include "hw/net/lan9118.h" #include "hw/char/serial.h" #include "sysemu/qtest.h" diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c index e3d698ba6c4..54b7395849f 100644 --- a/hw/arm/mps2.c +++ b/hw/arm/mps2.c @@ -36,7 +36,7 @@ #include "hw/timer/cmsdk-apb-timer.h" #include "hw/timer/cmsdk-apb-dualtimer.h" #include "hw/misc/mps2-scc.h" -#include "hw/devices.h" +#include "hw/net/lan9118.h" #include "net/net.h" typedef enum MPS2FPGAType { diff --git a/hw/arm/realview.c b/hw/arm/realview.c index 242f5a87b6a..e9983c87639 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -15,6 +15,7 @@ #include "hw/arm/arm.h" #include "hw/arm/primecell.h" #include "hw/devices.h" +#include "hw/net/lan9118.h" #include "hw/pci/pci.h" #include "net/net.h" #include "sysemu/sysemu.h" diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index f07134c4245..d8634f3dd29 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -28,7 +28,7 @@ #include "hw/sysbus.h" #include "hw/arm/arm.h" #include "hw/arm/primecell.h" -#include "hw/devices.h" +#include "hw/net/lan9118.h" #include "hw/i2c/i2c.h" #include "net/net.h" #include "sysemu/sysemu.h" diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c index a6269d9463b..a428b16eda5 100644 --- a/hw/net/lan9118.c +++ b/hw/net/lan9118.c @@ -14,7 +14,7 @@ #include "hw/sysbus.h" #include "net/net.h" #include "net/eth.h" -#include "hw/devices.h" +#include "hw/net/lan9118.h" #include "sysemu/sysemu.h" #include "hw/ptimer.h" #include "qemu/log.h"