Module Name: src
Committed By: jmcneill
Date: Sun Jan 17 14:28:25 UTC 2021
Modified Files:
src/sys/arch/arm/fdt: arm_simplefb.c
Log Message:
fix build without VCONS_DRAW_INTR
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/fdt/arm_simplefb.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/arm/fdt/arm_simplefb.c
diff -u src/sys/arch/arm/fdt/arm_simplefb.c:1.4 src/sys/arch/arm/fdt/arm_simplefb.c:1.5
--- src/sys/arch/arm/fdt/arm_simplefb.c:1.4 Wed Oct 21 11:06:13 2020
+++ src/sys/arch/arm/fdt/arm_simplefb.c Sun Jan 17 14:28:25 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: arm_simplefb.c,v 1.4 2020/10/21 11:06:13 rin Exp $ */
+/* $NetBSD: arm_simplefb.c,v 1.5 2021/01/17 14:28:25 jmcneill Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -31,9 +31,10 @@
#include "pci.h"
#include "opt_pci.h"
+#include "opt_vcons.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm_simplefb.c,v 1.4 2020/10/21 11:06:13 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm_simplefb.c,v 1.5 2021/01/17 14:28:25 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -254,9 +255,11 @@ arm_simplefb_preattach(void)
vcons_init(&arm_simplefb_vcons_data, sc, &arm_simplefb_stdscreen,
&arm_simplefb_accessops);
arm_simplefb_vcons_data.init_screen = arm_simplefb_init_screen;
+#ifdef VCONS_DRAW_INTR
arm_simplefb_vcons_data.use_intr = 0;
+#endif
vcons_init_screen(&arm_simplefb_vcons_data, &arm_simplefb_screen, 1, &defattr);
- arm_simplefb_screen.scr_flags |= VCONS_SCREEN_IS_STATIC;
+ arm_simplefb_screen.scr_flags |= VCONS_SCREEN_IS_STATIC;
if (ri->ri_rows < 1 || ri->ri_cols < 1)
return;
