Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/fdt fix build without VCONS_DRAW_INTR



details:   https://anonhg.NetBSD.org/src/rev/68f236bf862d
branches:  trunk
changeset: 949809:68f236bf862d
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Jan 17 14:28:25 2021 +0000

description:
fix build without VCONS_DRAW_INTR

diffstat:

 sys/arch/arm/fdt/arm_simplefb.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r 23d92e1e1573 -r 68f236bf862d sys/arch/arm/fdt/arm_simplefb.c
--- a/sys/arch/arm/fdt/arm_simplefb.c   Sun Jan 17 14:26:31 2021 +0000
+++ b/sys/arch/arm/fdt/arm_simplefb.c   Sun Jan 17 14:28:25 2021 +0000
@@ -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 @@
        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;



Home | Main Index | Thread Index | Old Index