[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 4/7] grlib, apbuart: get rid of the old-style cre
From: |
KONRAD Frederic |
Subject: |
[Qemu-devel] [PATCH v3 4/7] grlib, apbuart: get rid of the old-style create function |
Date: |
Wed, 15 May 2019 14:31:30 +0200 |
Suggested-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: KONRAD Frederic <address@hidden>
---
hw/char/grlib_apbuart.c | 4 ++--
hw/sparc/leon3.c | 9 ++++++++-
include/hw/sparc/grlib.h | 20 +-------------------
3 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/hw/char/grlib_apbuart.c b/hw/char/grlib_apbuart.c
index e1d258b..9623016 100644
--- a/hw/char/grlib_apbuart.c
+++ b/hw/char/grlib_apbuart.c
@@ -1,7 +1,7 @@
/*
* QEMU GRLIB APB UART Emulator
*
- * Copyright (c) 2010-2011 AdaCore
+ * Copyright (c) 2010-2019 AdaCore
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
deal
@@ -23,6 +23,7 @@
*/
#include "qemu/osdep.h"
+#include "hw/sparc/grlib.h"
#include "hw/sysbus.h"
#include "chardev/char-fe.h"
@@ -68,7 +69,6 @@
#define FIFO_LENGTH 1024
-#define TYPE_GRLIB_APB_UART "grlib,apbuart"
#define GRLIB_APB_UART(obj) \
OBJECT_CHECK(UART, (obj), TYPE_GRLIB_APB_UART)
diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index fb52527..4f58691 100644
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -47,6 +47,9 @@
#define MAX_PILS 16
+#define LEON3_UART_OFFSET (0x80000100)
+#define LEON3_UART_IRQ (3)
+
#define LEON3_IRQMP_OFFSET (0x80000200)
#define LEON3_TIMER_OFFSET (0x80000300)
@@ -239,7 +242,11 @@ static void leon3_generic_hw_init(MachineState *machine)
/* Allocate uart */
if (serial_hd(0)) {
- grlib_apbuart_create(0x80000100, serial_hd(0), cpu_irqs[3]);
+ dev = qdev_create(NULL, TYPE_GRLIB_APB_UART);
+ qdev_prop_set_chr(dev, "chrdev", serial_hd(0));
+ qdev_init_nofail(dev);
+ sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, LEON3_UART_OFFSET);
+ sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, cpu_irqs[LEON3_UART_IRQ]);
}
}
diff --git a/include/hw/sparc/grlib.h b/include/hw/sparc/grlib.h
index fe553e9..5606ff0 100644
--- a/include/hw/sparc/grlib.h
+++ b/include/hw/sparc/grlib.h
@@ -45,24 +45,6 @@ void grlib_irqmp_ack(DeviceState *dev, int intno);
#define TYPE_GRLIB_GPTIMER "grlib,gptimer"
/* APB UART */
-
-static inline
-DeviceState *grlib_apbuart_create(hwaddr base,
- Chardev *serial,
- qemu_irq irq)
-{
- DeviceState *dev;
-
- dev = qdev_create(NULL, "grlib,apbuart");
- qdev_prop_set_chr(dev, "chrdev", serial);
-
- qdev_init_nofail(dev);
-
- sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);
-
- sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq);
-
- return dev;
-}
+#define TYPE_GRLIB_APB_UART "grlib,apbuart"
#endif /* GRLIB_H */
--
1.8.3.1
- [Qemu-devel] [PATCH v3 0/7] Leon3 patches, KONRAD Frederic, 2019/05/15
- [Qemu-devel] [PATCH v3 1/7] leon3: fix the error message when no bios are provided, KONRAD Frederic, 2019/05/15
- [Qemu-devel] [PATCH v3 7/7] MAINTAINERS: add myself for leon3, KONRAD Frederic, 2019/05/15
- [Qemu-devel] [PATCH v3 4/7] grlib, apbuart: get rid of the old-style create function,
KONRAD Frederic <=
- [Qemu-devel] [PATCH v3 3/7] grlib, gptimer: get rid of the old-style create function, KONRAD Frederic, 2019/05/15
- [Qemu-devel] [PATCH v3 6/7] leon3: introduce the plug and play mechanism, KONRAD Frederic, 2019/05/15
- [Qemu-devel] [PATCH v3 5/7] leon3: add a little bootloader, KONRAD Frederic, 2019/05/15
- [Qemu-devel] [PATCH v3 2/7] grlib, irqmp: get rid of the old-style create function, KONRAD Frederic, 2019/05/15
- Re: [Qemu-devel] [PATCH v3 0/7] Leon3 patches, Mark Cave-Ayland, 2019/05/17