summaryrefslogtreecommitdiff
path: root/sys/arch/mvme68k/stand/libsa
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/mvme68k/stand/libsa')
-rw-r--r--sys/arch/mvme68k/stand/libsa/Makefile2
-rw-r--r--sys/arch/mvme68k/stand/libsa/Makefile.inc2
-rw-r--r--sys/arch/mvme68k/stand/libsa/SRT0.S2
-rw-r--r--sys/arch/mvme68k/stand/libsa/SRT1.c2
-rw-r--r--sys/arch/mvme68k/stand/libsa/bug.c2
-rw-r--r--sys/arch/mvme68k/stand/libsa/clock.c107
-rw-r--r--sys/arch/mvme68k/stand/libsa/clock.h1
-rw-r--r--sys/arch/mvme68k/stand/libsa/clockreg.h2
-rw-r--r--sys/arch/mvme68k/stand/libsa/config.h2
-rw-r--r--sys/arch/mvme68k/stand/libsa/dev_disk.c2
-rw-r--r--sys/arch/mvme68k/stand/libsa/dev_disk.h1
-rw-r--r--sys/arch/mvme68k/stand/libsa/devopen.c1
-rw-r--r--sys/arch/mvme68k/stand/libsa/dvma.c1
-rw-r--r--sys/arch/mvme68k/stand/libsa/dvma.h1
-rw-r--r--sys/arch/mvme68k/stand/libsa/exec_sun.c2
-rw-r--r--sys/arch/mvme68k/stand/libsa/gets.c2
-rw-r--r--sys/arch/mvme68k/stand/libsa/netif_sun.c2
-rw-r--r--sys/arch/mvme68k/stand/libsa/panic.c1
-rw-r--r--sys/arch/mvme68k/stand/libsa/promboot.c2
-rw-r--r--sys/arch/mvme68k/stand/libsa/promboot.h1
-rw-r--r--sys/arch/mvme68k/stand/libsa/promcons.c2
-rw-r--r--sys/arch/mvme68k/stand/libsa/promdev.c2
-rw-r--r--sys/arch/mvme68k/stand/libsa/promdev.h1
23 files changed, 54 insertions, 89 deletions
diff --git a/sys/arch/mvme68k/stand/libsa/Makefile b/sys/arch/mvme68k/stand/libsa/Makefile
index aa66902cd5e..0b56069a653 100644
--- a/sys/arch/mvme68k/stand/libsa/Makefile
+++ b/sys/arch/mvme68k/stand/libsa/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.7 1995/12/26 17:46:28 deraadt Exp $
+# $OpenBSD: Makefile,v 1.8 1996/04/28 10:48:52 deraadt Exp $
LIB=sa
diff --git a/sys/arch/mvme68k/stand/libsa/Makefile.inc b/sys/arch/mvme68k/stand/libsa/Makefile.inc
index c402951fa76..acdd0379be9 100644
--- a/sys/arch/mvme68k/stand/libsa/Makefile.inc
+++ b/sys/arch/mvme68k/stand/libsa/Makefile.inc
@@ -1,3 +1,5 @@
+# $OpenBSD: Makefile.inc,v 1.2 1996/04/28 10:48:53 deraadt Exp $
+
LIB_SA_DIR=${S}/arch/${MACHINE}/stand/libsa
LIBSA_DIR!= cd ${LIB_SA_DIR}; \
diff --git a/sys/arch/mvme68k/stand/libsa/SRT0.S b/sys/arch/mvme68k/stand/libsa/SRT0.S
index 922c21a2bf7..a938029049d 100644
--- a/sys/arch/mvme68k/stand/libsa/SRT0.S
+++ b/sys/arch/mvme68k/stand/libsa/SRT0.S
@@ -1,4 +1,4 @@
-| $Id: SRT0.S,v 1.4 1995/11/17 22:05:43 deraadt Exp $
+| $OpenBSD: SRT0.S,v 1.5 1996/04/28 10:48:54 deraadt Exp $
| Copyright (c) 1995 Theo de Raadt
|
diff --git a/sys/arch/mvme68k/stand/libsa/SRT1.c b/sys/arch/mvme68k/stand/libsa/SRT1.c
index 7469db57cfb..d065cc6920a 100644
--- a/sys/arch/mvme68k/stand/libsa/SRT1.c
+++ b/sys/arch/mvme68k/stand/libsa/SRT1.c
@@ -1,4 +1,4 @@
-/* $Id: SRT1.c,v 1.2 1995/11/07 08:50:41 deraadt Exp $ */
+/* $OpenBSD: SRT1.c,v 1.3 1996/04/28 10:48:55 deraadt Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/mvme68k/stand/libsa/bug.c b/sys/arch/mvme68k/stand/libsa/bug.c
index e0ac46017bf..2dc7f537e60 100644
--- a/sys/arch/mvme68k/stand/libsa/bug.c
+++ b/sys/arch/mvme68k/stand/libsa/bug.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: bug.c,v 1.3 1996/04/28 10:48:56 deraadt Exp $ */
+
/*
* Copyright (c) 1995 Theo de Raadt
* All rights reserved.
diff --git a/sys/arch/mvme68k/stand/libsa/clock.c b/sys/arch/mvme68k/stand/libsa/clock.c
index c937a90085d..f56085c83ba 100644
--- a/sys/arch/mvme68k/stand/libsa/clock.c
+++ b/sys/arch/mvme68k/stand/libsa/clock.c
@@ -1,79 +1,30 @@
-/* $NetBSD: clock.c,v 1.1.1.1 1995/07/25 23:12:22 chuck Exp $ */
-
-/*
- * Copyright (c) 1992, 1993
- * The Regents of the University of California. All rights reserved.
- * Copyright (c) 1994 Gordon W. Ross
- * Copyright (c) 1993 Adam Glass
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Lawrence Berkeley Laboratory.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#)clock.c 8.1 (Berkeley) 6/11/93
- */
-
-/*
- * Clock driver.
- */
+/* $OpenBSD: clock.c,v 1.2 1996/04/28 10:48:57 deraadt Exp $ */
#include <sys/types.h>
-#include "clockreg.h"
-static struct clockreg *clockreg = (struct clockreg *) CLOCK_ADDR;
-int hz = 1; /* XXX ? */
+#include "clockreg.h"
+#include "config.h"
+#include "clock.h"
/*
* BCD to decimal and decimal to BCD.
*/
-#define FROMBCD(x) (((x) >> 4) * 10 + ((x) & 0xf))
-#define TOBCD(x) (((x) / 10 * 16) + ((x) % 10))
+#define FROMBCD(x) (((x) >> 4) * 10 + ((x) & 0xf))
+#define TOBCD(x) (((x) / 10 * 16) + ((x) % 10))
-#define SECDAY (24 * 60 * 60)
-#define SECYR (SECDAY * 365)
-#define LEAPYEAR(y) (((y) & 3) == 0)
+#define SECDAY (24 * 60 * 60)
+#define SECYR (SECDAY * 365)
+#define LEAPYEAR(y) (((y) & 3) == 0)
/*
* This code is defunct after 2068.
* Will Unix still be here then??
*/
const short dayyr[12] =
- { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 };
+{0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
-static u_long chiptotime(sec, min, hour, day, mon, year)
+static u_long
+chiptotime(sec, min, hour, day, mon, year)
register int sec, min, hour, day, mon, year;
{
register int days, yr;
@@ -84,7 +35,8 @@ static u_long chiptotime(sec, min, hour, day, mon, year)
day = FROMBCD(day);
mon = FROMBCD(mon);
year = FROMBCD(year) + YEAR0;
- if (year < 70) year = 70;
+ if (year < 70)
+ year = 70;
/* simple sanity checks */
if (year < 70 || mon < 1 || mon > 12 || day < 1 || day > 31)
@@ -99,30 +51,31 @@ static u_long chiptotime(sec, min, hour, day, mon, year)
return (days * SECDAY + hour * 3600 + min * 60 + sec);
}
-/*
- * Set up the system's time, given a `reasonable' time value.
- */
-time_t getsecs()
+time_t
+getsecs()
{
- register struct clockreg *cl = clockreg;
- int sec, min, hour, day, mon, year;
+ extern int cputyp;
+ register struct clockreg *cl;
+ int sec, min, hour, day, mon, year;
+
+ if (cputyp == CPU_147)
+ cl = (struct clockreg *) CLOCK_ADDR_147;
+ else
+ cl = (struct clockreg *) CLOCK_ADDR_16x;
- cl->cl_csr |= CLK_READ; /* enable read (stop time) */
+ cl->cl_csr |= CLK_READ; /* enable read (stop time) */
sec = cl->cl_sec;
min = cl->cl_min;
hour = cl->cl_hour;
day = cl->cl_mday;
mon = cl->cl_month;
year = cl->cl_year;
- cl->cl_csr &= ~CLK_READ; /* time wears on */
- return(chiptotime(sec, min, hour, day, mon, year));
+ cl->cl_csr &= ~CLK_READ;/* time wears on */
+ return (chiptotime(sec, min, hour, day, mon, year));
}
-/*
- * delay
- */
-
-int getticks()
+int
+getticks()
{
- return((int)getsecs());
+ return getsecs() * 100;
}
diff --git a/sys/arch/mvme68k/stand/libsa/clock.h b/sys/arch/mvme68k/stand/libsa/clock.h
index d61bc9b03b8..f9958f65e05 100644
--- a/sys/arch/mvme68k/stand/libsa/clock.h
+++ b/sys/arch/mvme68k/stand/libsa/clock.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: clock.h,v 1.2 1996/04/28 10:48:58 deraadt Exp $ */
extern int hz;
diff --git a/sys/arch/mvme68k/stand/libsa/clockreg.h b/sys/arch/mvme68k/stand/libsa/clockreg.h
index 0d3824186c7..86552700cf5 100644
--- a/sys/arch/mvme68k/stand/libsa/clockreg.h
+++ b/sys/arch/mvme68k/stand/libsa/clockreg.h
@@ -1,4 +1,4 @@
-/* $Id: clockreg.h,v 1.2 1995/11/07 08:50:44 deraadt Exp $ */
+/* $OpenBSD: clockreg.h,v 1.3 1996/04/28 10:48:58 deraadt Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/arch/mvme68k/stand/libsa/config.h b/sys/arch/mvme68k/stand/libsa/config.h
index d416250b56d..b29745edae3 100644
--- a/sys/arch/mvme68k/stand/libsa/config.h
+++ b/sys/arch/mvme68k/stand/libsa/config.h
@@ -1,4 +1,4 @@
-/* $Id: config.h,v 1.2 1995/11/07 08:50:45 deraadt Exp $ */
+/* $OpenBSD: config.h,v 1.3 1996/04/28 10:48:59 deraadt Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/mvme68k/stand/libsa/dev_disk.c b/sys/arch/mvme68k/stand/libsa/dev_disk.c
index fcb7a1a15b1..c204ebd094c 100644
--- a/sys/arch/mvme68k/stand/libsa/dev_disk.c
+++ b/sys/arch/mvme68k/stand/libsa/dev_disk.c
@@ -1,4 +1,4 @@
-/* $Id: dev_disk.c,v 1.2 1995/11/07 08:50:46 deraadt Exp $ */
+/* $OpenBSD: dev_disk.c,v 1.3 1996/04/28 10:49:00 deraadt Exp $ */
/*
* Copyright (c) 1993 Paul Kranenburg
diff --git a/sys/arch/mvme68k/stand/libsa/dev_disk.h b/sys/arch/mvme68k/stand/libsa/dev_disk.h
index 9f05f74bd82..442d400a78b 100644
--- a/sys/arch/mvme68k/stand/libsa/dev_disk.h
+++ b/sys/arch/mvme68k/stand/libsa/dev_disk.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: dev_disk.h,v 1.2 1996/04/28 10:49:01 deraadt Exp $ */
int disk_open __P((struct open_file *, ...));
int disk_close __P((struct open_file *));
diff --git a/sys/arch/mvme68k/stand/libsa/devopen.c b/sys/arch/mvme68k/stand/libsa/devopen.c
index 92c083983cb..9fe1f4e6dd6 100644
--- a/sys/arch/mvme68k/stand/libsa/devopen.c
+++ b/sys/arch/mvme68k/stand/libsa/devopen.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: devopen.c,v 1.3 1996/04/28 10:49:02 deraadt Exp $ */
#include <sys/param.h>
#include <stand.h>
diff --git a/sys/arch/mvme68k/stand/libsa/dvma.c b/sys/arch/mvme68k/stand/libsa/dvma.c
index 11526106c2a..bc7965e14d5 100644
--- a/sys/arch/mvme68k/stand/libsa/dvma.c
+++ b/sys/arch/mvme68k/stand/libsa/dvma.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: dvma.c,v 1.2 1996/04/28 10:49:03 deraadt Exp $ */
/*
* The easiest way to deal with the need for DVMA mappings is
diff --git a/sys/arch/mvme68k/stand/libsa/dvma.h b/sys/arch/mvme68k/stand/libsa/dvma.h
index 2b8be37cbe0..b99b9702f53 100644
--- a/sys/arch/mvme68k/stand/libsa/dvma.h
+++ b/sys/arch/mvme68k/stand/libsa/dvma.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: dvma.h,v 1.2 1996/04/28 10:49:03 deraadt Exp $ */
char * dvma_mapin(char *pkt, int len);
void dvma_mapout(char *dmabuf, int len);
diff --git a/sys/arch/mvme68k/stand/libsa/exec_sun.c b/sys/arch/mvme68k/stand/libsa/exec_sun.c
index 887330e6715..424406f20df 100644
--- a/sys/arch/mvme68k/stand/libsa/exec_sun.c
+++ b/sys/arch/mvme68k/stand/libsa/exec_sun.c
@@ -1,4 +1,4 @@
-/* $Id: exec_sun.c,v 1.2 1995/11/07 08:50:47 deraadt Exp $ */
+/* $OpenBSD: exec_sun.c,v 1.3 1996/04/28 10:49:04 deraadt Exp $ */
/*-
* Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/mvme68k/stand/libsa/gets.c b/sys/arch/mvme68k/stand/libsa/gets.c
index 455cbcddf85..b1e32ce2602 100644
--- a/sys/arch/mvme68k/stand/libsa/gets.c
+++ b/sys/arch/mvme68k/stand/libsa/gets.c
@@ -1,4 +1,4 @@
-/* $Id: gets.c,v 1.2 1995/11/07 08:50:48 deraadt Exp $ */
+/* $OpenBSD: gets.c,v 1.3 1996/04/28 10:49:05 deraadt Exp $ */
/*-
* Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/mvme68k/stand/libsa/netif_sun.c b/sys/arch/mvme68k/stand/libsa/netif_sun.c
index 28d2b742c26..a6887911c1a 100644
--- a/sys/arch/mvme68k/stand/libsa/netif_sun.c
+++ b/sys/arch/mvme68k/stand/libsa/netif_sun.c
@@ -1,4 +1,4 @@
-/* $Id: netif_sun.c,v 1.2 1995/11/07 08:50:49 deraadt Exp $ */
+/* $OpenBSD: netif_sun.c,v 1.3 1996/04/28 10:49:06 deraadt Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross
diff --git a/sys/arch/mvme68k/stand/libsa/panic.c b/sys/arch/mvme68k/stand/libsa/panic.c
index f7c83a6d8e7..6c035aabe11 100644
--- a/sys/arch/mvme68k/stand/libsa/panic.c
+++ b/sys/arch/mvme68k/stand/libsa/panic.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: panic.c,v 1.3 1996/04/28 10:49:07 deraadt Exp $ */
#include <stdarg.h>
#include "stand.h"
diff --git a/sys/arch/mvme68k/stand/libsa/promboot.c b/sys/arch/mvme68k/stand/libsa/promboot.c
index 2cc28a5b0cf..daff57fb861 100644
--- a/sys/arch/mvme68k/stand/libsa/promboot.c
+++ b/sys/arch/mvme68k/stand/libsa/promboot.c
@@ -1,4 +1,4 @@
-/* $Id: promboot.c,v 1.2 1995/11/07 08:50:50 deraadt Exp $ */
+/* $OpenBSD: promboot.c,v 1.3 1996/04/28 10:49:08 deraadt Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/mvme68k/stand/libsa/promboot.h b/sys/arch/mvme68k/stand/libsa/promboot.h
index 86b5aace21c..e96c103b773 100644
--- a/sys/arch/mvme68k/stand/libsa/promboot.h
+++ b/sys/arch/mvme68k/stand/libsa/promboot.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: promboot.h,v 1.2 1996/04/28 10:49:09 deraadt Exp $ */
extern char prom_bootdev[];
extern char prom_bootfile[];
diff --git a/sys/arch/mvme68k/stand/libsa/promcons.c b/sys/arch/mvme68k/stand/libsa/promcons.c
index 49e790f984d..01ae60ce576 100644
--- a/sys/arch/mvme68k/stand/libsa/promcons.c
+++ b/sys/arch/mvme68k/stand/libsa/promcons.c
@@ -1,4 +1,4 @@
-/* $Id: promcons.c,v 1.2 1995/11/07 08:50:51 deraadt Exp $ */
+/* $OpenBSD: promcons.c,v 1.3 1996/04/28 10:49:11 deraadt Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/mvme68k/stand/libsa/promdev.c b/sys/arch/mvme68k/stand/libsa/promdev.c
index 82c1ce50243..6362fcdcf01 100644
--- a/sys/arch/mvme68k/stand/libsa/promdev.c
+++ b/sys/arch/mvme68k/stand/libsa/promdev.c
@@ -1,4 +1,4 @@
-/* $Id: promdev.c,v 1.2 1995/11/07 08:50:52 deraadt Exp $ */
+/* $OpenBSD: promdev.c,v 1.3 1996/04/28 10:49:13 deraadt Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross
diff --git a/sys/arch/mvme68k/stand/libsa/promdev.h b/sys/arch/mvme68k/stand/libsa/promdev.h
index e3ae5ba2d7c..2a5bd89bffe 100644
--- a/sys/arch/mvme68k/stand/libsa/promdev.h
+++ b/sys/arch/mvme68k/stand/libsa/promdev.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: promdev.h,v 1.2 1996/04/28 10:49:14 deraadt Exp $ */
int prom_iopen(struct saioreq **sipp);
void prom_iclose(struct saioreq *sip);
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 19:42:49 +0000