• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Revisão419876eb272357c21fc4bf22bf0c8232acb1fdfb (tree)
Hora2019-01-03 00:18:12
AutorYoshinori Sato <ysato@user...>
CommiterYoshinori Sato

Mensagem de Log

New SCI support

Mudança Sumário

Diff

--- a/hw/rx/rx62n.c
+++ b/hw/rx/rx62n.c
@@ -111,12 +111,12 @@ static RXTMRState *register_tmr(RX62NState *s, int unit)
111111 return RXTMR(tmr);
112112 }
113113
114-static RXCMTState *register_cmt(RX62NState *s, int unit)
114+static RCMTState *register_cmt(RX62NState *s, int unit)
115115 {
116116 SysBusDevice *cmt;
117117 int i, irqbase;
118118
119- cmt = SYS_BUS_DEVICE(qdev_create(NULL, TYPE_RXCMT));
119+ cmt = SYS_BUS_DEVICE(qdev_create(NULL, TYPE_RCMT));
120120 sysbus_mmio_map(cmt, 0, 0x00088000 + unit * 0x10);
121121 qdev_prop_set_uint64(DEVICE(cmt), "input-freq", 48000000);
122122
@@ -125,23 +125,25 @@ static RXCMTState *register_cmt(RX62NState *s, int unit)
125125 for (i = 0; i < 1; i++)
126126 sysbus_connect_irq(cmt, i, s->irq[irqbase + i]);
127127
128- return RXCMT(cmt);
128+ return RCMT(cmt);
129129 }
130130
131-static RenesasSCIState *register_sci(RX62NState *s, int unit)
131+static RSCIState *register_sci(RX62NState *s, int unit)
132132 {
133133 SysBusDevice *sci;
134134 int i, irqbase;
135135
136- sci = SYS_BUS_DEVICE(qdev_create(NULL, TYPE_RENESASSCI));
136+ sci = SYS_BUS_DEVICE(qdev_create(NULL, TYPE_RSCI));
137137 qdev_prop_set_chr(DEVICE(sci), "chardev", serial_hd(unit));
138+ qdev_prop_set_uint64(DEVICE(sci), "input-freq", 48000000);
138139 qdev_init_nofail(DEVICE(sci));
139140 sysbus_mmio_map(sci, 0, 0x00088240 + unit * 0x08);
140141 irqbase = 214 + 4 * unit;
141142 for (i = 0; i < 4; i++)
142143 sysbus_connect_irq(sci, i, s->irq[irqbase + i]);
143144
144- return RenesasSCI(sci);
145+ object_property_set_bool(OBJECT(sci), true, "realized", NULL);
146+ return RSCI(sci);
145147 }
146148
147149 static void rx62n_realize(DeviceState *dev, Error **errp)
--- a/include/hw/rx/rx62n.h
+++ b/include/hw/rx/rx62n.h
@@ -14,7 +14,7 @@
1414 #include "hw/rx/rx.h"
1515 #include "hw/intc/rx_icu.h"
1616 #include "hw/timer/rx_tmr.h"
17-#include "hw/timer/rx_cmt.h"
17+#include "hw/timer/renesas_cmt.h"
1818 #include "hw/char/renesas_sci.h"
1919
2020 #define TYPE_RX62N "rx62n"
@@ -27,8 +27,8 @@ typedef struct RX62NState {
2727 RXCPU *cpu;
2828 RXICUState *icu;
2929 RXTMRState *tmr[2];
30- RXCMTState *cmt[2];
31- RenesasSCIState *sci[6];
30+ RCMTState *cmt[2];
31+ RSCIState *sci[6];
3232
3333 MemoryRegion *sysmem;
3434 bool kernel;