From patchwork Tue Aug 9 09:02:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 1048132 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p7992Bj0011828 for ; Tue, 9 Aug 2011 09:02:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752338Ab1HIJCJ (ORCPT ); Tue, 9 Aug 2011 05:02:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29308 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751425Ab1HIJCH (ORCPT ); Tue, 9 Aug 2011 05:02:07 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p79924Nd024202 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 9 Aug 2011 05:02:04 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p79924iV000880; Tue, 9 Aug 2011 05:02:04 -0400 Received: from s01.tlv.redhat.com (s01.tlv.redhat.com [10.35.255.8]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id BA21C250B45; Tue, 9 Aug 2011 12:02:03 +0300 (IDT) From: Avi Kivity To: qemu-devel@nongnu.org, Peter Maydell Cc: kvm@vger.kernel.org Subject: [PATCH v1.1 08/24] tusb6010: move declarations to new file tusb6010.h Date: Tue, 9 Aug 2011 12:02:02 +0300 Message-Id: <1312880522-12386-1-git-send-email-avi@redhat.com> In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 09 Aug 2011 09:02:12 +0000 (UTC) Avoid #include hell. Signed-off-by: Avi Kivity --- v1.1: add copyright/license blurb hw/devices.h | 7 ------- hw/nseries.c | 1 + hw/tusb6010.c | 2 +- hw/tusb6010.h | 25 +++++++++++++++++++++++++ 4 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 hw/tusb6010.h diff --git a/hw/devices.h b/hw/devices.h index c788373..07fda83 100644 --- a/hw/devices.h +++ b/hw/devices.h @@ -47,13 +47,6 @@ void *tahvo_init(qemu_irq irq, int betty); void retu_key_event(void *retu, int state); -/* tusb6010.c */ -typedef struct TUSBState TUSBState; -TUSBState *tusb6010_init(qemu_irq intr); -int tusb6010_sync_io(TUSBState *s); -int tusb6010_async_io(TUSBState *s); -void tusb6010_power(TUSBState *s, int on); - /* tc6393xb.c */ typedef struct TC6393xbState TC6393xbState; #define TC6393XB_RAM 0x110000 /* amount of ram for Video and USB */ diff --git a/hw/nseries.c b/hw/nseries.c index 6a5575e..5521f28 100644 --- a/hw/nseries.c +++ b/hw/nseries.c @@ -32,6 +32,7 @@ #include "bt.h" #include "loader.h" #include "blockdev.h" +#include "tusb6010.h" /* Nokia N8x0 support */ struct n800_s { diff --git a/hw/tusb6010.c b/hw/tusb6010.c index ccd01ad..add748c 100644 --- a/hw/tusb6010.c +++ b/hw/tusb6010.c @@ -23,7 +23,7 @@ #include "usb.h" #include "omap.h" #include "irq.h" -#include "devices.h" +#include "tusb6010.h" struct TUSBState { int iomemtype[2]; diff --git a/hw/tusb6010.h b/hw/tusb6010.h new file mode 100644 index 0000000..ebb3584 --- /dev/null +++ b/hw/tusb6010.h @@ -0,0 +1,25 @@ +/* + * tusb6010 interfaces + * + * Copyright 2011 Red Hat, Inc. and/or its affiliates + * + * Authors: + * Avi Kivity + * + * Derived from hw/devices.h. + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + * + */ + +#ifndef TUSB6010_H +#define TUSB6010_H + +typedef struct TUSBState TUSBState; +TUSBState *tusb6010_init(qemu_irq intr); +int tusb6010_sync_io(TUSBState *s); +int tusb6010_async_io(TUSBState *s); +void tusb6010_power(TUSBState *s, int on); + +#endif