Module Name: src
Committed By: khorben
Date: Sun Oct 25 22:48:23 UTC 2015
Modified Files:
src/sys/arch/amd64/conf: ALL
src/sys/arch/evbarm/conf: MMNET_GENERIC
src/sys/arch/i386/conf: ALL
src/sys/dev/pci: unichromefb.c
Log Message:
Remove references to SPLASHSCREEN_PROGRESS
To my knowledge this feature is no longer supported at the moment. The
manual page for wsdisplay(4) should probably also be updated to reflect
this situation.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/conf/MMNET_GENERIC
cvs rdiff -u -r1.396 -r1.397 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pci/unichromefb.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/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.31 src/sys/arch/amd64/conf/ALL:1.32
--- src/sys/arch/amd64/conf/ALL:1.31 Sat Sep 26 16:33:16 2015
+++ src/sys/arch/amd64/conf/ALL Sun Oct 25 22:48:23 2015
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.31 2015/09/26 16:33:16 maxv Exp $
+# $NetBSD: ALL,v 1.32 2015/10/25 22:48:23 khorben Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.31 $"
+#ident "ALL-$Revision: 1.32 $"
maxusers 64 # estimated number of users
@@ -312,7 +312,6 @@ options WSDISPLAY_SCROLLSUPPORT
#options VGA_RASTERCONSOLE
# enable splash screen support; requires hw driver support
#options SPLASHSCREEN
-#options SPLASHSCREEN_PROGRESS
# Keylock support
options KEYLOCK
Index: src/sys/arch/evbarm/conf/MMNET_GENERIC
diff -u src/sys/arch/evbarm/conf/MMNET_GENERIC:1.21 src/sys/arch/evbarm/conf/MMNET_GENERIC:1.22
--- src/sys/arch/evbarm/conf/MMNET_GENERIC:1.21 Sat Sep 26 11:16:12 2015
+++ src/sys/arch/evbarm/conf/MMNET_GENERIC Sun Oct 25 22:48:23 2015
@@ -1,4 +1,4 @@
-# $NetBSD: MMNET_GENERIC,v 1.21 2015/09/26 11:16:12 maxv Exp $
+# $NetBSD: MMNET_GENERIC,v 1.22 2015/10/25 22:48:23 khorben Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbarm/conf/std.mmnet"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.21 $"
+#ident "GENERIC-$Revision: 1.22 $"
maxusers 32 # estimated number of users
@@ -240,7 +240,6 @@ options NFS_BOOT_DHCP,NFS_BOOT_BOOTPARA
#options VGA_RASTERCONSOLE
# enable splash screen support; requires hw driver support
#options SPLASHSCREEN
-#options SPLASHSCREEN_PROGRESS
# Kernel root file system and dump configuration.
#config netbsd root on sd0c type ffs
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.396 src/sys/arch/i386/conf/ALL:1.397
--- src/sys/arch/i386/conf/ALL:1.396 Sat Sep 26 16:33:16 2015
+++ src/sys/arch/i386/conf/ALL Sun Oct 25 22:48:23 2015
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.396 2015/09/26 16:33:16 maxv Exp $
+# $NetBSD: ALL,v 1.397 2015/10/25 22:48:23 khorben Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.396 $"
+#ident "ALL-$Revision: 1.397 $"
maxusers 64 # estimated number of users
@@ -311,7 +311,6 @@ options WSDISPLAY_SCROLLSUPPORT
#options VGA_RASTERCONSOLE
# enable splash screen support; requires hw driver support
#options SPLASHSCREEN
-#options SPLASHSCREEN_PROGRESS
# Keylock support
options KEYLOCK
Index: src/sys/dev/pci/unichromefb.c
diff -u src/sys/dev/pci/unichromefb.c:1.18 src/sys/dev/pci/unichromefb.c:1.19
--- src/sys/dev/pci/unichromefb.c:1.18 Sat Jan 22 15:14:28 2011
+++ src/sys/dev/pci/unichromefb.c Sun Oct 25 22:48:23 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: unichromefb.c,v 1.18 2011/01/22 15:14:28 cegger Exp $ */
+/* $NetBSD: unichromefb.c,v 1.19 2015/10/25 22:48:23 khorben Exp $ */
/*-
* Copyright (c) 2006, 2008 Jared D. McNeill <[email protected]>
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: unichromefb.c,v 1.18 2011/01/22 15:14:28 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: unichromefb.c,v 1.19 2015/10/25 22:48:23 khorben Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -471,8 +471,6 @@ unichromefb_ioctl(void *v, void *vs, u_l
return 0;
case WSDISPLAYIO_SSPLASH:
return ENODEV;
- case WSDISPLAYIO_SPROGRESS:
- return ENODEV;
/* PCI config read/write passthrough. */
case PCI_IOC_CFGREAD:
