From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:44363) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QqiCO-00078h-1e for qemu-devel@nongnu.org; Tue, 09 Aug 2011 05:02:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QqiCN-0005S3-1g for qemu-devel@nongnu.org; Tue, 09 Aug 2011 05:02:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:27874) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QqiCM-0005Rp-Mh for qemu-devel@nongnu.org; Tue, 09 Aug 2011 05:02:07 -0400 From: Avi Kivity Date: Tue, 9 Aug 2011 12:02:02 +0300 Message-Id: <1312880522-12386-1-git-send-email-avi@redhat.com> In-Reply-To: References: Subject: [Qemu-devel] [PATCH v1.1 08/24] tusb6010: move declarations to new file tusb6010.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Peter Maydell Cc: kvm@vger.kernel.org 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 -- 1.7.5.3