Module Name: src
Committed By: riastradh
Date: Sat Aug 20 10:55:03 UTC 2022
Modified Files:
src/sys/arch/ia64/ia64: efi.c
src/sys/arch/ia64/include: efi.h
Log Message:
ia64/efi.h: Make st_rt/st_cfgtbl pointers, not uint64_t, per spec.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/ia64/efi.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/include/efi.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/ia64/ia64/efi.c
diff -u src/sys/arch/ia64/ia64/efi.c:1.4 src/sys/arch/ia64/ia64/efi.c:1.5
--- src/sys/arch/ia64/ia64/efi.c:1.4 Sat Aug 20 10:54:25 2022
+++ src/sys/arch/ia64/ia64/efi.c Sat Aug 20 10:55:03 2022
@@ -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_boot_minimal(uint64_t systbl)
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);
Index: src/sys/arch/ia64/include/efi.h
diff -u src/sys/arch/ia64/include/efi.h:1.5 src/sys/arch/ia64/include/efi.h:1.6
--- src/sys/arch/ia64/include/efi.h:1.5 Sat Aug 20 10:54:25 2022
+++ src/sys/arch/ia64/include/efi.h Sat Aug 20 10:55:03 2022
@@ -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 @@ struct efi_systbl {
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);
