From dd35cab101fb74b16ae7db05d929975cc7101a45 Mon Sep 17 00:00:00 2001 From: Nick Sayer Date: Sat, 2 Oct 1999 03:34:15 +0000 Subject: [PATCH] Prepare for the apm_saver screen saver module. 1. Break out the definition of the soft state structure into an include file. 2. un-static the soft state and apm_display(), and group them under a comment that notes the dependency. --- sys/i386/apm/apm.c | 32 +++++++------------------------- sys/i386/apm/apm.h | 43 +++++++++++++++++++++++++++++++++++++++++++ sys/i386/bios/apm.c | 32 +++++++------------------------- sys/i386/bios/apm.h | 43 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 100 insertions(+), 50 deletions(-) create mode 100644 sys/i386/apm/apm.h create mode 100644 sys/i386/bios/apm.h diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c index d6752b743f18..a0c5b95b5f3c 100644 --- a/sys/i386/apm/apm.c +++ b/sys/i386/apm/apm.c @@ -44,37 +44,20 @@ #include #include -static int apm_display __P((int newstate)); +#include + +/* Used by the apm_saver screen saver module */ +int apm_display __P((int newstate)); +struct apm_softc apm_softc; + static void apm_resume __P((void)); static int apm_bioscall(void); static int apm_check_function_supported __P((u_int version, u_int func)); static u_long apm_version; -#define APM_NEVENTS 16 -#define APM_NPMEV 13 - int apm_evindex; -/* static data */ -struct apm_softc { - int initialized, active, bios_busy; - int always_halt_cpu, slow_idle_cpu; - int disabled, disengaged; - int standby_countdown, suspend_countdown; - u_int minorversion, majorversion; - u_int intversion, connectmode; - u_int standbys, suspends; - struct bios_args bios; - struct apmhook sc_suspend; - struct apmhook sc_resume; - struct selinfo sc_rsel; - int sc_flags; - int event_count; - int event_ptr; - struct apm_event_info event_list[APM_NEVENTS]; - u_char event_filter[APM_NPMEV]; -}; #define SCFLAG_ONORMAL 0x0000001 #define SCFLAG_OCTL 0x0000002 #define SCFLAG_OPEN (SCFLAG_ONORMAL|SCFLAG_OCTL) @@ -83,7 +66,6 @@ struct apm_softc { #define APMDEV_NORMAL 0 #define APMDEV_CTL 8 -static struct apm_softc apm_softc; static struct apmhook *hook[NAPM_HOOK]; /* XXX */ #define is_enabled(foo) ((foo) ? "enabled" : "disabled") @@ -278,7 +260,7 @@ apm_suspend_system(int state) * If your laptop can control the display via APM, please inform me. * HOSOKAWA, Tatsumi */ -static int +int apm_display(int newstate) { struct apm_softc *sc = &apm_softc; diff --git a/sys/i386/apm/apm.h b/sys/i386/apm/apm.h new file mode 100644 index 000000000000..242782f7faeb --- /dev/null +++ b/sys/i386/apm/apm.h @@ -0,0 +1,43 @@ +/* + * APM (Advanced Power Management) BIOS Device Driver + * + * Copyright (c) 1994 UKAI, Fumitoshi. + * Copyright (c) 1994-1995 by HOSOKAWA, Tatsumi + * Copyright (c) 1996 Nate Williams + * Copyright (c) 1997 Poul-Henning Kamp + * + * This software may be used, modified, copied, and distributed, in + * both source and binary form provided that the above copyright and + * these terms are retained. Under no circumstances is the author + * responsible for the proper functioning of this software, nor does + * the author assume any responsibility for damages incurred with its + * use. + * + * Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) + * + * $FreeBSD$ + */ + +#define APM_NEVENTS 16 +#define APM_NPMEV 13 + +/* static data */ +struct apm_softc { + int initialized, active, bios_busy; + int always_halt_cpu, slow_idle_cpu; + int disabled, disengaged; + int standby_countdown, suspend_countdown; + u_int minorversion, majorversion; + u_int intversion, connectmode; + u_int standbys, suspends; + struct bios_args bios; + struct apmhook sc_suspend; + struct apmhook sc_resume; + struct selinfo sc_rsel; + int sc_flags; + int event_count; + int event_ptr; + struct apm_event_info event_list[APM_NEVENTS]; + u_char event_filter[APM_NPMEV]; +}; + diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c index d6752b743f18..a0c5b95b5f3c 100644 --- a/sys/i386/bios/apm.c +++ b/sys/i386/bios/apm.c @@ -44,37 +44,20 @@ #include #include -static int apm_display __P((int newstate)); +#include + +/* Used by the apm_saver screen saver module */ +int apm_display __P((int newstate)); +struct apm_softc apm_softc; + static void apm_resume __P((void)); static int apm_bioscall(void); static int apm_check_function_supported __P((u_int version, u_int func)); static u_long apm_version; -#define APM_NEVENTS 16 -#define APM_NPMEV 13 - int apm_evindex; -/* static data */ -struct apm_softc { - int initialized, active, bios_busy; - int always_halt_cpu, slow_idle_cpu; - int disabled, disengaged; - int standby_countdown, suspend_countdown; - u_int minorversion, majorversion; - u_int intversion, connectmode; - u_int standbys, suspends; - struct bios_args bios; - struct apmhook sc_suspend; - struct apmhook sc_resume; - struct selinfo sc_rsel; - int sc_flags; - int event_count; - int event_ptr; - struct apm_event_info event_list[APM_NEVENTS]; - u_char event_filter[APM_NPMEV]; -}; #define SCFLAG_ONORMAL 0x0000001 #define SCFLAG_OCTL 0x0000002 #define SCFLAG_OPEN (SCFLAG_ONORMAL|SCFLAG_OCTL) @@ -83,7 +66,6 @@ struct apm_softc { #define APMDEV_NORMAL 0 #define APMDEV_CTL 8 -static struct apm_softc apm_softc; static struct apmhook *hook[NAPM_HOOK]; /* XXX */ #define is_enabled(foo) ((foo) ? "enabled" : "disabled") @@ -278,7 +260,7 @@ apm_suspend_system(int state) * If your laptop can control the display via APM, please inform me. * HOSOKAWA, Tatsumi */ -static int +int apm_display(int newstate) { struct apm_softc *sc = &apm_softc; diff --git a/sys/i386/bios/apm.h b/sys/i386/bios/apm.h new file mode 100644 index 000000000000..242782f7faeb --- /dev/null +++ b/sys/i386/bios/apm.h @@ -0,0 +1,43 @@ +/* + * APM (Advanced Power Management) BIOS Device Driver + * + * Copyright (c) 1994 UKAI, Fumitoshi. + * Copyright (c) 1994-1995 by HOSOKAWA, Tatsumi + * Copyright (c) 1996 Nate Williams + * Copyright (c) 1997 Poul-Henning Kamp + * + * This software may be used, modified, copied, and distributed, in + * both source and binary form provided that the above copyright and + * these terms are retained. Under no circumstances is the author + * responsible for the proper functioning of this software, nor does + * the author assume any responsibility for damages incurred with its + * use. + * + * Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) + * + * $FreeBSD$ + */ + +#define APM_NEVENTS 16 +#define APM_NPMEV 13 + +/* static data */ +struct apm_softc { + int initialized, active, bios_busy; + int always_halt_cpu, slow_idle_cpu; + int disabled, disengaged; + int standby_countdown, suspend_countdown; + u_int minorversion, majorversion; + u_int intversion, connectmode; + u_int standbys, suspends; + struct bios_args bios; + struct apmhook sc_suspend; + struct apmhook sc_resume; + struct selinfo sc_rsel; + int sc_flags; + int event_count; + int event_ptr; + struct apm_event_info event_list[APM_NEVENTS]; + u_char event_filter[APM_NPMEV]; +}; +