config, core: Improve irqchip configuration

[jailhouse.git] / tools / root-cell-config.c.tmpl

diff --git a/tools/root-cell-config.c.tmpl b/tools/root-cell-config.c.tmpl
index 5ee376784e2665907b5aaa80475a306c55e653f0..a864fb6fb681ec749583edd7afb95ac98ccbdd44 100644 (file)
--- a/tools/root-cell-config.c.tmpl
+++ b/tools/root-cell-config.c.tmpl
@@ -83,7 +83,6 @@ struct {
                        },
                        % endif
                },
-               .device_limit = 128,
                .interrupt_limit = 256,
                .root_cell = {
                        .name = "RootCell",
@@ -126,7 +125,9 @@ struct {
                {
                        .address = ${hex(i.address)},
                        .id = ${hex(i.irqchip_id())},
-                       .pin_bitmap = 0xffffff,
+                       .pin_bitmap = {
+                               0xffffff
+                       },
                },
                % endfor
        },
@@ -138,7 +139,7 @@ struct {
                [  0x60/8 ...   0x67/8] = 0xec, /* HACK: NMI status/control */
                [  0x68/8 ...   0x6f/8] = -1,
                [  0x70/8 ...   0x77/8] = 0xfc, /* RTC */
-               [  0x78/8 ...   0x7f/7] = -1,
+               [  0x78/8 ...   0x7f/8] = -1,
                [  0x80/8 ...   0x87/8] = 0xfe, /* Linux: native_io_delay() */
                [  0x88/8 ...  0x3af/8] = -1,
                [ 0x3b0/8 ...  0x3df/8] = 0x00, /* VGA */