diff mbox

[01/19] hw: move char backends to backends/

Message ID 1359999004-22982-2-git-send-email-pbonzini@redhat.com
State New
Headers show

Commit Message

Paolo Bonzini Feb. 4, 2013, 5:29 p.m. UTC 
Braille and msmouse support is in hw/, but it is not hardware.
Move it to the backends/ directory.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 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 mbox

Patch

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 447e32a..8fb0712 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -187,10 +187,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
@@ -215,5 +214,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 ac5d62d..3221c70 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 3155989..79ed0c7 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"