コミット: 419876eb272357c21fc4bf22bf0c8232acb1fdfb - qemu (git)

コミットメタ情報

• リビジョン: 419876eb272357c21fc4bf22bf0c8232acb1fdfb (tree)
• 日時: 2019-01-03 00:18:12
• 作者: Yoshinori Sato <ysato@user...>
• コミッター: Yoshinori Sato

ログメッセージ

New SCI support

変更サマリ

• modified: hw/rx/rx62n.c
• modified: include/hw/rx/rx62n.h

差分

--- a/hw/rx/rx62n.c
+++ b/hw/rx/rx62n.c
@@ -111,12 +111,12 @@ static RXTMRState *register_tmr(RX62NState *s, int unit)
     return RXTMR(tmr);
 }
 
-static RXCMTState *register_cmt(RX62NState *s, int unit)
+static RCMTState *register_cmt(RX62NState *s, int unit)
 {
     SysBusDevice *cmt;
     int i, irqbase;
     
-    cmt = SYS_BUS_DEVICE(qdev_create(NULL, TYPE_RXCMT));
+    cmt = SYS_BUS_DEVICE(qdev_create(NULL, TYPE_RCMT));
     sysbus_mmio_map(cmt, 0, 0x00088000 + unit * 0x10);
     qdev_prop_set_uint64(DEVICE(cmt), "input-freq", 48000000);
     
@@ -125,23 +125,25 @@ static RXCMTState *register_cmt(RX62NState *s, int unit)
     for (i = 0; i < 1; i++)
         sysbus_connect_irq(cmt, i, s->irq[irqbase + i]);
 
-    return RXCMT(cmt);
+    return RCMT(cmt);
 }
 
-static RenesasSCIState *register_sci(RX62NState *s, int unit)
+static RSCIState *register_sci(RX62NState *s, int unit)
 {
     SysBusDevice *sci;
     int i, irqbase;
     
-    sci = SYS_BUS_DEVICE(qdev_create(NULL, TYPE_RENESASSCI));
+    sci = SYS_BUS_DEVICE(qdev_create(NULL, TYPE_RSCI));
     qdev_prop_set_chr(DEVICE(sci), "chardev", serial_hd(unit));
+    qdev_prop_set_uint64(DEVICE(sci), "input-freq", 48000000);
     qdev_init_nofail(DEVICE(sci));
     sysbus_mmio_map(sci, 0, 0x00088240 + unit * 0x08);
     irqbase = 214 + 4 * unit;
     for (i = 0; i < 4; i++)
         sysbus_connect_irq(sci, i, s->irq[irqbase + i]);
 
-    return RenesasSCI(sci);
+    object_property_set_bool(OBJECT(sci), true, "realized", NULL);
+    return RSCI(sci);
 }
 
 static void rx62n_realize(DeviceState *dev, Error **errp)

--- a/include/hw/rx/rx62n.h
+++ b/include/hw/rx/rx62n.h
@@ -14,7 +14,7 @@
 #include "hw/rx/rx.h"
 #include "hw/intc/rx_icu.h"
 #include "hw/timer/rx_tmr.h"
-#include "hw/timer/rx_cmt.h"
+#include "hw/timer/renesas_cmt.h"
 #include "hw/char/renesas_sci.h"
 
 #define TYPE_RX62N "rx62n"
@@ -27,8 +27,8 @@ typedef struct RX62NState {
     RXCPU *cpu;
     RXICUState *icu;
     RXTMRState *tmr[2];
-    RXCMTState *cmt[2];
-    RenesasSCIState *sci[6];
+    RCMTState *cmt[2];
+    RSCIState *sci[6];
 
     MemoryRegion *sysmem;
     bool kernel;