CVS commit: src/sys/arch/ia64/stand/efi/libefi

2020-01-26 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Sun Jan 26 10:12:29 UTC 2020

Modified Files:
src/sys/arch/ia64/stand/efi/libefi: efiboot.h

Log Message:
Trailing whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/stand/efi/libefi/efiboot.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/stand/efi/libefi/efiboot.h
diff -u src/sys/arch/ia64/stand/efi/libefi/efiboot.h:1.3 src/sys/arch/ia64/stand/efi/libefi/efiboot.h:1.4
--- src/sys/arch/ia64/stand/efi/libefi/efiboot.h:1.3	Thu Aug  4 16:22:40 2016
+++ src/sys/arch/ia64/stand/efi/libefi/efiboot.h	Sun Jan 26 10:12:29 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: efiboot.h,v 1.3 2016/08/04 16:22:40 scole Exp $	*/
+/*	$NetBSD: efiboot.h,v 1.4 2020/01/26 10:12:29 skrll Exp $	*/
 
 /*-
  * Copyright (c) 1996
@@ -65,7 +65,7 @@ typedef unsigned long physaddr_t;
 
 /* exported devices XXX rename? */
 extern struct devsw devsw[];
-extern struct netif_driver efi_net; 
+extern struct netif_driver efi_net;
 
 /* Find EFI network resources */
 extern void efinet_init_driver(void);

CVS commit: src/sys/arch/ia64/stand/efi/libefi

2019-05-06 Thread Sean Cole 
Module Name:src
Committed By:   scole
Date:   Tue May  7 02:05:17 UTC 2019

Modified Files:
src/sys/arch/ia64/stand/efi/libefi: exec.c

Log Message:
Avoid some RAW dependency compilation warnings


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ia64/stand/efi/libefi/exec.c

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/stand/efi/libefi/exec.c
diff -u src/sys/arch/ia64/stand/efi/libefi/exec.c:1.7 src/sys/arch/ia64/stand/efi/libefi/exec.c:1.8
--- src/sys/arch/ia64/stand/efi/libefi/exec.c:1.7	Thu Aug  4 18:07:43 2016
+++ src/sys/arch/ia64/stand/efi/libefi/exec.c	Tue May  7 02:05:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.c,v 1.7 2016/08/04 18:07:43 scole Exp $ */
+/* $NetBSD: exec.c,v 1.8 2019/05/07 02:05:17 scole Exp $ */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -192,13 +192,17 @@ elf64_exec(struct preloaded_file *fp)
 
 	__asm __volatile("mov cr.ifa=%0" :: "r"(IA64_RR_BASE(7)));
 	__asm __volatile("mov cr.itir=%0" :: "r"(28 << 2));
-	__asm __volatile("ptr.i %0,%1" :: "r"(IA64_RR_BASE(7)), "r"(28<<2));
+	__asm __volatile("srlz.d;;");
+	
 	__asm __volatile("ptr.d %0,%1" :: "r"(IA64_RR_BASE(7)), "r"(28<<2));
+	__asm __volatile("srlz.d;;");
+	__asm __volatile("itr.d dtr[%0]=%1;;" :: "r"(0), "r"(pte));
+	__asm __volatile("srlz.d;;");
+	
+	__asm __volatile("ptr.i %0,%1;;" :: "r"(IA64_RR_BASE(7)), "r"(28<<2));
 	__asm __volatile("srlz.i;;");
 	__asm __volatile("itr.i itr[%0]=%1;;" :: "r"(0), "r"(pte));
 	__asm __volatile("srlz.i;;");
-	__asm __volatile("itr.d dtr[%0]=%1;;" :: "r"(0), "r"(pte));
-	__asm __volatile("srlz.i;;");
 
 	enter_kernel(fp->marks[MARK_ENTRY], bi);

CVS commit: src/sys/arch/ia64/stand/efi/libefi

2018-08-18 Thread Robert Elz 
Module Name:src
Committed By:   kre
Date:   Sat Aug 18 15:55:19 UTC 2018

Modified Files:
src/sys/arch/ia64/stand/efi/libefi: efinet.c

