diff options
| author | Avi Kivity <avi@redhat.com> | 2011-08-15 17:17:22 +0300 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-22 10:20:40 -0500 |
| commit | d09871f69c1863e6683d7c62a72b2d1a98e6d639 (patch) | |
| tree | f2a603479f7de8fb9af050541f109db17dd55a97 /hw | |
| parent | fc2bf44972349b078d8310466c3866615500e67f (diff) | |
| download | qemu-d09871f69c1863e6683d7c62a72b2d1a98e6d639.tar.gz qemu-d09871f69c1863e6683d7c62a72b2d1a98e6d639.tar.bz2 qemu-d09871f69c1863e6683d7c62a72b2d1a98e6d639.zip | |
tusb6010: move declarations to new file tusb6010.h
Avoid #include hell.
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/devices.h | 7 | ||||
| -rw-r--r-- | hw/nseries.c | 1 | ||||
| -rw-r--r-- | hw/tusb6010.c | 2 | ||||
| -rw-r--r-- | hw/tusb6010.h | 25 |
4 files changed, 27 insertions, 8 deletions
diff --git a/hw/devices.h b/hw/devices.h index c788373c8c..07fda83169 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 144fd5a426..f7aae7a59e 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 d7ae527a53..925136bdf8 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 0000000000..ebb35848b9 --- /dev/null +++ b/hw/tusb6010.h @@ -0,0 +1,25 @@ +/* + * tusb6010 interfaces + * + * Copyright 2011 Red Hat, Inc. and/or its affiliates + * + * Authors: + * Avi Kivity <avi@redhat.com> + * + * 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 |