Commit: 069d7c5be3ecf870f97acd68b616c292fdb329fe - qemu (git)

Commit MetaInfo

• Revision: 069d7c5be3ecf870f97acd68b616c292fdb329fe (tree)
• Zeit: 2020-04-06 00:38:55
• Autor: Yoshinori Sato <ysato@user...>
• Commiter: Yoshinori Sato

Log Message

fix EXT irq

Ändern Zusammenfassung

• modified: hw/intc/h8300h_intc.c
• modified: include/hw/h8300/h83069.h

Diff

--- a/hw/intc/h8300h_intc.c
+++ b/hw/intc/h8300h_intc.c
@@ -59,10 +59,10 @@ static inline int pri(H8300HINTCState *intc, int irq)
 
 static inline int ext_no(int irq)
 {
-    if (irq < 7 || irq > 12) {
+    if (irq < 12 || irq > 17) {
         return -1;
     }
-    return irq - 7;
+    return irq - 12;
 }
 
 static void h8300hintc_set_irq(void *opaque, int n_IRQ, int level)

--- a/include/hw/h8300/h83069.h
+++ b/include/hw/h8300/h83069.h
@@ -40,7 +40,6 @@ typedef struct H83069State {
     uint8_t syscr_val;
 
     MemoryRegion *sysmem;
-    bool kernel;
 
     MemoryRegion iram;
     MemoryRegion iomem1;
@@ -48,6 +47,7 @@ typedef struct H83069State {
     MemoryRegion flash;
     MemoryRegion syscr;
     uint64_t input_freq;
+    uint32_t sci_con;
     qemu_irq irq[NR_IRQS];
 } H83069State;