From 93f6ce24f46cc596060d859ff97a276e80e1d5c5 Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Sat, 6 Jun 2020 14:52:16 +0200 Subject: [PATCH] pc, pc64: use 64-bit physical addresses for ISAConf.port --- sys/src/9/pc/dat.h | 2 +- sys/src/9/pc/devarch.c | 2 +- sys/src/9/pc64/dat.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/src/9/pc/dat.h b/sys/src/9/pc/dat.h index 3941a925e..278f70893 100644 --- 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 d637d5aa3..5ba04b59c 100644 --- 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 cc04c7c3b..6cb1cc9ed 100644 --- 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; -- 2.44.0