From 054e0b73bcfbf0987cd54d33bec46697f82de9d4 Mon Sep 17 00:00:00 2001 From: mycroft Date: Fri, 24 Sep 1993 08:49:21 +0000 Subject: [PATCH] clock.c: Finish conversion. Make rtcput() work if VRT bit not set. Speed up time conversion in delay(). fd.c: Minor changes to autoconfig. Use dv_parent rather than storing another pointer to the fdc_softc in each fd_softc. Change disk label stuff for our kernel. icu.s: Make splx() and splnone() return previous cpl for now. isa.c: Minor autoconfig changes. isa.h: rtcin() is now nvram() and is declare in nvram.h. Make isaphysmem a caddr_t. pccons.c: XXXX: Maybe we should insist they open /dev/io now. timerreg.h: #define TIMER_NPORTS. wd.c: Delete unused wdnoreloc() and wddospart(), and use remaining two bits in unit number. struct disk --> struct wd_softc. struct board --> struct wdc_softc. Still needs much work. --- sys/arch/i386/isa/nvram.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/arch/i386/isa/nvram.h b/sys/arch/i386/isa/nvram.h index adbde396966c..9434cc115eaa 100644 --- a/sys/arch/i386/isa/nvram.h +++ b/sys/arch/i386/isa/nvram.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)rtc.h 7.1 (Berkeley) 5/12/91 - * $Id: nvram.h,v 1.1 1993/09/14 17:32:47 mycroft Exp $ + * $Id: nvram.h,v 1.2 1993/09/24 08:49:21 mycroft Exp $ */ /* * Mach Operating System @@ -125,8 +125,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NVRAM_VALID 0x0d /* register D address */ #define NVRAM_VALID_VRT 0x80 /* Valid RAM and time bit */ -#define NVRAM_NREG 0x0e /* number of RTC registers */ -#define NVRAM_NREGP 0x0a /* number of RTC registers to set time */ +#define CLOCK_NREG 0x0a /* number of RTC registers */ /* * These are generic CMOS locations, but we call then RTC anyway... @@ -153,4 +152,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #define CLOCK_CENTURY 0x32 /* current century - please increment in Dec99 */ -#define NVRAM_NPORTS 16 +#define CLOCK_NPORTS 16 + + +u_char nvram __P((u_char pos));