[src/trunk]: src/sys/arch/ia64 ia64/efi.h: Make st_rt/st_cfgtbl pointers, not...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0011fb865c14
branches:  trunk
changeset: 369482:0011fb865c14
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sat Aug 20 10:55:03 2022 +0000

description:
ia64/efi.h: Make st_rt/st_cfgtbl pointers, not uint64_t, per spec.

diffstat:

 sys/arch/ia64/ia64/efi.c    |  11 ++++++-----
 sys/arch/ia64/include/efi.h |   6 +++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diffs (49 lines):

diff -r 541962be3671 -r 0011fb865c14 sys/arch/ia64/ia64/efi.c
--- a/sys/arch/ia64/ia64/efi.c  Sat Aug 20 10:54:53 2022 +0000
+++ b/sys/arch/ia64/ia64/efi.c  Sat Aug 20 10:55:03 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: efi.c,v 1.4 2022/08/20 10:54:25 riastradh Exp $        */
+/*     $NetBSD: efi.c,v 1.5 2022/08/20 10:55:03 riastradh Exp $        */
 
 /*-
  * Copyright (c) 2004 Marcel Moolenaar
@@ -68,12 +68,13 @@
                efi_systbl = NULL;
                return (EFAULT);
        }
-       efi_cfgtbl = (efi_systbl->st_cfgtbl == 0) ? NULL :
-           (struct efi_cfgtbl *)IA64_PHYS_TO_RR7(efi_systbl->st_cfgtbl);
+       efi_cfgtbl = (efi_systbl->st_cfgtbl == NULL) ? NULL :
+           (struct efi_cfgtbl *)IA64_PHYS_TO_RR7(
+               (uint64_t)efi_systbl->st_cfgtbl);
        if (efi_cfgtbl == NULL)
                return (ENOENT);
-       efi_runtime = (efi_systbl->st_rt == 0) ? NULL :
-           (struct efi_rt *)IA64_PHYS_TO_RR7(efi_systbl->st_rt);
+       efi_runtime = (efi_systbl->st_rt == NULL) ? NULL :
+           (struct efi_rt *)IA64_PHYS_TO_RR7((uint64_t)efi_systbl->st_rt);
        if (efi_runtime == NULL)
                return (ENOENT);
 
diff -r 541962be3671 -r 0011fb865c14 sys/arch/ia64/include/efi.h
--- a/sys/arch/ia64/include/efi.h       Sat Aug 20 10:54:53 2022 +0000
+++ b/sys/arch/ia64/include/efi.h       Sat Aug 20 10:55:03 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: efi.h,v 1.5 2022/08/20 10:54:25 riastradh Exp $        */
+/*     $NetBSD: efi.h,v 1.6 2022/08/20 10:55:03 riastradh Exp $        */
 
 /*-
  * Copyright (c) 2004 Marcel Moolenaar
@@ -152,10 +152,10 @@
        void            *st_coutif;
        void            *st_cerr;
        void            *st_cerrif;
-       uint64_t        st_rt;
+       struct efi_rt   *st_rt;
        void            *st_bs;
        u_long          st_entries;
-       uint64_t        st_cfgtbl;
+       struct efi_cfgtbl *st_cfgtbl;
 };
 
 void efi_boot_finish(void);