Log Message:
More fallout from new gnu-efi ... EFI_SIMPLE_NETWORK_PROTOCOL
is now EFI_SIMPLE_NETWORK_PROTOCOL_GUID


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ia64/stand/efi/libefi/efinet.c

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/stand/efi/libefi/efinet.c
diff -u src/sys/arch/ia64/stand/efi/libefi/efinet.c:1.7 src/sys/arch/ia64/stand/efi/libefi/efinet.c:1.8
--- src/sys/arch/ia64/stand/efi/libefi/efinet.c:1.7	Thu Aug  4 16:22:40 2016
+++ src/sys/arch/ia64/stand/efi/libefi/efinet.c	Sat Aug 18 15:55:19 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: efinet.c,v 1.7 2016/08/04 16:22:40 scole Exp $	*/
+/*	$NetBSD: efinet.c,v 1.8 2018/08/18 15:55:19 kre Exp $	*/
 
 /*-
  * Copyright (c) 2001 Doug Rabson
@@ -231,7 +231,7 @@ efinet_init_driver(void)
 {
 	EFI_STATUS	status;
 	UINTN		sz;
-	static EFI_GUID netid = EFI_SIMPLE_NETWORK_PROTOCOL;
+	static EFI_GUID netid = EFI_SIMPLE_NETWORK_PROTOCOL_GUID;
 	EFI_HANDLE	*handles;
 	int		nifs, i;
 #define MAX_INTERFACES	4

CVS commit: src/sys/arch/ia64/stand/efi/libefi

2018-06-13 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Jun 13 16:04:55 UTC 2018

Modified Files:
src/sys/arch/ia64/stand/efi/libefi: Makefile.inc

Log Message:
revert previous MAKEOBJDIRPREFIX massaging


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/stand/efi/libefi/Makefile.inc

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/stand/efi/libefi/Makefile.inc
diff -u src/sys/arch/ia64/stand/efi/libefi/Makefile.inc:1.6 src/sys/arch/ia64/stand/efi/libefi/Makefile.inc:1.7
--- src/sys/arch/ia64/stand/efi/libefi/Makefile.inc:1.6	Mon Jun 11 17:38:27 2018
+++ src/sys/arch/ia64/stand/efi/libefi/Makefile.inc	Wed Jun 13 12:04:55 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.6 2018/06/11 21:38:27 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.7 2018/06/13 16:04:55 christos Exp $
 #
 #	Configuration variables (default values are below):
 #
@@ -22,7 +22,7 @@ EFILIB=			${EFIDST}/libefi.a
 EFIMAKE= \
 	cd ${EFIDIR} && MAKEOBJDIRPREFIX= && unset MAKEOBJDIRPREFIX && \
 	MAKEOBJDIR=${EFIDST} ${MAKE} \
-	CC=${CC:q} CFLAGS=${CFLAGS:S/MAKEOBJDIRPREFIX/MAKEOBJDIR/:q} \
+	CC=${CC:q} CFLAGS=${CFLAGS:q} \
 	AS=${AS:q} AFLAGS=${AFLAGS:q} \
 	LD=${LD:q} STRIP=${STRIP:q} \
 	MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH:q} \

CVS commit: src/sys/arch/ia64/stand/efi/libefi

2018-06-11 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Mon Jun 11 21:38:27 UTC 2018

Modified Files:
src/sys/arch/ia64/stand/efi/libefi: Makefile.inc

Log Message:
switch from MAKEOBJDIRPREFIX to MAKEOBJDIR.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/stand/efi/libefi/Makefile.inc

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/stand/efi/libefi/Makefile.inc
diff -u src/sys/arch/ia64/stand/efi/libefi/Makefile.inc:1.5 src/sys/arch/ia64/stand/efi/libefi/Makefile.inc:1.6
--- src/sys/arch/ia64/stand/efi/libefi/Makefile.inc:1.5	Sat May 26 21:14:50 2018
+++ src/sys/arch/ia64/stand/efi/libefi/Makefile.inc	Mon Jun 11 17:38:27 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.5 2018/05/27 01:14:50 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.6 2018/06/11 21:38:27 christos Exp $
 #
 #	Configuration variables (default values are below):
 #
@@ -22,7 +22,7 @@ EFILIB=			${EFIDST}/libefi.a
 EFIMAKE= \
 	cd ${EFIDIR} && MAKEOBJDIRPREFIX= && unset MAKEOBJDIRPREFIX && \
 	MAKEOBJDIR=${EFIDST} ${MAKE} \
-	CC=${CC:q} CFLAGS=${CFLAGS:q} \
+	CC=${CC:q} CFLAGS=${CFLAGS:S/MAKEOBJDIRPREFIX/MAKEOBJDIR/:q} \
 	AS=${AS:q} AFLAGS=${AFLAGS:q} \
 	LD=${LD:q} STRIP=${STRIP:q} \
 	MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH:q} \

CVS commit: src/sys/arch/ia64/stand/efi/libefi

2016-08-15 Thread Maxime Villard 
Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 09:00:52 UTC 2016

Modified Files:
src/sys/arch/ia64/stand/efi/libefi: devicename.c

Log Message:
Uninitialized var, found by brainy. I haven't tested this change, and it
may not be the perfect way to fix it. But it seems correct enough.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/ia64/stand/efi/libefi/devicename.c

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/stand/efi/libefi/devicename.c
diff -u src/sys/arch/ia64/stand/efi/libefi/devicename.c:1.8 src/sys/arch/ia64/stand/efi/libefi/devicename.c:1.9
--- src/sys/arch/ia64/stand/efi/libefi/devicename.c:1.8	Tue Apr  8 21:51:06 2014
+++ src/sys/arch/ia64/stand/efi/libefi/devicename.c	Mon Aug 15 09:00:52 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: devicename.c,v 1.8 2014/04/08 21:51:06 martin Exp $	*/
+/*	$NetBSD: devicename.c,v 1.9 2016/08/15 09:00:52 maxv Exp $	*/
 
 /*-
  * Copyright (c) 1998 Michael Smith 
@@ -95,7 +95,7 @@ efi_parsedev(struct efi_devdesc **dev, c
 	struct devsw	*dv;
 	int dv_type;
 	int		i, unit, slice, partition, err;
-	char		*cp;
+	char		*cp = NULL;
 	const char	*np;
 
 	/* minimum length check */
@@ -151,6 +151,10 @@ efi_parsedev(struct efi_devdesc **dev, c
 cp++;
 			}
 		}
+		if (cp == NULL) {
+			err = EINVAL;
+			goto fail;
+		}
 		if (*cp && (*cp != ':')) {
 			err = EINVAL;
 			goto fail;
@@ -174,6 +178,10 @@ efi_parsedev(struct efi_devdesc **dev, c
 goto fail;
 			}
 		}
+		if (cp == NULL) {
+			err = EINVAL;
+			goto fail;
+		}
 		if (*cp && (*cp != ':')) {
 			err = EINVAL;
 			goto fail;