oops, snapshot tests not ready yet

3 files changed, 4 insertions, 37 deletions

diff --git a/sys/arch/amd64/amd64/efifb.c b/sys/arch/amd64/amd64/efifb.c
index 5cf95af7e62..8cbb1f501d9 100644
--- a/sys/arch/amd64/amd64/efifb.c
+++ b/sys/arch/amd64/amd64/efifb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: efifb.c,v 1.13 2018/04/20 16:06:04 deraadt Exp $	*/
+/*	$OpenBSD: efifb.c,v 1.14 2018/04/20 16:09:36 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2015 YASUOKA Masahiko <yasuoka@yasuoka.net>
@@ -101,7 +101,6 @@ int	 efifb_show_screen(void *, void *, int, void (*cb) (void *, int, int),
 	    void *);
 int	 efifb_list_font(void *, struct wsdisplay_font *);
 int	 efifb_load_font(void *, void *, struct wsdisplay_font *);
-void	 efifb_scrollback(void *, void *, int lines);
 void	 efifb_efiinfo_init(struct efifb *);
 void	 efifb_cnattach_common(void);
 
@@ -134,8 +133,7 @@ struct wsdisplay_accessops efifb_accessops = {
 	.free_screen = efifb_free_screen,
 	.show_screen = efifb_show_screen,
 	.load_font = efifb_load_font,
-	.list_font = efifb_list_font,
-	.scrollback = efifb_scrollback,
+	.list_font = efifb_list_font
 };
 
 struct cfdriver efifb_cd = {
@@ -401,15 +399,6 @@ efifb_list_font(void *v, struct wsdisplay_font *font)
 	return (rasops_list_font(ri, font));
 }
 
-void
-efifb_scrollback(void *v, void *cookie, int lines)
-{
-	struct efifb_softc	*sc = v;
-	struct rasops_info	*ri = &sc->sc_fb->rinfo;
-
-	rasops_scrollback(ri, cookie, lines);
-}
-
 int
 efifb_cnattach(void)
 {
@@ -495,12 +484,6 @@ efifb_cndetach(void)
 	efifb_console.detached = 1;
 }
 
-void
-efifb_cnreattach(void)
-{
-	efifb_console.detached = 0;
-}
-
 int
 efifb_cb_cnattach(void)
 {
diff --git a/sys/arch/amd64/amd64/mainbus.c b/sys/arch/amd64/amd64/mainbus.c
index d26cf4c24de..67b0021910f 100644
--- a/sys/arch/amd64/amd64/mainbus.c
+++ b/sys/arch/amd64/amd64/mainbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mainbus.c,v 1.41 2018/04/20 16:06:04 deraadt Exp $	*/
+/*	$OpenBSD: mainbus.c,v 1.42 2018/04/20 16:09:36 deraadt Exp $	*/
 /*	$NetBSD: mainbus.c,v 1.1 2003/04/26 18:39:29 fvdl Exp $	*/
 
 /*
@@ -261,21 +261,6 @@ mainbus_attach(struct device *parent, struct device *self, void *aux)
 #endif
 }
 
-void
-mainbus_efifb_reattach(void)
-{
-#if NEFIFB > 0
-	union mainbus_attach_args mba;
-	struct device *self = device_mainbus();
-
-	if (bios_efiinfo != NULL || efifb_cb_found()) {
-		efifb_cnreattach();
-		mba.mba_eaa.eaa_name = "efifb";
-		config_found(self, &mba, mainbus_print);
-	}
-#endif
-}
-
 int
 mainbus_print(void *aux, const char *pnp)
 {
diff --git a/sys/arch/amd64/include/efifbvar.h b/sys/arch/amd64/include/efifbvar.h
index 26a5fe774e3..bf0509e646b 100644
--- a/sys/arch/amd64/include/efifbvar.h
+++ b/sys/arch/amd64/include/efifbvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: efifbvar.h,v 1.5 2018/04/20 16:06:04 deraadt Exp $	*/
+/*	$OpenBSD: efifbvar.h,v 1.6 2018/04/20 16:09:36 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2015 YASUOKA Masahiko <yasuoka@yasuoka.net>
@@ -28,7 +28,6 @@ struct pci_attach_args;
 int efifb_cnattach(void);
 int efifb_is_console(struct pci_attach_args *);
 void efifb_cndetach(void);
-void efifb_cnreattach(void);
 
 int efifb_cb_found(void);
 int efifb_cb_cnattach(void);