mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-16 10:20:30 +00:00
Made all header files idempotent and moved incorrect common data from
headers into a related source file. (This is the only change to locore.s). Also fixed pg() to be properly declared and use stdargs.
This commit is contained in:
Garrett Wollman
parent
cafa6f4851
commit
e766e4d9f1
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=718
@ -23,7 +23,7 @@
|
||||
* any improvements or extensions that they make and grant Carnegie the
|
||||
* rights to redistribute these changes.
|
||||
*
|
||||
* $Id$
|
||||
* $Id: db_interface.c,v 1.2 1993/10/16 14:14:55 rgrimes Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -41,6 +41,8 @@
|
||||
#include <sys/systm.h> /* just for boothowto --eichin */
|
||||
int db_active = 0;
|
||||
|
||||
db_regs_t ddb_regs;
|
||||
|
||||
/*
|
||||
* Received keyboard interrupt sequence.
|
||||
*/
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)locore.s 7.3 (Berkeley) 5/13/91
|
||||
* $Id: locore.s,v 1.7 1993/10/13 07:11:11 rgrimes Exp $
|
||||
* $Id: locore.s,v 1.8 1993/10/15 10:34:19 rgrimes Exp $
|
||||
*/
|
||||
|
||||
|
||||
@ -164,10 +164,21 @@ _atdevphys: .long 0 /* location of device mapping ptes (phys) */
|
||||
_IdlePTD: .long 0
|
||||
_KPTphys: .long 0
|
||||
|
||||
.globl _curpcb, _whichqs
|
||||
_curpcb: .long 0 /* pointer to curproc's PCB area */
|
||||
_whichqs: .long 0 /* which run queues have data */
|
||||
|
||||
.globl _cyloffset,_proc0paddr
|
||||
_cyloffset: .long 0
|
||||
_proc0paddr: .long 0
|
||||
|
||||
/* Stuff for network ASTs */
|
||||
.globl _softem,_netisr,_astpending,_want_resched
|
||||
_softem: .long 0 /* WFJ only knows... */
|
||||
_netisr: .long 0 /* set with bits for which queue to service */
|
||||
_astpending: .long 0 /* tells us an AST needs to be taken */
|
||||
_want_resched: .long 0 /* we need to re-schedule */
|
||||
|
||||
.space 512
|
||||
tmpstk:
|
||||
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)locore.s 7.3 (Berkeley) 5/13/91
|
||||
* $Id: locore.s,v 1.7 1993/10/13 07:11:11 rgrimes Exp $
|
||||
* $Id: locore.s,v 1.8 1993/10/15 10:34:19 rgrimes Exp $
|
||||
*/
|
||||
|
||||
|
||||
@ -164,10 +164,21 @@ _atdevphys: .long 0 /* location of device mapping ptes (phys) */
|
||||
_IdlePTD: .long 0
|
||||
_KPTphys: .long 0
|
||||
|
||||
.globl _curpcb, _whichqs
|
||||
_curpcb: .long 0 /* pointer to curproc's PCB area */
|
||||
_whichqs: .long 0 /* which run queues have data */
|
||||
|
||||
.globl _cyloffset,_proc0paddr
|
||||
_cyloffset: .long 0
|
||||
_proc0paddr: .long 0
|
||||
|
||||
/* Stuff for network ASTs */
|
||||
.globl _softem,_netisr,_astpending,_want_resched
|
||||
_softem: .long 0 /* WFJ only knows... */
|
||||
_netisr: .long 0 /* set with bits for which queue to service */
|
||||
_astpending: .long 0 /* tells us an AST needs to be taken */
|
||||
_want_resched: .long 0 /* we need to re-schedule */
|
||||
|
||||
.space 512
|
||||
tmpstk:
|
||||
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)cons.c 7.2 (Berkeley) 5/9/91
|
||||
* $Id: cons.c,v 1.3 1993/10/16 14:14:49 rgrimes Exp $
|
||||
* $Id: cons.c,v 1.4 1993/10/18 14:21:48 davidg Exp $
|
||||
*/
|
||||
|
||||
|
||||
@ -49,8 +49,9 @@
|
||||
#include "sys/tty.h"
|
||||
#include "sys/file.h"
|
||||
#include "sys/conf.h"
|
||||
#include "machine/stdarg.h"
|
||||
|
||||
#include "cons.h"
|
||||
#include "machine/cons.h"
|
||||
|
||||
/* XXX - all this could be autoconfig()ed */
|
||||
int pccnprobe(), pccninit(), pccngetc(), pccnputc();
|
||||
@ -197,10 +198,12 @@ cnputc(c)
|
||||
}
|
||||
}
|
||||
|
||||
pg(p,q,r,s,t,u,v,w,x,y,z) char *p; {
|
||||
printf(p,q,r,s,t,u,v,w,x,y,z);
|
||||
printf("\n>");
|
||||
return(cngetc());
|
||||
int
|
||||
pg(const char *p, ...) {
|
||||
va_list args;
|
||||
va_start(args, p);
|
||||
printf("%r\n>", p, args);
|
||||
return(cngetc());
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -36,9 +36,11 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)cons.h 7.2 (Berkeley) 5/9/91
|
||||
* $Id$
|
||||
* $Id: cons.h,v 1.2 1993/10/16 14:14:51 rgrimes Exp $
|
||||
*/
|
||||
|
||||
#ifndef _MACHINE_CONS_H_
|
||||
#define _MACHINE_CONS_H_ 1
|
||||
|
||||
struct consdev {
|
||||
int (*cn_probe)(); /* probe hardware and fill in consdev info */
|
||||
@ -63,4 +65,8 @@ struct consdev {
|
||||
extern struct consdev constab[];
|
||||
extern struct consdev *cn_tab;
|
||||
extern struct tty *cn_tty;
|
||||
#endif
|
||||
|
||||
int pg(const char *, ...);
|
||||
|
||||
#endif /* KERNEL */
|
||||
#endif /* _MACHINE_CONS_H_ */
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* any improvements or extensions that they make and grant Carnegie the
|
||||
* rights to redistribute these changes.
|
||||
*
|
||||
* $Id$
|
||||
* $Id: db_interface.c,v 1.2 1993/10/16 14:14:55 rgrimes Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -41,6 +41,8 @@
|
||||
#include <sys/systm.h> /* just for boothowto --eichin */
|
||||
int db_active = 0;
|
||||
|
||||
db_regs_t ddb_regs;
|
||||
|
||||
/*
|
||||
* Received keyboard interrupt sequence.
|
||||
*/
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)locore.s 7.3 (Berkeley) 5/13/91
|
||||
* $Id: locore.s,v 1.7 1993/10/13 07:11:11 rgrimes Exp $
|
||||
* $Id: locore.s,v 1.8 1993/10/15 10:34:19 rgrimes Exp $
|
||||
*/
|
||||
|
||||
|
||||
@ -164,10 +164,21 @@ _atdevphys: .long 0 /* location of device mapping ptes (phys) */
|
||||
_IdlePTD: .long 0
|
||||
_KPTphys: .long 0
|
||||
|
||||
.globl _curpcb, _whichqs
|
||||
_curpcb: .long 0 /* pointer to curproc's PCB area */
|
||||
_whichqs: .long 0 /* which run queues have data */
|
||||
|
||||
.globl _cyloffset,_proc0paddr
|
||||
_cyloffset: .long 0
|
||||
_proc0paddr: .long 0
|
||||
|
||||
/* Stuff for network ASTs */
|
||||
.globl _softem,_netisr,_astpending,_want_resched
|
||||
_softem: .long 0 /* WFJ only knows... */
|
||||
_netisr: .long 0 /* set with bits for which queue to service */
|
||||
_astpending: .long 0 /* tells us an AST needs to be taken */
|
||||
_want_resched: .long 0 /* we need to re-schedule */
|
||||
|
||||
.space 512
|
||||
tmpstk:
|
||||
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)cons.c 7.2 (Berkeley) 5/9/91
|
||||
* $Id: cons.c,v 1.3 1993/10/16 14:14:49 rgrimes Exp $
|
||||
* $Id: cons.c,v 1.4 1993/10/18 14:21:48 davidg Exp $
|
||||
*/
|
||||
|
||||
|
||||
@ -49,8 +49,9 @@
|
||||
#include "sys/tty.h"
|
||||
#include "sys/file.h"
|
||||
#include "sys/conf.h"
|
||||
#include "machine/stdarg.h"
|
||||
|
||||
#include "cons.h"
|
||||
#include "machine/cons.h"
|
||||
|
||||
/* XXX - all this could be autoconfig()ed */
|
||||
int pccnprobe(), pccninit(), pccngetc(), pccnputc();
|
||||
@ -197,10 +198,12 @@ cnputc(c)
|
||||
}
|
||||
}
|
||||
|
||||
pg(p,q,r,s,t,u,v,w,x,y,z) char *p; {
|
||||
printf(p,q,r,s,t,u,v,w,x,y,z);
|
||||
printf("\n>");
|
||||
return(cngetc());
|
||||
int
|
||||
pg(const char *p, ...) {
|
||||
va_list args;
|
||||
va_start(args, p);
|
||||
printf("%r\n>", p, args);
|
||||
return(cngetc());
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -36,9 +36,11 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)cons.h 7.2 (Berkeley) 5/9/91
|
||||
* $Id$
|
||||
* $Id: cons.h,v 1.2 1993/10/16 14:14:51 rgrimes Exp $
|
||||
*/
|
||||
|
||||
#ifndef _MACHINE_CONS_H_
|
||||
#define _MACHINE_CONS_H_ 1
|
||||
|
||||
struct consdev {
|
||||
int (*cn_probe)(); /* probe hardware and fill in consdev info */
|
||||
@ -63,4 +65,8 @@ struct consdev {
|
||||
extern struct consdev constab[];
|
||||
extern struct consdev *cn_tab;
|
||||
extern struct tty *cn_tty;
|
||||
#endif
|
||||
|
||||
int pg(const char *, ...);
|
||||
|
||||
#endif /* KERNEL */
|
||||
#endif /* _MACHINE_CONS_H_ */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user