diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index 256904d67..6a30110b1 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -230,8 +230,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_pc_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -268,8 +269,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_pc82_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -306,8 +308,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = NULL, /* TODO: No specific kbd_device yet */
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -344,8 +347,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xt_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -382,8 +386,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xt86_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -420,8 +425,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xtclone_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -458,8 +464,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xtclone_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -496,8 +503,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xtclone_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -534,8 +542,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_pc82_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -572,8 +581,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xt_compaq_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -610,8 +620,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xtclone_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -648,8 +659,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_pc82_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -686,8 +698,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xt_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -724,8 +737,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xtclone_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -762,8 +776,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xtclone_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -800,8 +815,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xtclone_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -838,8 +854,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xtclone_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -876,8 +893,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xtclone_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -914,8 +932,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xt_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -952,8 +971,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_pc_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -990,8 +1010,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_pc_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -1028,8 +1049,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xtclone_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -1066,8 +1088,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xt_olivetti_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -1104,8 +1127,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xtclone_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -1142,8 +1166,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xtclone_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -1180,8 +1205,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_pc_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -1218,8 +1244,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xtclone_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -1256,8 +1283,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_pravetz_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -1294,8 +1322,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xtclone_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -1332,8 +1361,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 15,
         .kbc_device = &keyboard_xt_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -1370,8 +1400,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xtclone_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -1408,8 +1439,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_tandy_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -1446,8 +1478,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_tandy_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -1484,8 +1517,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 63,
         .kbc_device = &keyboard_xt_t1x00_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -1522,8 +1556,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xtclone_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -1561,8 +1596,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xt_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -1601,8 +1637,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = &keyboard_ps2_xi8088_device,
-        .kbc_p1 = 0xff04,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = &xi8088_device,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -1639,8 +1676,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xtclone_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -1677,8 +1715,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xt_zenith_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -1715,8 +1754,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xt_zenith_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -1753,8 +1793,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xt_zenith_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -1791,8 +1832,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_pc_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -1829,8 +1871,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xtclone_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -1869,8 +1912,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 63,
         .kbc_device = NULL /* TODO: No specific kbd_device yet */,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -1907,8 +1951,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 63,
         .kbc_device = NULL /* TODO: No specific kbd_device yet */,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -1945,8 +1990,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 63,
         .kbc_device = NULL /* TODO: No specific kbd_device yet */,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -1983,8 +2029,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 63,
         .kbc_device = NULL /* TODO: No specific kbd_device yet */,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -2021,8 +2068,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 63,
         .kbc_device = NULL /* TODO: No specific kbd_device yet */,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -2059,8 +2107,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 63,
         .kbc_device = NULL /* TODO: No specific kbd_device yet */,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -2097,8 +2146,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xt_compaq_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -2135,8 +2185,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0x3f,
         .kbc_device = &keyboard_xt_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -2173,8 +2224,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 15,
         .kbc_device = NULL /* TODO: No specific kbd_device yet */,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -2212,8 +2264,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 15,
         .kbc_device = NULL /* TODO: No specific kbd_device yet */,
-        .kbc_p1 = 0xff04,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -2250,8 +2303,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xtclone_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -2288,8 +2342,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = NULL /* TODO: No specific kbd_device yet */,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -2326,8 +2381,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 63,
         .kbc_device = &keyboard_xt_t1x00_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -2364,8 +2420,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = &keyboard_xt_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -2404,8 +2461,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xt_lxt3_device,
