[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 01/18] chardev: Move PARALLEL_CHARDEV macro to common code
From: |
Eduardo Habkost |
Subject: |
[PATCH 01/18] chardev: Move PARALLEL_CHARDEV macro to common code |
Date: |
Thu, 10 Sep 2020 15:48:46 -0400 |
The macro is exactly the same for both Linux and BSD, so move its
definition outside the host OS #ifdef blocks.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
chardev/char-parallel.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/chardev/char-parallel.c b/chardev/char-parallel.c
index 05e7efbd6c..390d03506c 100644
--- a/chardev/char-parallel.c
+++ b/chardev/char-parallel.c
@@ -47,6 +47,9 @@
#include "chardev/char-fd.h"
#include "chardev/char-parallel.h"
+#define PARALLEL_CHARDEV(obj) \
+ OBJECT_CHECK(ParallelChardev, (obj), TYPE_CHARDEV_PARALLEL)
+
#if defined(__linux__)
typedef struct {
@@ -55,9 +58,6 @@ typedef struct {
int mode;
} ParallelChardev;
-#define PARALLEL_CHARDEV(obj) \
- OBJECT_CHECK(ParallelChardev, (obj), TYPE_CHARDEV_PARALLEL)
-
static int pp_hw_mode(ParallelChardev *s, uint16_t mode)
{
if (s->mode != mode) {
@@ -182,9 +182,6 @@ typedef struct {
int fd;
} ParallelChardev;
-#define PARALLEL_CHARDEV(obj) \
- OBJECT_CHECK(ParallelChardev, (obj), TYPE_CHARDEV_PARALLEL)
-
static int pp_ioctl(Chardev *chr, int cmd, void *arg)
{
ParallelChardev *drv = PARALLEL_CHARDEV(chr);
--
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 <=
- [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, 2020/09/10
- [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