From 29627a3d7d000aefc2860e1042707614018a2b57 Mon Sep 17 00:00:00 2001 From: phk Date: Sun, 2 Oct 1994 17:31:29 +0000 Subject: apm_bios.h: removed the equiv-stuff. Not needed now that the kernel module works correctly. clock.h & reg.h: prototypes. --- sys/amd64/include/clock.h | 2 ++ sys/amd64/include/reg.h | 6 +++++- sys/i386/include/apm_bios.h | 11 +---------- sys/i386/include/clock.h | 2 ++ sys/i386/include/reg.h | 6 +++++- 5 files changed, 15 insertions(+), 12 deletions(-) (limited to 'sys') diff --git a/sys/amd64/include/clock.h b/sys/amd64/include/clock.h index b7420e4..63bfae9 100644 --- a/sys/amd64/include/clock.h +++ b/sys/amd64/include/clock.h @@ -7,6 +7,8 @@ #ifndef _MACHINE_CLOCK_H_ #define _MACHINE_CLOCK_H_ 1 +void inittodr(time_t base); + extern int pentium_mhz; #ifdef I586_CPU diff --git a/sys/amd64/include/reg.h b/sys/amd64/include/reg.h index 2a1f061..5690d43 100644 --- a/sys/amd64/include/reg.h +++ b/sys/amd64/include/reg.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)reg.h 5.5 (Berkeley) 1/18/91 - * $Id: reg.h,v 1.6 1994/01/03 07:55:34 davidg Exp $ + * $Id: reg.h,v 1.8 1994/05/25 08:56:42 rgrimes Exp $ */ #ifndef _MACHINE_REG_H_ @@ -103,4 +103,8 @@ struct fpreg { #endif }; +#ifdef KERNEL +int set_regs __P((struct proc *p, struct reg *regs)); +void setregs __P((struct proc *, u_long, u_long)); +#endif #endif /* _MACHINE_REG_H_ */ diff --git a/sys/i386/include/apm_bios.h b/sys/i386/include/apm_bios.h index fcaeeb3..e3afdc1 100644 --- a/sys/i386/include/apm_bios.h +++ b/sys/i386/include/apm_bios.h @@ -12,7 +12,7 @@ * * Aug, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id$ + * $Id: apm_bios.h,v 1.2 1994/10/01 05:13:36 davidg Exp $ */ #ifndef _MACHINE_APM_BIOS_H_ @@ -173,23 +173,14 @@ typedef struct apm_info { u_int ai_batt_life; /* Remaining battery life */ } *apm_info_t; -typedef struct apm_eqv_event { - u_int aee_event; /* Event ID */ - u_int aee_equiv; /* Equivalent event ID */ - u_int aee_resume; /* Equivalent event ID when system resumes */ -} *apm_eqv_event_t; #define APMIO_SUSPEND _IO('P', 1) #define APMIO_GETINFO _IOR('P', 2, struct apm_info) -#define APMIO_DEFEQV _IOW('P', 3, struct apm_eqv_event) -#define APMIO_FLUSHEQV _IO('P', 4) #define APMIO_ENABLE _IO('P', 5) #define APMIO_DISABLE _IO('P', 6) #define APMIO_HALTCPU _IO('P', 7) #define APMIO_NOTHALTCPU _IO('P', 8) -#define APM_MAX_EQUIV_EVENTS 16 - #endif /* !ASM && !INITIALIZER */ #endif /* _MACHINE_APM_BIOS_H_ */ diff --git a/sys/i386/include/clock.h b/sys/i386/include/clock.h index b7420e4..63bfae9 100644 --- a/sys/i386/include/clock.h +++ b/sys/i386/include/clock.h @@ -7,6 +7,8 @@ #ifndef _MACHINE_CLOCK_H_ #define _MACHINE_CLOCK_H_ 1 +void inittodr(time_t base); + extern int pentium_mhz; #ifdef I586_CPU diff --git a/sys/i386/include/reg.h b/sys/i386/include/reg.h index 2a1f061..5690d43 100644 --- a/sys/i386/include/reg.h +++ b/sys/i386/include/reg.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)reg.h 5.5 (Berkeley) 1/18/91 - * $Id: reg.h,v 1.6 1994/01/03 07:55:34 davidg Exp $ + * $Id: reg.h,v 1.8 1994/05/25 08:56:42 rgrimes Exp $ */ #ifndef _MACHINE_REG_H_ @@ -103,4 +103,8 @@ struct fpreg { #endif }; +#ifdef KERNEL +int set_regs __P((struct proc *p, struct reg *regs)); +void setregs __P((struct proc *, u_long, u_long)); +#endif #endif /* _MACHINE_REG_H_ */ -- cgit v1.1