[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/9] chardev: add braille support to qapi
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 5/9] chardev: add braille support to qapi |
Date: |
Mon, 25 Feb 2013 10:03:39 +0100 |
This patch adds 'braille' support to qapi and also switches over
the braille chardev initialization to the new qapi code path.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/baum.c | 2 +-
hw/baum.h | 2 +-
qapi-schema.json | 3 ++-
qemu-char.c | 7 ++++++-
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/hw/baum.c b/hw/baum.c
index 09dcb9c..7f0384c 100644
--- a/hw/baum.c
+++ b/hw/baum.c
@@ -562,7 +562,7 @@ static void baum_close(struct CharDriverState *chr)
g_free(baum);
}
-CharDriverState *chr_baum_init(QemuOpts *opts)
+CharDriverState *chr_baum_init(void)
{
BaumDriverState *baum;
CharDriverState *chr;
diff --git a/hw/baum.h b/hw/baum.h
index 7635884..6fcb627 100644
--- a/hw/baum.h
+++ b/hw/baum.h
@@ -25,6 +25,6 @@
#define HW_BAUM_H 1
/* char device */
-CharDriverState *chr_baum_init(QemuOpts *opts);
+CharDriverState *chr_baum_init(void);
#endif
diff --git a/qapi-schema.json b/qapi-schema.json
index cd93707..f873451 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -3161,7 +3161,8 @@
'pty' : 'ChardevDummy',
'null' : 'ChardevDummy',
'mux' : 'ChardevMux',
- 'msmouse': 'ChardevDummy' } }
+ 'msmouse': 'ChardevDummy',
+ 'braille': 'ChardevDummy' } }
##
# @ChardevReturn:
diff --git a/qemu-char.c b/qemu-char.c
index c824ed8..156eade 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -2998,7 +2998,7 @@ static const struct {
{ .name = "stdio", .open = qemu_chr_open_stdio },
#endif
#ifdef CONFIG_BRLAPI
- { .name = "braille", .open = chr_baum_init },
+ { .name = "braille", .kind = CHARDEV_BACKEND_KIND_BRAILLE },
#endif
#ifdef HAVE_CHARDEV_TTY
{ .name = "tty", .open = qemu_chr_open_tty },
@@ -3480,6 +3480,11 @@ ChardevReturn *qmp_chardev_add(const char *id,
ChardevBackend *backend,
case CHARDEV_BACKEND_KIND_MSMOUSE:
chr = qemu_chr_open_msmouse();
break;
+#ifdef CONFIG_BRLAPI
+ case CHARDEV_BACKEND_KIND_BRAILLE:
+ chr = chr_baum_init();
+ break;
+#endif
default:
error_setg(errp, "unknown chardev backend (%d)", backend->kind);
break;
--
1.7.9.7
- [Qemu-devel] [PATCH 0/9] chardev: qapi conversion continued, Gerd Hoffmann, 2013/02/25
- [Qemu-devel] [PATCH 2/2] unbreak hw/usb/redirect.c build, Gerd Hoffmann, 2013/02/25
- [Qemu-devel] [PATCH 2/9] chardev: add mux chardev support to qapi, Gerd Hoffmann, 2013/02/25
- [Qemu-devel] [PATCH 1/9] chardev: add support for qapi-based chardev initialization, Gerd Hoffmann, 2013/02/25
- [Qemu-devel] [PATCH 1/2] require gtk 2.20+, Gerd Hoffmann, 2013/02/25
- [Qemu-devel] [PATCH 3/9] chardev: switch null init to qapi, Gerd Hoffmann, 2013/02/25
- [Qemu-devel] [PATCH 8/9] chardev: switch serial/tty init to qapi, Gerd Hoffmann, 2013/02/25
- [Qemu-devel] [PATCH 5/9] chardev: add braille support to qapi,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 7/9] chardev: add stdio support to qapi, Gerd Hoffmann, 2013/02/25
- [Qemu-devel] [PATCH 6/9] chardev: switch file init to qapi, Gerd Hoffmann, 2013/02/25
- [Qemu-devel] [PATCH 4/9] chardev: add msmouse support to qapi, Gerd Hoffmann, 2013/02/25
- [Qemu-devel] [PATCH 9/9] chardev: switch parallel init to qapi, Gerd Hoffmann, 2013/02/25
- [Qemu-devel] SocketAdress + udb, Gerd Hoffmann, 2013/02/26