pc, pc64: use 64-bit physical addresses for ISAConf.port

diff --git a/sys/src/9/pc/dat.h b/sys/src/9/pc/dat.h
index 3941a925ef4e23841626c95449436ced3b624cdc..278f70893de24483c79ab531b9cbddd8cadfb6cc 100644 (file)
--- a/sys/src/9/pc/dat.h
+++ b/sys/src/9/pc/dat.h
@@ -343,7 +343,7 @@ enum {
 
 struct ISAConf {
        char    *type;
-       ulong   port;
+       uvlong  port;
        int     irq;
        ulong   dma;
        ulong   mem;

diff --git a/sys/src/9/pc/devarch.c b/sys/src/9/pc/devarch.c
index d637d5aa3e889c357cae1f036c724989f0cda0ce..5ba04b59cc2a7fc878d434026a0fd72f7d4a3aca 100644 (file)
--- a/sys/src/9/pc/devarch.c
+++ b/sys/src/9/pc/devarch.c
@@ -1247,7 +1247,7 @@ isaconfig(char *class, int ctlrno, ISAConf *isa)
                if(cistrncmp(p, "type=", 5) == 0)
                        isa->type = p + 5;
                else if(cistrncmp(p, "port=", 5) == 0)
-                       isa->port = strtoul(p+5, &p, 0);
+                       isa->port = strtoull(p+5, &p, 0);
                else if(cistrncmp(p, "irq=", 4) == 0)
                        isa->irq = strtoul(p+4, &p, 0);
                else if(cistrncmp(p, "dma=", 4) == 0)

diff --git a/sys/src/9/pc64/dat.h b/sys/src/9/pc64/dat.h
index cc04c7c3b9901f2848c216adf344f4efb9913d84..6cb1cc9edc3c3580064cf3ee804f1e177446a1d0 100644 (file)
--- a/sys/src/9/pc64/dat.h
+++ b/sys/src/9/pc64/dat.h
@@ -319,7 +319,7 @@ enum {                                              /* MSRs */
 
 struct ISAConf {
        char    *type;
-       ulong   port;
+       uvlong  port;
        int     irq;
        ulong   dma;
        ulong   mem;