-        .kbc_p1 = 0xff00,
+        .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -2446,8 +2504,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 63,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -2485,8 +2544,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 63,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -2524,8 +2584,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -2563,8 +2624,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -2602,8 +2664,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 63,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -2642,8 +2705,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -2681,8 +2745,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -2720,8 +2785,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -2759,8 +2825,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -2798,8 +2865,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -2838,8 +2906,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -2879,8 +2948,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 63,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -2919,8 +2989,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 63,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -2958,8 +3029,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 63,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -2997,8 +3069,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 63,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -3036,8 +3109,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 63,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -3075,8 +3149,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -3114,8 +3189,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -3153,8 +3229,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -3192,8 +3269,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -3231,8 +3309,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -3270,8 +3349,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -3309,8 +3389,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -3348,8 +3429,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -3387,8 +3469,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -3426,8 +3509,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -3465,8 +3549,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -3504,8 +3589,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -3543,8 +3629,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -3584,8 +3671,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 63,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -3623,8 +3711,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 63,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -3665,8 +3754,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 63,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -3704,8 +3794,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -3743,8 +3834,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -3782,8 +3874,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -3821,8 +3914,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -3862,8 +3956,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -3902,8 +3997,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -3941,8 +4037,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -3980,8 +4077,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -4021,8 +4119,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -4062,8 +4161,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -4100,8 +4200,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -4141,8 +4242,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -4180,8 +4282,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -4219,8 +4322,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -4260,8 +4364,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -4301,8 +4406,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -4340,8 +4446,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -4380,8 +4487,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -4419,8 +4527,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -4460,8 +4569,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 63,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -4499,8 +4609,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 63,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -4541,8 +4652,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -4581,8 +4693,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -4620,8 +4733,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -4659,8 +4773,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -4698,8 +4813,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 63,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -4736,8 +4852,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 63,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -4774,8 +4891,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -4813,8 +4931,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -4852,8 +4971,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -4893,8 +5013,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 63,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -4935,8 +5056,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -4974,8 +5096,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -5013,8 +5136,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -5052,8 +5176,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 63,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -5091,8 +5216,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 63,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -5136,8 +5262,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -5177,8 +5304,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -5217,8 +5345,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -5256,8 +5385,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -5295,8 +5425,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -5335,8 +5466,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -5374,8 +5506,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -5416,8 +5549,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -5457,8 +5591,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -5496,8 +5631,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -5535,8 +5671,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 63,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -5577,8 +5714,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -5616,8 +5754,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -5655,8 +5794,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -5694,8 +5834,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -5733,8 +5874,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -5773,8 +5915,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -5814,8 +5957,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -5856,8 +6000,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -5895,8 +6040,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -5934,8 +6080,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -5973,8 +6120,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -6012,8 +6160,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -6051,8 +6200,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -6090,8 +6240,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -6129,8 +6280,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -6168,8 +6320,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -6209,8 +6362,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -6248,8 +6402,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -6287,8 +6442,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -6327,8 +6483,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -6370,8 +6527,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -6413,8 +6571,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -6452,8 +6611,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -6491,8 +6651,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -6530,8 +6691,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -6569,8 +6731,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -6608,8 +6771,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -6647,8 +6811,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -6687,8 +6852,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -6726,8 +6892,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -6765,8 +6932,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -6804,8 +6972,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -6843,8 +7012,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -6882,8 +7052,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -6921,8 +7092,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -6961,8 +7133,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -7001,8 +7174,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -7040,8 +7214,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -7079,8 +7254,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -7118,8 +7294,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -7158,8 +7335,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -7197,8 +7375,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -7236,8 +7415,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -7275,8 +7455,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -7314,8 +7495,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -7357,8 +7539,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -7397,8 +7580,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -7437,8 +7621,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -7477,8 +7662,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -7517,8 +7703,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -7563,8 +7750,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -7602,8 +7790,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -7641,8 +7830,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -7680,8 +7870,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -7721,8 +7912,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -7760,8 +7952,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -7799,8 +7992,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -7838,8 +8032,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -7877,8 +8072,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -7920,8 +8116,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -7961,8 +8158,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -8002,8 +8200,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -8041,8 +8240,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -8083,8 +8283,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -8123,8 +8324,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -8162,8 +8364,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -8203,8 +8406,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -8242,8 +8446,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -8283,8 +8488,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -8322,8 +8528,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -8361,8 +8568,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -8404,8 +8612,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -8444,8 +8653,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -8485,8 +8695,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -8524,8 +8735,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -8563,8 +8775,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = &keyboard_at_ami_device,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -8605,8 +8818,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -8644,8 +8858,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -8683,8 +8898,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -8724,8 +8940,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -8764,8 +8981,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 511,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -8805,8 +9023,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -8846,8 +9065,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -8887,8 +9107,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -8926,8 +9147,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -8966,8 +9188,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -9005,8 +9228,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -9044,8 +9268,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -9087,8 +9312,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -9126,8 +9352,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -9165,8 +9392,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -9205,8 +9433,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -9246,8 +9475,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -9287,8 +9517,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -9328,8 +9559,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -9367,8 +9599,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -9409,8 +9642,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -9448,8 +9682,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -9487,8 +9722,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 511,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -9528,8 +9764,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -9568,8 +9805,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -9609,8 +9847,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -9651,8 +9890,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -9690,8 +9930,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -9731,8 +9972,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -9770,8 +10012,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -9810,8 +10053,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -9849,8 +10093,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -9889,8 +10134,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -9928,8 +10174,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -9967,8 +10214,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -10006,8 +10254,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -10047,8 +10296,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -10086,8 +10336,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -10126,8 +10377,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -10166,8 +10418,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -10207,8 +10460,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -10246,8 +10500,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -10286,8 +10541,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -10326,8 +10582,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -10365,8 +10622,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -10404,8 +10662,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -10443,8 +10702,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -10485,8 +10745,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -10527,8 +10788,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -10568,8 +10830,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -10607,8 +10870,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -10648,8 +10912,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -10687,8 +10952,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -10729,8 +10995,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -10769,8 +11036,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -10808,8 +11076,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -10847,8 +11116,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -10889,8 +11159,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -10929,8 +11200,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -10969,8 +11241,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -11009,8 +11282,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -11051,8 +11325,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -11092,8 +11367,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -11131,8 +11407,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -11171,8 +11448,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -11209,8 +11487,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -11250,8 +11529,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -11291,8 +11571,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -11330,8 +11611,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -11371,8 +11653,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -11413,8 +11696,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -11454,8 +11738,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -11494,8 +11779,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 127,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -11536,8 +11822,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -11576,8 +11863,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -11618,8 +11906,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -11660,8 +11949,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -11700,8 +11990,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -11740,8 +12031,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -11780,8 +12072,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -11820,8 +12113,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -11860,8 +12154,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -11900,8 +12195,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -11940,8 +12236,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -11982,8 +12279,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -12022,8 +12320,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -12064,8 +12363,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -12106,8 +12406,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -12146,8 +12447,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -12186,8 +12488,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -12226,8 +12529,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -12269,8 +12573,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 511,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -12312,8 +12617,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -12353,8 +12659,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -12396,8 +12703,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 511,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -12436,8 +12744,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 511,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -12479,8 +12788,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -12521,8 +12831,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -12561,8 +12872,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -12601,8 +12913,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -12643,8 +12956,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -12685,8 +12999,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -12727,8 +13042,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -12767,8 +13083,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -12807,8 +13124,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -12847,8 +13165,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -12889,8 +13208,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 255,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -12928,8 +13248,9 @@ const machine_t machines[] = {
         },
         .nvrmask = 0,
         .kbc_device = NULL,
-        .kbc_p1 = 0,
-        .gpio = 0,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
         .device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
@@ -12973,6 +13294,8 @@ machine_handle_p1(uint8_t write, uint8_t val)
         else
             ret = machine_p1;
     }
+
+    return ret;
 }
 
 void
@@ -13006,6 +13329,8 @@ machine_handle_gpio(uint8_t write, uint32_t val)
         else
             ret = machine_gpio;
     }
+
+    return ret;
 }
 
 void
@@ -13039,6 +13364,8 @@ machine_handle_gpio_acpi(uint8_t write, uint32_t val)
         else
             ret = machine_gpio_acpi;
     }
+
+    return ret;
 }
 
 void