hw: move char backends to backends/

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>

8 files changed, 11 insertions, 9 deletions

diff --git a/backends/Makefile.objs b/backends/Makefile.objs
index 883676106b..464bc3e220 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
index 09dcb9cc74..37ccca8211 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
index ef47aed4e9..bf2ff2aca8 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 40ebe466ad..5750332f54 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
index 763588422a..763588422a 100644
--- a/hw/baum.h
+++ b/include/char/baum.h
diff --git a/hw/msmouse.h b/include/char/msmouse.h
index 8cff3a71c3..8cff3a71c3 100644
--- a/hw/msmouse.h
+++ b/include/char/msmouse.h
diff --git a/qemu-char.c b/qemu-char.c
index 160decc2f0..6dc1474546 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 c03edf1bfb..e0a8eeb24b 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"