sync with sun3 version and libsa changes

This commit is contained in:
chuck 1995-10-12 22:48:20 +00:00
parent 89d4987e5d
commit 54606ca765
5 changed files with 13 additions and 9 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: SRT1.c,v 1.1.1.1 1995/07/25 23:12:21 chuck Exp $ */ /* $NetBSD: SRT1.c,v 1.2 1995/10/12 22:48:20 chuck Exp $ */
/* /*
* Copyright (c) 1995 Gordon W. Ross * Copyright (c) 1995 Gordon W. Ross
@ -37,6 +37,7 @@
extern int edata[], end[]; extern int edata[], end[];
extern volatile void abort(); extern volatile void abort();
extern void main();
char *_cmd_buf = (char *)0; char *_cmd_buf = (char *)0;
volatile void volatile void
@ -49,6 +50,7 @@ exit()
* This is called by SRT0.S * This is called by SRT0.S
* to do final prep for main * to do final prep for main
*/ */
void
_start() _start()
{ {
register int *p; register int *p;
@ -65,4 +67,5 @@ _start()
/* /*
* Boot programs in C++ ? Not likely! * Boot programs in C++ ? Not likely!
*/ */
void
__main() {} __main() {}

View File

@ -12,7 +12,6 @@ devopen(f, fname, file)
char **file; char **file;
{ {
struct devsw *dp; struct devsw *dp;
char *cp, *path, *devname;
int error; int error;
*file = (char*)fname; *file = (char*)fname;

View File

@ -1,4 +1,4 @@
/* $NetBSD: exec.c,v 1.1.1.1 1995/07/25 23:12:24 chuck Exp $ */ /* $NetBSD: exec.c,v 1.2 1995/10/12 22:48:23 chuck Exp $ */
/*- /*-
* Copyright (c) 1982, 1986, 1990, 1993 * Copyright (c) 1982, 1986, 1990, 1993
@ -43,6 +43,7 @@
extern int debug; extern int debug;
/*ARGSUSED*/ /*ARGSUSED*/
int
exec_mvme(file, loadaddr, boothowto) exec_mvme(file, loadaddr, boothowto)
char *file; char *file;
char *loadaddr; char *loadaddr;

View File

@ -1,4 +1,4 @@
/* $NetBSD: netif.c,v 1.1.1.1 1995/07/25 23:12:24 chuck Exp $ */ /* $NetBSD: netif.c,v 1.2 1995/10/12 22:48:24 chuck Exp $ */
/* /*
* Copyright (c) 1995 Gordon W. Ross * Copyright (c) 1995 Gordon W. Ross
@ -47,6 +47,7 @@
#include "config.h" #include "config.h"
static struct netif netif_prom; static struct netif netif_prom;
void machdep_common_ether __P((u_char *));
#ifdef NETIF_DEBUG #ifdef NETIF_DEBUG
int netif_debug; int netif_debug;
@ -70,7 +71,7 @@ netif_open(machdep_hint)
{ {
struct saioreq *si; struct saioreq *si;
struct iodesc *io; struct iodesc *io;
int fd, error; int error;
/* find a free socket */ /* find a free socket */
io = sockets; io = sockets;
@ -122,7 +123,7 @@ int
netif_put(desc, pkt, len) netif_put(desc, pkt, len)
struct iodesc *desc; struct iodesc *desc;
void *pkt; void *pkt;
int len; size_t len;
{ {
#ifdef NETIF_DEBUG #ifdef NETIF_DEBUG
@ -149,7 +150,7 @@ int
netif_get(desc, pkt, maxlen, timo) netif_get(desc, pkt, maxlen, timo)
struct iodesc *desc; struct iodesc *desc;
void *pkt; void *pkt;
int maxlen; size_t maxlen;
time_t timo; time_t timo;
{ {
struct saioreq *si; struct saioreq *si;

View File

@ -5,8 +5,8 @@ struct netif {
void *devdata; void *devdata;
}; };
int netif_get __P((struct iodesc *, void *, int, time_t)); ssize_t netif_get __P((struct iodesc *, void *, size_t, time_t));
int netif_put __P((struct iodesc *, void *, int)); ssize_t netif_put __P((struct iodesc *, void *, size_t));
int netif_open __P((void *)); int netif_open __P((void *));
int netif_close __P((int)); int netif_close __P((int));