[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1.1 08/24] tusb6010: move declarations to new file
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH v1.1 08/24] tusb6010: move declarations to new file tusb6010.h |
Date: |
Tue, 9 Aug 2011 12:02:02 +0300 |
Avoid #include hell.
Signed-off-by: Avi Kivity <address@hidden>
---
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 <address@hidden>
+ *
+ * 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
- [Qemu-devel] [PATCH 00/24] Memory API batch 4: more conversions, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH 20/24] sysbus: remove sysbus_init_mmio_cb(), Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH 16/24] sh_pci: convert to memory API, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH 08/24] tusb6010: move declarations to new file tusb6010.h, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH 01/24] apb_pci: convert to memory API, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH 06/24] armv7m: convert to memory API, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH 03/24] arm_gic: convert to memory API, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH 15/24] sysbus: add a variant of sysbus_init_mmio_cb with an unmap callback, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH 23/24] vga: drop get_system_memory() from vga devices and derivatives, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH 12/24] ppc405_uc: convert to memory API, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH 04/24] arm_sysctl: convert to memory API, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH 17/24] arm11mpcore: use sysbus_init_mmio_cb2, Avi Kivity, 2011/08/08