diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2019-10-13 10:56:32 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2019-10-13 10:56:32 +0000 |
| commit | 10609ad5816eeeb8eb701a5d5834894b2492dcb3 (patch) | |
| tree | f30951088914e1c2c4d599aa85cb108e75d2d2d6 /sys/dev/acpi | |
| parent | ae64efb8865ada9c354eae5a6c73eeace68227b8 (diff) | |
Move ws_get_param/ws_set_param into wsdisplay code.
ok deraadt@, jsg@
Diffstat (limited to 'sys/dev/acpi')
| -rw-r--r-- | sys/dev/acpi/acpithinkpad.c | 5 | ||||
| -rw-r--r-- | sys/dev/acpi/acpitoshiba.c | 5 | ||||
| -rw-r--r-- | sys/dev/acpi/acpivout.c | 6 |
3 files changed, 6 insertions, 10 deletions
diff --git a/sys/dev/acpi/acpithinkpad.c b/sys/dev/acpi/acpithinkpad.c index 31c29a3bcae..66826562848 100644 --- a/sys/dev/acpi/acpithinkpad.c +++ b/sys/dev/acpi/acpithinkpad.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpithinkpad.c,v 1.65 2019/10/12 16:35:36 kettenis Exp $ */ +/* $OpenBSD: acpithinkpad.c,v 1.66 2019/10/13 10:56:31 kettenis Exp $ */ /* * Copyright (c) 2008 joshua stein <jcs@openbsd.org> * @@ -24,6 +24,7 @@ #include <dev/acpi/amltypes.h> #include <dev/acpi/dsdt.h> #include <dev/wscons/wsconsio.h> +#include <dev/wscons/wsdisplayvar.h> #include <machine/apmvar.h> @@ -176,8 +177,6 @@ int thinkpad_get_brightness(struct acpithinkpad_softc *); int thinkpad_set_brightness(void *, int); int thinkpad_get_param(struct wsdisplay_param *); int thinkpad_set_param(struct wsdisplay_param *); -extern int (*ws_get_param)(struct wsdisplay_param *); -extern int (*ws_set_param)(struct wsdisplay_param *); void thinkpad_sensor_attach(struct acpithinkpad_softc *sc); void thinkpad_sensor_refresh(void *); diff --git a/sys/dev/acpi/acpitoshiba.c b/sys/dev/acpi/acpitoshiba.c index d070d98bcdc..aeaa9b5b1f0 100644 --- a/sys/dev/acpi/acpitoshiba.c +++ b/sys/dev/acpi/acpitoshiba.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpitoshiba.c,v 1.11 2018/07/01 19:40:49 mlarkin Exp $ */ +/* $OpenBSD: acpitoshiba.c,v 1.12 2019/10/13 10:56:31 kettenis Exp $ */ /*- * Copyright (c) 2003 Hiroyuki Aizu <aizu@navi.org> * All rights reserved. @@ -35,6 +35,7 @@ #include <machine/apmvar.h> #include <dev/wscons/wsconsio.h> +#include <dev/wscons/wsdisplayvar.h> /* * Toshiba HCI interface definitions @@ -107,8 +108,6 @@ int toshiba_fn_key_video_output(struct acpitoshiba_softc *); /* wconsole hook functions */ int acpitoshiba_get_param(struct wsdisplay_param *); int acpitoshiba_set_param(struct wsdisplay_param *); -extern int (*ws_get_param)(struct wsdisplay_param *); -extern int (*ws_set_param)(struct wsdisplay_param *); int get_param_brightness(struct wsdisplay_param *); int set_param_brightness(struct wsdisplay_param *); diff --git a/sys/dev/acpi/acpivout.c b/sys/dev/acpi/acpivout.c index 9ec8d5a569a..0157f6bdfb6 100644 --- a/sys/dev/acpi/acpivout.c +++ b/sys/dev/acpi/acpivout.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpivout.c,v 1.12 2016/03/29 17:52:04 kettenis Exp $ */ +/* $OpenBSD: acpivout.c,v 1.13 2019/10/13 10:56:31 kettenis Exp $ */ /* * Copyright (c) 2009 Paul Irofti <pirofti@openbsd.org> * @@ -28,6 +28,7 @@ #include <dev/acpi/dsdt.h> #include <dev/wscons/wsconsio.h> +#include <dev/wscons/wsdisplayvar.h> int acpivout_match(struct device *, void *, void *); void acpivout_attach(struct device *, struct device *, void *); @@ -72,9 +73,6 @@ void acpivout_get_bcl(struct acpivout_softc *); int acpivout_get_param(struct wsdisplay_param *); int acpivout_set_param(struct wsdisplay_param *); -extern int (*ws_get_param)(struct wsdisplay_param *); -extern int (*ws_set_param)(struct wsdisplay_param *); - struct cfattach acpivout_ca = { sizeof(struct acpivout_softc), acpivout_match, acpivout_attach }; |