[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/18] hw: move char backends to backends/
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 01/18] hw: move char backends to backends/ |
Date: |
Tue, 5 Mar 2013 18:17:28 +0100 |
Braille and msmouse support is in hw/, but it is not hardware.
Move it to the backends/ directory.
Signed-off-by: Paolo Bonzini <address@hidden>
---
backends/Makefile.objs | 4 ++++
{hw => backends}/baum.c | 4 ++--
{hw => backends}/msmouse.c | 2 +-
hw/Makefile.objs | 4 +---
{hw => include/char}/baum.h | 0
{hw => include/char}/msmouse.h | 0
qemu-char.c | 4 ++--
vl.c | 2 +-
8 files changed, 11 insertions(+), 9 deletions(-)
rename {hw => backends}/baum.c (99%)
rename {hw => backends}/msmouse.c (99%)
rename {hw => include/char}/baum.h (100%)
rename {hw => include/char}/msmouse.h (100%)
diff --git a/backends/Makefile.objs b/backends/Makefile.objs
index 8836761..464bc3e 100644
--- a/backends/Makefile.objs
+++ b/backends/Makefile.objs
@@ -1,2 +1,6 @@
common-obj-y += rng.o rng-egd.o
common-obj-$(CONFIG_POSIX) += rng-random.o
+
+common-obj-y += msmouse.o
+common-obj-$(CONFIG_BRLAPI) += baum.o
+$(obj)/baum.o: QEMU_CFLAGS += $(SDL_CFLAGS)
diff --git a/hw/baum.c b/backends/baum.c
similarity index 99%
rename from hw/baum.c
rename to backends/baum.c
index 09dcb9c..37ccca8 100644
--- a/hw/baum.c
+++ b/backends/baum.c
@@ -24,8 +24,8 @@
#include "qemu-common.h"
#include "char/char.h"
#include "qemu/timer.h"
-#include "usb.h"
-#include "baum.h"
+#include "hw/usb.h"
+#include "char/baum.h"
#include <brlapi.h>
#include <brlapi_constants.h>
#include <brlapi_keycodes.h>
diff --git a/hw/msmouse.c b/backends/msmouse.c
similarity index 99%
rename from hw/msmouse.c
rename to backends/msmouse.c
index ef47aed..bf2ff2a 100644
--- a/hw/msmouse.c
+++ b/backends/msmouse.c
@@ -25,7 +25,7 @@
#include "qemu-common.h"
#include "char/char.h"
#include "ui/console.h"
-#include "msmouse.h"
+#include "char/msmouse.h"
#define MSMOUSE_LO6(n) ((n) & 0x3f)
#define MSMOUSE_HI2(n) (((n) & 0xc0) >> 6)
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 40ebe46..5750332 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -190,10 +190,9 @@ common-obj-$(CONFIG_SSI_SD) += ssi-sd.o
common-obj-$(CONFIG_SD) += sd.o
common-obj-y += bt.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o
common-obj-y += bt-hci-csr.o
-common-obj-y += msmouse.o ps2.o
+common-obj-y += ps2.o
common-obj-y += qdev-monitor.o
common-obj-y += qdev-properties-system.o
-common-obj-$(CONFIG_BRLAPI) += baum.o
# xen backend driver support
common-obj-$(CONFIG_XEN_BACKEND) += xen_backend.o xen_devconfig.o
@@ -218,5 +217,4 @@ obj-$(CONFIG_KVM) += ivshmem.o
obj-$(CONFIG_LINUX) += vfio_pci.o
endif
-$(obj)/baum.o: QEMU_CFLAGS += $(SDL_CFLAGS)
endif
diff --git a/hw/baum.h b/include/char/baum.h
similarity index 100%
rename from hw/baum.h
rename to include/char/baum.h
diff --git a/hw/msmouse.h b/include/char/msmouse.h
similarity index 100%
rename from hw/msmouse.h
rename to include/char/msmouse.h
diff --git a/qemu-char.c b/qemu-char.c
index 160decc..6dc1474 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -28,8 +28,8 @@
#include "qemu/timer.h"
#include "char/char.h"
#include "hw/usb.h"
-#include "hw/baum.h"
-#include "hw/msmouse.h"
+#include "char/baum.h"
+#include "char/msmouse.h"
#include "qmp-commands.h"
#include <unistd.h>
diff --git a/vl.c b/vl.c
index c03edf1..e0a8eeb 100644
--- a/vl.c
+++ b/vl.c
@@ -119,7 +119,7 @@ int main(int argc, char **argv)
#include "hw/pcmcia.h"
#include "hw/pc.h"
#include "hw/isa.h"
-#include "hw/baum.h"
+#include "char/baum.h"
#include "hw/bt.h"
#include "hw/watchdog.h"
#include "hw/smbios.h"
--
1.8.1.2
- [Qemu-devel] [PULL 00/18] hw/ reorganization, part 1, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 02/18] hw: move fifo.[ch] to libqemuutil, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 05/18] virtio-9p: use CONFIG_VIRTFS, not CONFIG_LINUX, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 03/18] hw: move qdev-monitor.o to toplevel directory, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 04/18] hw: move device-hotplug.o to toplevel, compile it once, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 07/18] vt82c686: vt82c686 is not a PCI host bridge, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 01/18] hw: move char backends to backends/,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 08/18] ppc: do not use ../ in include files, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 06/18] virtio-9p: remove PCI dependencies from hw/9pfs/, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 11/18] ppc: express FDT dependency of pSeries and e500 boards via default-configs/, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 10/18] build: always link device_tree.o into emulators if libfdt available, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 13/18] arm: move files referencing CPU to hw/arm/, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 14/18] i386: move files referencing CPU to hw/i386/, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 17/18] ppc: move more files to hw/ppc, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 15/18] m68k: move files referencing CPU to hw/m68k/, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 12/18] hw: move boards and other isolated files to hw/ARCH, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 18/18] sh: move files referencing CPU to hw/sh4/, Paolo Bonzini, 2013/03/05