[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/18] chardev: Rename BAUM_CHARDEV to CHARDEV_BRAILLE
From: |
Eduardo Habkost |
Subject: |
[PATCH 05/18] chardev: Rename BAUM_CHARDEV to CHARDEV_BRAILLE |
Date: |
Thu, 10 Sep 2020 15:48:50 -0400 |
Rename instance and class type checkers to match the
TYPE_CHARDEV_BRAILLE constant name and the QOM type name string
("chardev-braille").
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
chardev/baum.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/chardev/baum.c b/chardev/baum.c
index 5deca778bc..48459bd73c 100644
--- a/chardev/baum.c
+++ b/chardev/baum.c
@@ -105,7 +105,7 @@ struct BaumChardev {
typedef struct BaumChardev BaumChardev;
#define TYPE_CHARDEV_BRAILLE "chardev-braille"
-DECLARE_INSTANCE_CHECKER(BaumChardev, BAUM_CHARDEV,
+DECLARE_INSTANCE_CHECKER(BaumChardev, CHARDEV_BRAILLE,
TYPE_CHARDEV_BRAILLE)
/* Let's assume NABCC by default */
@@ -269,7 +269,7 @@ static int baum_deferred_init(BaumChardev *baum)
/* The serial port can receive more of our data */
static void baum_chr_accept_input(struct Chardev *chr)
{
- BaumChardev *baum = BAUM_CHARDEV(chr);
+ BaumChardev *baum = CHARDEV_BRAILLE(chr);
int room, first;
if (!baum->out_buf_used)
@@ -336,7 +336,7 @@ static void baum_write_packet(BaumChardev *baum, const
uint8_t *buf, int len)
/* Called when the other end seems to have a wrong idea of our display size */
static void baum_cellCount_timer_cb(void *opaque)
{
- BaumChardev *baum = BAUM_CHARDEV(opaque);
+ BaumChardev *baum = CHARDEV_BRAILLE(opaque);
uint8_t cell_count[] = { BAUM_RSP_CellCount, baum->x * baum->y };
DPRINTF("Timeout waiting for DisplayData, sending cell count\n");
baum_write_packet(baum, cell_count, sizeof(cell_count));
@@ -486,7 +486,7 @@ static int baum_eat_packet(BaumChardev *baum, const uint8_t
*buf, int len)
/* The other end is writing some data. Store it and try to interpret */
static int baum_chr_write(Chardev *chr, const uint8_t *buf, int len)
{
- BaumChardev *baum = BAUM_CHARDEV(chr);
+ BaumChardev *baum = CHARDEV_BRAILLE(chr);
int tocopy, cur, eaten, orig_len = len;
if (!len)
@@ -543,7 +543,7 @@ static void baum_send_key2(BaumChardev *baum, uint8_t type,
uint8_t value,
/* We got some data on the BrlAPI socket */
static void baum_chr_read(void *opaque)
{
- BaumChardev *baum = BAUM_CHARDEV(opaque);
+ BaumChardev *baum = CHARDEV_BRAILLE(opaque);
brlapi_keyCode_t code;
int ret;
if (!baum->brlapi)
@@ -629,7 +629,7 @@ static void baum_chr_read(void *opaque)
static void char_braille_finalize(Object *obj)
{
- BaumChardev *baum = BAUM_CHARDEV(obj);
+ BaumChardev *baum = CHARDEV_BRAILLE(obj);
timer_free(baum->cellCount_timer);
if (baum->brlapi) {
@@ -643,7 +643,7 @@ static void baum_chr_open(Chardev *chr,
bool *be_opened,
Error **errp)
{
- BaumChardev *baum = BAUM_CHARDEV(chr);
+ BaumChardev *baum = CHARDEV_BRAILLE(chr);
brlapi_handle_t *handle;
handle = g_malloc0(brlapi_getHandleSize());
--
2.26.2
- [PATCH 00/18] chardev: QOM cleanups, Eduardo Habkost, 2020/09/10
- [PATCH 01/18] chardev: Move PARALLEL_CHARDEV macro to common code, Eduardo Habkost, 2020/09/10
- [PATCH 02/18] chardev: Move ParallelChardev typedef to common code, Eduardo Habkost, 2020/09/10
- [PATCH 03/18] chardev: Use DECLARE_INSTANCE_CHECKER macro for PARALLEL_CHARDEV, Eduardo Habkost, 2020/09/10
- [PATCH 04/18] chardev: Rename MOUSE_CHARDEV to CHARDEV_MSMOUSE, Eduardo Habkost, 2020/09/10
- [PATCH 05/18] chardev: Rename BAUM_CHARDEV to CHARDEV_BRAILLE,
Eduardo Habkost <=
- [PATCH 06/18] chardev: Rename FD_CHARDEV to CHARDEV_FD, Eduardo Habkost, 2020/09/10
- [PATCH 07/18] chardev: Rename MUX_CHARDEV to CHARDEV_MUX, Eduardo Habkost, 2020/09/10
- [PATCH 08/18] chardev: Rename PARALLEL_CHARDEV to CHARDEV_PARALLEL, Eduardo Habkost, 2020/09/10
- [PATCH 10/18] chardev: Rename RINGBUF_CHARDEV to CHARDEV_RINGBUF, Eduardo Habkost, 2020/09/10
- [PATCH 09/18] chardev: Rename PTY_CHARDEV to CHARDEV_PTY, Eduardo Habkost, 2020/09/10
- [PATCH 11/18] chardev: Rename SOCKET_CHARDEV to CHARDEV_SOCKET, Eduardo Habkost, 2020/09/10
- [PATCH 12/18] chardev: Rename SPICE_CHARDEV to CHARDEV_SPICE, Eduardo Habkost, 2020/09/10
- [PATCH 13/18] chardev: Rename TESTDEV_CHARDEV to CHARDEV_TESTDEV, Eduardo Habkost, 2020/09/10
- [PATCH 14/18] chardev: Rename UDP_CHARDEV to CHARDEV_UDP, Eduardo Habkost, 2020/09/10
- [PATCH 15/18] chardev: Rename VC_CHARDEV to CHARDEV_VC, Eduardo Habkost, 2020/09/10