From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: [RFC v5 70/86] tusb6010: move declarations to new file tusb6010.h Date: Wed, 20 Jul 2011 19:50:20 +0300 Message-ID: <1311180636-17012-71-git-send-email-avi@redhat.com> References: <1311180636-17012-1-git-send-email-avi@redhat.com> Cc: kvm@vger.kernel.org To: qemu-devel@nongnu.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:33138 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752278Ab1GTQuz (ORCPT ); Wed, 20 Jul 2011 12:50:55 -0400 In-Reply-To: <1311180636-17012-1-git-send-email-avi@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: Avoid #include hell. Signed-off-by: Avi Kivity --- hw/devices.h | 7 ------- hw/nseries.c | 1 + hw/tusb6010.c | 2 +- hw/tusb6010.h | 10 ++++++++++ 4 files changed, 12 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 2f84f53..7fcd705 100644 --- a/hw/nseries.c +++ b/hw/nseries.c @@ -31,6 +31,7 @@ #include "hw.h" #include "bt.h" #include "loader.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..6faa94d --- /dev/null +++ b/hw/tusb6010.h @@ -0,0 +1,10 @@ +#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 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:36923) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qja7u-0007Gg-Ki for qemu-devel@nongnu.org; Wed, 20 Jul 2011 13:00:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qja7r-0006lv-Il for qemu-devel@nongnu.org; Wed, 20 Jul 2011 13:00:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46911) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZyw-0004ws-HZ for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:50:47 -0400 From: Avi Kivity Date: Wed, 20 Jul 2011 19:50:20 +0300 Message-Id: <1311180636-17012-71-git-send-email-avi@redhat.com> In-Reply-To: <1311180636-17012-1-git-send-email-avi@redhat.com> References: <1311180636-17012-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [RFC v5 70/86] 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 Cc: kvm@vger.kernel.org Avoid #include hell. Signed-off-by: Avi Kivity --- hw/devices.h | 7 ------- hw/nseries.c | 1 + hw/tusb6010.c | 2 +- hw/tusb6010.h | 10 ++++++++++ 4 files changed, 12 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 2f84f53..7fcd705 100644 --- a/hw/nseries.c +++ b/hw/nseries.c @@ -31,6 +31,7 @@ #include "hw.h" #include "bt.h" #include "loader.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..6faa94d --- /dev/null +++ b/hw/tusb6010.h @@ -0,0 +1,10 @@ +#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