archacpi: make *acpi=1 the default

[plan9front.git] / sys / src / 9 / pc / archacpi.c

diff --git a/sys/src/9/pc/archacpi.c b/sys/src/9/pc/archacpi.c
index 01c91146868e70c6747dd0307deb90fc12aef232..044825a8c56b4ca53af76abf91cd622d058921da 100644 (file)
--- a/sys/src/9/pc/archacpi.c
+++ b/sys/src/9/pc/archacpi.c
@@ -787,18 +787,18 @@ readtbls(Chan*, void *v, long n, vlong o)
 static int
 identify(void)
 {
-       uvlong pa;
+       uvlong v;
        char *cp;
        Tbl *t;
 
        if((cp = getconf("*acpi")) == nil)
-               return 1;
-       pa = (uintptr)strtoull(cp, nil, 16);
-       if(pa <= 1)
+               cp = "1";       /* search for rsd by default */
+       v = (uintptr)strtoull(cp, nil, 16);
+       if(v <= 1)
                rsd = rsdsearch();
        else {
-               memreserve(pa, sizeof(Rsd));
-               rsd = vmap(pa, sizeof(Rsd));
+               memreserve(v, sizeof(Rsd));
+               rsd = vmap(v, sizeof(Rsd));
        }
        if(rsd == nil)
                return 1;
@@ -807,7 +807,7 @@ identify(void)
        maptables();
        addarchfile("acpitbls", 0444, readtbls, nil);
        addarchfile("acpimem", 0600, readmem, writemem);
-       if(strcmp(cp, "0") == 0 || findtable("APIC") == nil)
+       if(v == 0 || findtable("APIC") == nil)
                return 1;
        if((cp = getconf("*nomp")) != nil && strcmp(cp, "0") != 0)
                return 1;