Module Name: src
Committed By: rin
Date: Tue Jun 15 08:53:47 UTC 2021
Modified Files:
src/sys/arch/amiga/dev: amidisplaycc.c
Log Message:
Add support for WSDISPLAYIO_MODE_DUMBFB to WSDISPLAYIO_SMODE.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/amiga/dev/amidisplaycc.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/amiga/dev/amidisplaycc.c
diff -u src/sys/arch/amiga/dev/amidisplaycc.c:1.34 src/sys/arch/amiga/dev/amidisplaycc.c:1.35
--- src/sys/arch/amiga/dev/amidisplaycc.c:1.34 Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amiga/dev/amidisplaycc.c Tue Jun 15 08:53:47 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amidisplaycc.c,v 1.34 2021/04/24 23:36:24 thorpej Exp $ */
+/* $NetBSD: amidisplaycc.c,v 1.35 2021/06/15 08:53:47 rin Exp $ */
/*-
* Copyright (c) 2000 Jukka Andberg.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amidisplaycc.c,v 1.34 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amidisplaycc.c,v 1.35 2021/06/15 08:53:47 rin Exp $");
/*
* wscons interface to amiga custom chips. Contains the necessary functions
@@ -1041,11 +1041,15 @@ amidisplaycc_ioctl(void *dp, void *vs, u
return (0);
case WSDISPLAYIO_SMODE:
- if (INTDATA == WSDISPLAYIO_MODE_EMUL)
+ switch (INTDATA) {
+ case WSDISPLAYIO_MODE_EMUL:
return amidisplaycc_setgfxview(adp, 0);
- if (INTDATA == WSDISPLAYIO_MODE_MAPPED)
+ case WSDISPLAYIO_MODE_MAPPED:
+ case WSDISPLAYIO_MODE_DUMBFB:
return amidisplaycc_setgfxview(adp, 1);
- return (EINVAL);
+ default:
+ return (EINVAL);
+ }
case WSDISPLAYIO_GINFO:
FBINFO.width = adp->gfxwidth;
