Subject: kernel 'config', autoconfig,  documentation changes (#89, 1 of 12)
Index:	sys,doc,etc,pdpif,.../many 2.11BSD

Description:
	(Paul, Terry - you can ignore these or file them, whatever)

	This is part 1 of 12.  Updates #89 thru #100 are parts 1 thru 12
	respectively.
	
	If you have tired of reading the notes in the "Repeat-By:" section 
	please skip to the "Fix:" section for notes and instructions about 
	this patch file (list of files updated, etc).

	This all got started when the distribution root filesystem became
	too full due to the multiple copies of /unix (raunix, xpunix, rmunix,
	etc).  That problem combined with a week of free time over the holidays
	produced this set of updates.  Enjoy.

Repeat-By:

	This section is repeated in each patch file.  Specific directions
	for the individual patches are included in the "Fix:" section.

	Several problem areas are addressed by this series of updates.

	1) The kernel configuration problems are best noticed
	   by maintaining kernels for a variety of systems and forgetting
	   to copy 'localopts.h' to ../h before compiling.  This at best
	   would cause compile time problems, at worst resulting in a kernel
	   that was unusable.  MANY of the changes described below are
	   aimed at the reduction of 'localopts.h' to almost nothing.

	2) There were several kernel config options which were either known not
	   to work, have not been used within recent memory or were obsolete.
	   UCB_FRCSWAP (to force a swap on program expansion) is a good
	   example of an option which has been removed.
	   
	   The list of things which have been options at one time or another
	   in the system's life has been removed.  Many of them dated back
	   to V7, the modules which they affected are not even present in
	   the system any longer.

	   Two options have been moved to the end of the 'config' script.
	   Neither is known to work (CGL_RTP and FPSIM) and are always left
	   NO.

	3) A couple of kernel config options should not have been options so
	   that the kernel could automatically adapt to whatever machine it
	   found itself running on.  The UNIBUS_MAP and Q22 options are good 
	   examples of this.  Usage of the UNIBUS_MAP option was inconsistent,
	   some of the drivers in the system "#ifdef"d references to the
	   Unibus map allocation routine while other drivers did not.  Since
	   the system knows whether a Unibus Map is present or not the
	   correct behaviour is to either test 'ubmap' or simply call 'mapalloc'
	   (which will do the test for you).  In the case of GENERIC or Unibus
	   based kernels there is _no_ penalty (since UNIBUS_MAP was defined),
	   in the case of Qbus systems there is about 900 bytes of code that
	   simply never gets used (and 40 bytes or so of D space).

	   The Q22 defined was used incorrectly in a couple of drivers to
	   either distinquish between Digital and 3rd party controllers (DH-11
	   vs Emulex CS02) or to indicate whether the system was Qbus or
	   Unibus based.  The references to Q22 in dh.c were changed to
	   CS02 (a new option in the device selection area of the config
	   files), deleted, or replaced with tests of 'ubmap'.

	   UCB_RUSAGE has been made standard because several applications
	   (iostat, vmstat, etc) use the statistics and because the
	   getrusage(2) call uses them.  UCB_METER has been left as an
	   option and will be placed in the Makefile as "-DUCB_METER" in
	   the DEFS line.  References to UCB_RUSAGE have been removed from the
	   kernel.

	   NONFP has been removed.  Hardware floating point is mandatory
	   for two reasons:  the simulator doesn't work, and FP is very
	   inexpensive (or standard on KDJ-11 systems).

	   VIRUS_VFORK has been removed.  Nothing depended on it in the
	   applications and VIRUS_VFORK has never been anything but YES.  

	4) NSWAP has gone away.  It was too easy to either forget to change
	   it or to pick a wrong number (by guessing).  Borrowing yet another
	   concept from 4.3BSD the system now determines the amount of
	   swap space dynamically after booting.  This is done by calling
	   a partition size routine which each disc driver provides.  The
	   bdevsw[] table (in pdp/conf.c) has been expanded to include 
	   a "d_psize" member for each device.

	   NOTE:  this change requires that 'a' and 'b' be the root and
		  swap partitions.  All drivers except the RK06/7 (hk.c) 
		  and RM02/3 (xp.c) observed this rule.  Changes were made 
		  to the RK06/7 and RM02/3 partition tables (and /etc/disktab).
		  The previous practice of using the 'e' or 'f' partitions
		  to overlap the old 'a'+'b' partitions has gone away.  THE
		  new 'a' partition is the same size as the 'e' or 'f'
		  partitions used to be, so there is ROOT FILESYSTEM
		  compatibility (the system will still boot).   Best
		  to back the system up (if using RK07 or RM02 drives)
		  before applying these changes.

	5) SWAPLO has gone away.  It has never been anything but 0 within
	   recent memory (and would have resulted in filesystem corruption
	   if an inappropriate value were chosen).  The only device which 
	   possibly would need to use it (the RL02) is required to be used 
	   in pairs.
	   
	   Deleting SWAPLO removed a number of long word adds scattered around
	   the kernel.  One sector (.5kb) of swap space is "lost"/discarded.
	   The previous practice was to decrement 'swplo' in compensation
	   for entering 1 as the first swap block.  Since 'swplo' has
	   gone away, the number of blocks available ('nswap') is simply 
	   decremented by 1 and the swapmap initialized starting at block 1.

	   This change affects a couple of the applications ('ps', 'pstat',
	   etc.) which were looking for 'swplo'.  These programs have been
	   updated.

	6) 'autoconfig' and programmable vector devices (MSCP, TMSCP, etc)
	    have never gotten along very well.  The drivers had
	    vectors hardcoded (either via #define statments or code
	    which allocated vectors from a base vector) into them.  Changing
	    /etc/dtab would have no effect (at best) or the system would
	    crash (at worst) because 'autoconfig' would allocate/initialize 
	    a vector different than that assumed by the driver. 

	    Networking drivers which support programmable vectors (DEQNA
	    for example) previously had their vectors hardcoded into
	    them AND into pdp/net_scb.s.  Changing one but forgetting to
	    change the other was one way to generate an inoperable system!

	    This has been fixed _at last_!  There are two methods used.
	    One for kernel devices configured by 'autoconfig' and a second 
	    used by the both 'autoconfig' and the networking drivers (which 
	    are not handled by 'autoconfig' because the networking is already 
	    running by the time 'init' starts 'autoconfig').

	    If a driver defines a routine "xxxVec" (where xxx is 'ra',
	    'tms', etc) then 'autoconfig' will call the driver with
	    two parameters:  the controller number and the vector from
	    /etc/dtab.  If the driver lacks a 'xxxVec' routine then
	    'autoconfig' functions as it always has.

	    The second method is used when dynamic allocation of vectors
	    is desired for programmable vector devices.  The networking
	    drivers (DEQNA, DEQTA, etc) use this method.  In the kernel
	    there is a location ('lastiv') which contains the next vector
	    to assign.  Usage is to decrement 'lastiv' by 4 and use the
	    new value.  If multiple vectors are needed then a multiple of
	    4 is subtracted ('autoconfig' counts how many "handlers" it
	    needs for a device).  To make use of this feature (second or third
	    MSCP controllers for example) put a 0 (zero) in the vector
	    field in /etc/dtab.

		NOTE:  It is an error to specify a 0 vector (dynamic
		       allocation) and not have a 'xxxVec' routine for
		       'autoconfig' to call.  'autoconfig' will print
		       an error and leave the device unattached.

		       If 'xxxVec' is used by 'autoconfig' the driver
		       should return success (0) or failure (non-0).
		       'autoconfig' will print "vectorset" if a programmable
		       vector is successfully installed.

	    Networking drivers access 'lastiv' via the "mfkd" and "mtkd"
	    (move from kernel data, move to kernel data) routines.  The
	    hardwired vector (400 for the DEQNA) has been removed from
	    scb.s.,

		NOTE:  the handlers for networking devices are still
		       present in net_scb.s, the drivers initialize
		       the allocated vector by means of a small (1 instruction)
		       assembly language routine (see the changes to 
		       pdpif/if_qe.c).  This 'asm' routine is needed
		       for the driver to access the handle name which does
		       not have a leading (underscore) prepended to it.

	7)  The logic in the DHV-11 driver to attempt forcing a fuller silo
	    (by turning off and on the receive interrupt enable) was removed
	    since it did not work (for very long).  After 2 silo overruns
	    or 90% full silos the logic would disable itself by decrementing
	    the number of delay ticks to 0.  The only real fix for the DHV-11's
	    silo handling problem is to replace the DHV-11 with a DHQ-11.

	8)  The kernel option UCB_NET has been renamed to INET (as 4.3BSD
	    does).  The TCP_COMPAT_42 option has been made "standard" by
	    removing the ifdef in netinet/tcp_var.h.

	9)  The MAXMEM option has been moved to param.h.  It is (almost)
	    never changed and was yet one more thing to accidentally get
	    wrong when configuring a kernel.  Thought was given to removing
	    MAXMEM entirely but it was put in with the other "never changed
	    without a great deal of thought" parameters in param.h

	10) The setup and installation documents have been revised to reflect
	    the new kernel configuration process and to remove references
	    to 'xpunix', 'raunix', etc (not needed now that the generic
	    kernel adapts automatically).

	11) The drivers in the OTHERS directory have been lightly edited
	    to change UCB_NET to INET, remove UNIBUS_MAP usage, etc.  No
	    attempt has been made to port or fix the drivers.

	12) Last, but by no means least, the 'config' script (/sys/conf/config)
	    and the conf/Make.{nsunix,unix,sunix} files have been totally 
	    redone.  Borrowing still another idea from 4.3BSD (not a whole
	    lot left to 'steal' ;-)) the 'config' script now places a line:

		DEFS="-DKERNEL -Doption1 -Doption2 ..."

	    at the front of the main Makefile.  The CFLAGS statement has
	    been modified to include ${DEFS}, thus the configuration options
	    are passed thru to the secondary makefiles Make.pdp, Make.pdpuba,
	    etc. 

	    The GENERIC config file has been redone.  You should make note
	    of your present device complement and then re-config your kernels
	    by making a copy of GENERIC and editing it.

		    NOTE:  The PDP11 line is now only used to select the
			   appropriate inlining method for the 'spl'
			   instruction.  You may safely set PDP11 to GENERIC,
			   no references to PDP11 are now made anywhere in the
			   kernel.

			   You should only set the IDENT line to GENERIC
			   if you either know what you are doing, or if
			   you really are making a distribution kernel.

			   Setting IDENT to GENERIC causes the kernel at
			   boot time to:

			   a) override "swapdev".
			      A GENERIC kernel automatically assigns the 'b'
			      partition of the booted device to be "swapdev"

			   b) override "rootdev".
			      A GENERIC kernel automatically assigns the 'a'
			      partition of the booted device to be "rootdev"
			      and "pipedev".

		The /GENALLSYS script is obsolete and has been removed
		from the system.  For a GENERIC system /unix will now
		adapt to the bootstrapped drive and automatically determine
		the amount of swap space.

	    The only change made to the secondary makefiles was to add
	    a new ethernet driver (not yet working) to Make.net.  The DEQTA
	    driver (if_qt.c) is still being debugged, a future update will
	    be forthcoming.  Since if_qt.c does not exist, the "patch" is
	    the whole file (the same applies to if_qtreg.h).  You will need
	    to create two 0 length files in pdpif ("touch /sys/pdpif/if_qt.c
	    /sys/pdpif/if_qtreg.h") before applying the 'pdpif' update kit.
	    A reminder will be placed in the part containing that patch.

		NOTE:  localopts.h has exactly _TWO_ (2) definitions in it
		       now:  EXTERNALITIMES (mapped out time values from the
		       inodes) and LINEHZ.

		       The default for EXTERNALITIMES is now YES.  It is
		       recommended that this not be changed, if it is changed
		       then applications which look at the kernel incore
		       inode table (pstat for example) will need to be
		       recompiled.

		       Unless either of these two defines change you never
		       need to worry about copying localopts.h again!

	NOTE:
		The network interface update (part #) needs to have 2
		zero length files created, you may wish to do this now:

			rm -f /sys/pdpif/if_qt.c /sys/pdpif/if_qtreg.h
			touch /sys/pdpif/if_qt.c /sys/pdpif/if_qtreg.h

Fix:
	The following files are modified:

/usr/include/OLD/psout.h
/usr/src/bin/ps.c
/usr/src/etc/fstat.c
/usr/src/etc/mkfs.c
/usr/src/etc/pstat.c
/usr/src/ucb/w.c
/usr/src/games/hack/errlst.c
/usr/src/new/crash/crash.c
/usr/src/new/crash/dispnet.c
/usr/src/new/crash/if.c
/usr/src/new/crash/inet.c
/usr/src/new/crash/route.c

	The 'crash' program was updated only for completeness, the program
	has not run (or run correctly) since 2.10.1BSD (if not before that).

	'w', 'ps', 'fstat', and 'pstat' had references to 'swplo' removed from
	them since "swplo" no longer exists in the kernel.  Also, 'ps' was
	modified to use 2 character terminal names.  Thus references to
	the "console" are now abbreviated (in 4.3BSD style) to 'co' rather
	than having to spell out "console".

	'mkfs' was modified to "#undef EXTERNALITIMES" to make the program
	independent of the kernel.  'mkfs' always needs the full inode
	structure (but it does not read the kernel's inode table).

*** /usr/include/OLD/psout.h.old	Sun May 27 21:50:13 1990
--- /usr/include/OLD/psout.h	Sun Jan  3 02:02:06 1993
***************
*** 3,15 ****
   * All rights reserved.  The Berkeley software License Agreement
   * specifies the terms and conditions for redistribution.
   *
!  *	@(#)psout.h	5.1 (Berkeley) 12/13/86
   */
  
  /*
!  * psout: structure output by 'ps -r'.
!  * Most fields are copies of the proc (p_...) or user (u_...)
!  * structures for the given process, see <sys/user.h> & <sys/proc.h>
   */
  
  #ifndef makedev
--- 3,14 ----
   * All rights reserved.  The Berkeley software License Agreement
   * specifies the terms and conditions for redistribution.
   *
!  *	@(#)psout.h	5.2 (2.11BSD GTE) 1/3/93
   */
  
  /*
!  * psout: structure output by 'ps -U'.
!  * Mostly the pre-processed /dev directory.
   */
  
  #ifndef makedev
***************
*** 20,26 ****
  	dev_t	o_ttyd;		/* u_ttyd */
  	int	o_flag;		/* p_flag */
  	short	o_pid;		/* p_pid */
! 	char	o_tty[9];	/* 1st few chars of tty name with 'tty' stripped, if present */
  	char	o_stat;		/* p_stat */
  	short	o_uid;		/* p_uid */
  	char	o_uname[UT_NAMESIZE];	/* login name of process owner */
--- 19,25 ----
  	dev_t	o_ttyd;		/* u_ttyd */
  	int	o_flag;		/* p_flag */
  	short	o_pid;		/* p_pid */
! 	char	o_tty[3];	/* 1st 2 chars of tty after 'tty' */
  	char	o_stat;		/* p_stat */
  	short	o_uid;		/* p_uid */
  	char	o_uname[UT_NAMESIZE];	/* login name of process owner */
*** /usr/src/bin/ps.c.old	Tue Jun 19 10:02:55 1990
--- /usr/src/bin/ps.c	Sun Jan  3 01:52:58 1993
***************
*** 35,46 ****
  struct	nlist nl[] =	{
  	{ "_proc" , 0, 0},
  #define	X_PROC		0
- 	{ "_swplo" , 0, 0},
- #define	X_SWPLO		1
  	{ "_nproc", 0, 0},
! #define X_NPROC		2
  	{ "_hz", 0, 0},
! #define	X_HZ		3
  	0
  };
  #define	NNAMESIZ	(sizeof nl[0].n_name)
--- 35,44 ----
  struct	nlist nl[] =	{
  	{ "_proc" , 0, 0},
  #define	X_PROC		0
  	{ "_nproc", 0, 0},
! #define X_NPROC		1
  	{ "_hz", 0, 0},
! #define	X_HZ		2
  	0
  };
  #define	NNAMESIZ	(sizeof nl[0].n_name)
***************
*** 65,71 ****
  char	*tptr, *mytty;
  char	*nlistf, *uname;
  int	file;
- off_t	swplo;
  int	nproc;
  off_t	tell;
  int	nchans;
--- 63,68 ----
***************
*** 232,239 ****
  
  	openfiles (argc, argv);
  	getkvars (argc, argv);
- 	if (kflg)
- 		swplo	= (off_t) 0;
  	uid	= getuid ();
  	euid	= geteuid ();
  	mytty	= ttyname(0);
--- 229,234 ----
***************
*** 348,354 ****
  	switch (cp[0]) {
  
  	case 'c':
! 		if (!strcmp(cp, "console")) {
  			x = 0;
  			goto donecand;
  		}
--- 343,349 ----
  	switch (cp[0]) {
  
  	case 'c':
! 		if (!strcmp(cp, "co")) {
  			x = 0;
  			goto donecand;
  		}
***************
*** 467,475 ****
  		file = mem;
  	}
  	else {
! 		addr = (procp->p_addr + swplo) << 9;
! 		daddr = (procp->p_daddr + swplo) << 9;
! 		saddr = (procp->p_saddr + swplo) << 9;
  		file = swap;
  	}
  	lseek(file, addr, 0);
--- 462,470 ----
  		file = mem;
  	}
  	else {
! 		addr = procp->p_addr << 9;
! 		daddr = procp->p_daddr << 9;
! 		saddr = procp->p_saddr << 9;
  		file = swap;
  	}
  	lseek(file, addr, 0);
***************
*** 487,493 ****
  	datmap.b2 = stackbas (stksiz);
  	datmap.e2 = stacktop (stksiz);
  	tp = gettty();
! 	if ((tptr && strcmp(tptr,tp)) || (strcmp(mytty, tp) && !aflg))
  		return(0);
  	a = &outargs[npr];		/* saving com starts here */
  	a->o_uid = puid;
--- 482,488 ----
  	datmap.b2 = stackbas (stksiz);
  	datmap.e2 = stacktop (stksiz);
  	tp = gettty();
! 	if ((tptr && strncmp(tptr,tp,2)) || (strncmp(mytty, tp, 2) && !aflg))
  		return(0);
  	a = &outargs[npr];		/* saving com starts here */
  	a->o_uid = puid;
***************
*** 842,852 ****
  		getdev();
  	}
  
- 	/* find base of swap */
- 	lseek(kmem,(off_t)nl[X_SWPLO].n_value,0);
- 	if (read(kmem,(char *) &swplo,sizeof(swplo)) != sizeof(swplo))
- 		cantread("swplo",kmemf);
- 
  	/* find number of procs */
  	if (nl[X_NPROC].n_value) {
  		lseek(kmem,(off_t)nl[X_NPROC].n_value,0);
--- 837,842 ----
***************
*** 875,897 ****
  }
  
  
! char *uhdr = "USER       PID NICE SZ TTY       TIME";
  upr(a)
  register struct psout	*a;
  {
! 	printf("%-8.8s%6u%4d%4d %-8.8s",a->o_uname,a->o_pid,a->o_nice,a->o_size,a->o_tty);
  	ptime(a);
  }
  
! char *shdr = "   PID TTY       TIME";
  spr (a)
  register struct psout	*a;
  {
! 	printf("%6u %-8.8s",a->o_pid,a->o_tty);
  	ptime(a);
  }
  
! char *lhdr = "  F S   UID   PID  PPID CPU PRI NICE  ADDR  SZ WCHAN  TTY       TIME";
  lpr(a)
  register struct psout *a;
  {
--- 865,887 ----
  }
  
  
! char *uhdr = "USER       PID NICE SZ TTY TIME";
  upr(a)
  register struct psout	*a;
  {
! 	printf("%-8.8s%6u%4d%4d %-2.2s",a->o_uname,a->o_pid,a->o_nice,a->o_size,a->o_tty);
  	ptime(a);
  }
  
! char *shdr = "   PID TTY TIME";
  spr (a)
  register struct psout	*a;
  {
! 	printf("%6u %-2.2s",a->o_pid,a->o_tty);
  	ptime(a);
  }
  
! char *lhdr = "  F S   UID   PID  PPID CPU PRI NICE  ADDR  SZ WCHAN  TTY TIME";
  lpr(a)
  register struct psout *a;
  {
***************
*** 906,912 ****
  		else
  			fputs("       ",stdout);
  	else printf(" %-6.6s",getchan(a->o_wchan));
! 	printf(" %-8.8s",a->o_tty);
  	ptime(a);
  }
  
--- 896,902 ----
  		else
  			fputs("       ",stdout);
  	else printf(" %-6.6s",getchan(a->o_wchan));
! 	printf(" %-2.2s",a->o_tty);
  	ptime(a);
  }
  
*** /usr/src/etc/fstat.c.old	Thu May 10 14:38:23 1990
--- /usr/src/etc/fstat.c	Thu Dec 24 15:00:38 1992
***************
*** 86,95 ****
  #define	X_PROC		0
  	{ "_nproc" },
  #define	X_NPROC		1
- 	{ "_swplo" },
- #define	X_SWAPLO	2
  	{ "_netdata" },
! #define	X_NETDATA	3
  	{ "" },
  };
  #else
--- 86,93 ----
  #define	X_PROC		0
  	{ "_nproc" },
  #define	X_NPROC		1
  	{ "_netdata" },
! #define	X_NETDATA	2
  	{ "" },
  };
  #else
***************
*** 125,131 ****
  static int	kmem, mem, nproc, swap;
  static char	*uname;
  #ifdef BSD2_10
! static off_t	netdata, swplo;
  long	lgetw();
  #endif
  
--- 123,129 ----
  static int	kmem, mem, nproc, swap;
  static char	*uname;
  #ifdef BSD2_10
! static off_t	netdata;
  long	lgetw();
  #endif
  
***************
*** 194,203 ****
  		netdata = lgetw((off_t)nl[X_NETDATA].n_value);
  		netdata = ctob(netdata);
  	}
- 	if (nl[X_SWAPLO].n_type) {
- 		(void) lseek(kmem, (off_t)nl[X_SWAPLO].n_value, L_SET);
- 		read(kmem, &swplo, sizeof swplo);
- 	}
  #else
  	Usrptma = (struct pte *)nl[X_USRPTMA].n_value;
  	usrpt = (struct pte *) nl[X_USRPT].n_value;
--- 192,197 ----
***************
*** 290,296 ****
  	if ((mproc->p_flag & SLOAD) == 0) {
  		if (swap < 0)
  			return(0);
! 		(void)lseek(swap, (off_t)(mproc->p_addr + swplo)<<9, L_SET);
  		if (read(swap, (char *)&user.user, sizeof(struct user))
  		    != sizeof(struct user)) {
  			fprintf(stderr, "fstat: can't read u for pid %d from %s\n", mproc->p_pid, N_SWAP);
--- 284,290 ----
  	if ((mproc->p_flag & SLOAD) == 0) {
  		if (swap < 0)
  			return(0);
! 		(void)lseek(swap, (off_t)(mproc->p_addr)<<9, L_SET);
  		if (read(swap, (char *)&user.user, sizeof(struct user))
  		    != sizeof(struct user)) {
  			fprintf(stderr, "fstat: can't read u for pid %d from %s\n", mproc->p_pid, N_SWAP);
*** /usr/src/etc/mkfs.c.old	Sun Apr 22 22:55:28 1990
--- /usr/src/etc/mkfs.c	Wed Dec 30 11:29:53 1992
***************
*** 1,4 ****
! char	*sccsid = "@(#)mkfs.c	2.5";
  
  /*
   * Make a file system prototype.
--- 1,4 ----
! char	*sccsid = "@(#)mkfs.c	2.6";
  
  /*
   * Make a file system prototype.
***************
*** 5,11 ****
   * usage: mkfs filsys size [ m n ]
   */
  #include <sys/param.h>
! 
  #ifndef STANDALONE
  #include <stdio.h>
  #include <a.out.h>
--- 5,16 ----
   * usage: mkfs filsys size [ m n ]
   */
  #include <sys/param.h>
! /*
!  * Need to do the following to get the larger incore inode structure
!  * (the kernel might be built with the inode times external/mapped-out).
!  * See /sys/h/localtimes.h and /sys/conf.
! */
! #undef	EXTERNALITIMES
  #ifndef STANDALONE
  #include <stdio.h>
  #include <a.out.h>
*** /usr/src/etc/pstat.c.old	Mon Jun 15 23:43:57 1992
--- /usr/src/etc/pstat.c	Wed Dec 23 19:57:22 1992
***************
*** 10,16 ****
   All rights reserved.\n";
  
  /* static char sccsid[] = "@(#)pstat.c	5.8 (Berkeley) 5/5/86"; */
! static char sccsid[] = "@(#)pstat.c	1.0 (2.10BSD) 12/29/87";
  #endif not lint
  
  /*
--- 10,16 ----
   All rights reserved.\n";
  
  /* static char sccsid[] = "@(#)pstat.c	5.8 (Berkeley) 5/5/86"; */
! static char sccsid[] = "@(#)pstat.c	1.1 (2.11BSD) 12/23/92";
  #endif not lint
  
  /*
***************
*** 740,750 ****
  		return;
  	}
  	printf("%d/%d open files\n", nf, nfile);
- #ifdef	UCB_NET
  	printf("   LOC   TYPE   FLG        CNT  MSG   DATA    OFFSET\n");
- #else
- 	printf("   LOC   TYPE   FLG        CNT  DATA    OFFSET\n");
- #endif
  	loc = afile;
  	for	(fp=xfile; fp < &xfile[nfile]; fp++, loc += sizeof (*fp))
  		{
--- 740,746 ----
***************
*** 765,773 ****
  		putf((long)fp->f_flag&FMARK, 'm');
  		putf((long)fp->f_flag&FDEFER, 'd');
  		printf("  %3d", fp->f_count);
- #ifdef	UCB_NET
  		printf("  %3d", fp->f_msgcount);
- #endif
  		printf("  %7.1o", fp->f_data);
  		if (fp->f_offset < 0)
  			printf("  0%lo\n", fp->f_offset);
--- 761,767 ----
*** /usr/src/ucb/w.c.old	Sun May 27 21:10:17 1990
--- /usr/src/ucb/w.c	Thu Dec 24 15:03:39 1992
***************
*** 36,49 ****
  #define	X_PROC		0
  	{ "_swapdev" },
  #define	X_SWAPDEV	1
- 	{ "_swplo" },
- #define	X_SWPLO		2
  	{ "_avenrun" },
! #define	X_AVENRUN	3
  	{ "_boottim" },
! #define	X_BOOTIME	4
  	{ "_nproc" },
! #define	X_NPROC		5
  	{ 0 },
  };
  
--- 36,47 ----
  #define	X_PROC		0
  	{ "_swapdev" },
  #define	X_SWAPDEV	1
  	{ "_avenrun" },
! #define	X_AVENRUN	2
  	{ "_boottim" },
! #define	X_BOOTIME	3
  	{ "_nproc" },
! #define	X_NPROC		4
  	{ 0 },
  };
  
***************
*** 411,417 ****
  	int szpt, pfnum, i;
  	long addr;
  	long daddr, saddr;
- 	daddr_t swplo;
  	long txtsiz, datsiz, stksiz;
  	int septxt;
  
--- 409,414 ----
***************
*** 428,438 ****
  	 */
  	lseek(mem, (long)nl[X_SWAPDEV].n_value, 0);
  	read(mem, &nl[X_SWAPDEV].n_value, sizeof(nl[X_SWAPDEV].n_value));
- 	/*
- 	 * Find base of swap
- 	 */
- 	lseek(mem, (long)nl[X_SWPLO].n_value, 0);
- 	read(mem, &swplo, sizeof(swplo));
  	if (nl[X_NPROC].n_value == 0) {
  		fprintf(stderr, "nproc not in namelist\n");
  		exit(1);
--- 425,430 ----
***************
*** 461,469 ****
  			saddr = ctob((long)mproc.p_saddr);
  			file = swmem;
  		} else {
! 			addr = (mproc.p_addr+swplo)<<9;
! 			daddr = (mproc.p_daddr+swplo)<<9;
! 			saddr = (mproc.p_saddr+swplo)<<9;
  			file = swap;
  		}
  		lseek(file, addr, 0);
--- 453,461 ----
  			saddr = ctob((long)mproc.p_saddr);
  			file = swmem;
  		} else {
! 			addr = mproc.p_addr<<9;
! 			daddr = mproc.p_daddr<<9;
! 			saddr = mproc.p_saddr<<9;
  			file = swap;
  		}
  		lseek(file, addr, 0);
*** /usr/src/games/hack/errlst.c.old	Fri Oct  4 14:57:50 1985
--- /usr/src/games/hack/errlst.c	Wed Dec 23 20:04:36 1992
***************
*** 46,52 ****
  
  /* non-blocking and interrupt i/o */
  	"37",		/* 37 - EWOULDBLOCK */
! #ifdef	UCB_NET
  	"38",		/* 38 - EINPROGRESS */
  	"39",	/* 39 - EALREADY */
  
--- 46,52 ----
  
  /* non-blocking and interrupt i/o */
  	"37",		/* 37 - EWOULDBLOCK */
! 
  	"38",		/* 38 - EINPROGRESS */
  	"39",	/* 39 - EALREADY */
  
***************
*** 83,88 ****
  	"64",			/* 64 - ENAMETOOLONG */
  	"65",				/* 65 - EHOSTDOWN */
  	"66",			/* 66 - EHOSTUNREACH */
- #endif	UCB_NET
  };
  int	sys_nerr = { sizeof sys_errlist/sizeof sys_errlist[0] };
--- 83,87 ----
*** /usr/src/new/crash/crash.c.old	Sun Aug  6 17:17:38 1989
--- /usr/src/new/crash/crash.c	Thu Dec 24 15:05:58 1992
***************
*** 152,158 ****
  dev_t	rootdev;	/* device of the root */
  dev_t	swapdev;	/* swapping device */
  dev_t	pipedev;	/* pipe device */
- daddr_t	swplo;		/* block number of swap space */
  unsigned bsize;		/* size of buffers */
  int	cputype;	/* type of cpu = 40, 44, 45, 60, or 70 */
  struct	inode	*rootdir;	/* pointer to inode of root directory */
--- 152,157 ----
***************
*** 168,179 ****
  u_short	*lks;			/* pointer to clock device */
  int	updlock;		/* lock for sync */
  daddr_t	rablock;		/* block to be read ahead */
- #ifdef	UCB_CLIST
  memaddr clststrt;		/* Location of actual clists (clicks) */
- #else
  memaddr cfreebase;		/* base of clists in kernel */
! #endif	UCB_CLIST
! unsigned clsize;	/* Size of clists */
  
  /*
   * V7 (Stone knives & bear skins memorial) Clist structures.  "cfree" conflicts
--- 167,176 ----
  u_short	*lks;			/* pointer to clock device */
  int	updlock;		/* lock for sync */
  daddr_t	rablock;		/* block to be read ahead */
  memaddr clststrt;		/* Location of actual clists (clicks) */
  memaddr cfreebase;		/* base of clists in kernel */
! unsigned clsize;		/* Size of clists */
! short	ucbclist;		/* mapped out clist flag */
  
  /*
   * V7 (Stone knives & bear skins memorial) Clist structures.  "cfree" conflicts
***************
*** 270,276 ****
  	"\nRoot dev",		(char *) &rootdev,	DEV, 0,
  	"\nSwap Dev",		(char *) &swapdev,	DEV, 0,
  	"\nPipe Dev",		(char *) &pipedev,	DEV, 0,
- 	"\nSwap Low Block",	(char *) &swplo,		DEC, 0,
  	"\nSwap Size",		(char *) &nswap,		DEC, 0,
  	"\nupdate() lock",		(char *) &updlock,	DEC, 0,
  	"\nReadahead blk",	(char *) &rablock,	OCT, 0,
--- 267,272 ----
***************
*** 282,292 ****
  	"\nSystem Buffer start click",	(char *) &bpaddr,	OCT, 0,
  	"\tNo. Buffers",	(char *) &nbuf,	DEC, 0,
  	"\tSize",	(char *) &bsize,	OCT, 0,
- #ifdef	UCB_CLIST
  	"\nClist start click",	(char *) &clststrt,		OCT, 0,
- #else
  	"\nClist start address",(char *) &cfreebase,		OCT, 0,
- #endif	UCB_CLIST
  	"\tSize of area",	(char *) &clsize,		DEC, 0,
  	END
  };
--- 278,285 ----
***************
*** 504,514 ****
  	"_u",		(char *) &u,		sizeof u,	
  	"_bpaddr",	(char *) &bpaddr,		sizeof bpaddr,
  	"_bsize",	(char *) &bsize,		sizeof bsize,
! #ifdef	UCB_CLIST
  	"_clststrt",	(char *) &clststrt,		sizeof clststrt,
- #else
  	"_cfree",	(char *) &cfreebase,		sizeof cfreebase,
- #endif	UCB_CLIST
  	"_ninode",	(char *) &ninode,		sizeof ninode,
  
  	/* Random Variables */
--- 497,505 ----
  	"_u",		(char *) &u,		sizeof u,	
  	"_bpaddr",	(char *) &bpaddr,		sizeof bpaddr,
  	"_bsize",	(char *) &bsize,		sizeof bsize,
! 	"_ucb_cli",	(char *) &ucbclist,		sizeof ucbclist,
  	"_clststrt",	(char *) &clststrt,		sizeof clststrt,
  	"_cfree",	(char *) &cfreebase,		sizeof cfreebase,
  	"_ninode",	(char *) &ninode,		sizeof ninode,
  
  	/* Random Variables */
***************
*** 530,536 ****
  	"_rootdev",	(char *) &rootdev,	sizeof rootdev,
  	"_swapdev",	(char *) &swapdev,	sizeof swapdev,
  	"_pipedev",	(char *) &pipedev,	sizeof pipedev,
- 	"_swplo",	(char *) &swplo,		sizeof swplo,
  	"_nswap",	(char *) &nswap,		sizeof nswap,
  	"_updlock",	(char *) &updlock,	sizeof updlock,
  	"_rablock",	(char *) &rablock,	sizeof rablock,
--- 521,526 ----
***************
*** 695,705 ****
  			printf("could not find _cfreeli\n");
  			exit(1);
  		}
! #ifdef	UCB_CLIST
  		lseek(kmem, (off_t)ctob((long)clststrt), 0); /* clists click */
! #else
  		lseek(kmem, (off_t) cfreebase, 0);  /* clists in kernel  */
! #endif	UCB_CLIST
  		read(kmem, (caddr_t) cfree_, clsize);
  
  		vf("_nkl11", (char *) &nkl11, sizeof nkl11);
--- 685,695 ----
  			printf("could not find _cfreeli\n");
  			exit(1);
  		}
! 	if	(ucbclist)
  		lseek(kmem, (off_t)ctob((long)clststrt), 0); /* clists click */
! 	else
  		lseek(kmem, (off_t) cfreebase, 0);  /* clists in kernel  */
! 
  		read(kmem, (caddr_t) cfree_, clsize);
  
  		vf("_nkl11", (char *) &nkl11, sizeof nkl11);
***************
*** 928,937 ****
  		}
  	}
  
- #ifdef	UCB_NET
  	/* Display mbuf status info */
  	dispnet();
- #endif	UCB_NET
  
  	/* Display the Callouts */
  	if( tflg )  {
--- 918,925 ----
***************
*** 1077,1087 ****
  		subhead = "The C-list";
  		newpage();
  		line = 8;
! #ifdef	UCB_CLIST
! 		j = (unsigned)0120000;
! #else
! 		j = (unsigned)cfreebase;
! #endif	UCB_CLIST
  		for(cp=cfree_; cp<&cfree_[nclist]; cp++)  {
  			putchar('\n');
  			octout( j );
--- 1065,1075 ----
  		subhead = "The C-list";
  		newpage();
  		line = 8;
! 		if (ucbclist)
! 			j = (unsigned)0120000;
! 		else
! 			j = (unsigned)cfreebase;
! 
  		for(cp=cfree_; cp<&cfree_[nclist]; cp++)  {
  			putchar('\n');
  			octout( j );
***************
*** 1160,1170 ****
  	register unsigned int cp;
  	memaddr clstp, clstbase, clstend;
  
! #ifdef	UCB_CLIST
! 	clstbase = (memaddr)0120000;
! #else
! 	clstbase = (memaddr)cfreebase;
! #endif	UCB_CLIST
  	clstend = clstbase + clsize;
  	printf("\n----The %s Queue-----\n", msg);
  	line += 2;
--- 1148,1158 ----
  	register unsigned int cp;
  	memaddr clstp, clstbase, clstend;
  
! 	if	(ucbclist)
! 		clstbase = (memaddr)0120000;
! 	else
! 		clstbase = (memaddr)cfreebase;
! 
  	clstend = clstbase + clsize;
  	printf("\n----The %s Queue-----\n", msg);
  	line += 2;
***************
*** 1273,1279 ****
  				continue;
  			}
  			printf("\n Image retrieved from swapdev.\n");
! 			baddr = ( swplo + p->p_addr ) * 512L;
  		}
  
  		lseek( kmem, (off_t) baddr, 0 );
--- 1261,1267 ----
  				continue;
  			}
  			printf("\n Image retrieved from swapdev.\n");
! 			baddr = ( p->p_addr ) * 512L;
  		}
  
  		lseek( kmem, (off_t) baddr, 0 );
*** /usr/src/new/crash/dispnet.c.old	Tue Aug  9 17:37:32 1988
--- /usr/src/new/crash/dispnet.c	Wed Dec 23 20:08:01 1992
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifdef UCB_NET
! 
! #ifndef lint
  static char sccsid[] = "@(#)dispnet.c	5.6 (Berkeley) 8/22/87";
  #endif
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	defined(DO_SCCS) && !defined(lint)
  static char sccsid[] = "@(#)dispnet.c	5.6 (Berkeley) 8/22/87";
  #endif
  
***************
*** 917,921 ****
  #define	TCPOOB_HADDATA	0x02
  };
  #endif	for_handy_reference
- 
- #endif UCB_NET
--- 915,917 ----
*** /usr/src/new/crash/if.c.old	Sat Aug 22 14:30:48 1987
--- /usr/src/new/crash/if.c	Wed Dec 23 20:08:43 1992
***************
*** 4,14 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifdef UCB_NET
! 
! #ifndef lint
  static char sccsid[] = "@(#)if.c	5.3 (Berkeley) 4/23/86";
! #endif not lint
  
  #include <sys/types.h>
  #include <sys/socket.h>
--- 4,12 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	defined(DO_SCCS) && !defined(lint)
  static char sccsid[] = "@(#)if.c	5.3 (Berkeley) 4/23/86";
! #endif
  
  #include <sys/types.h>
  #include <sys/socket.h>
***************
*** 294,298 ****
  	/*NOTREACHED*/
  }
  #endif	!CRASH
- 
- #endif UCB_NET
--- 292,294 ----
*** /usr/src/new/crash/inet.c.old	Tue Aug  9 17:38:15 1988
--- /usr/src/new/crash/inet.c	Wed Dec 23 20:09:15 1992
***************
*** 4,14 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifdef UCB_NET
! 
! #ifndef lint
  static char sccsid[] = "@(#)inet.c	5.4 (Berkeley) 2/25/86";
! #endif not lint
  
  #include <sys/param.h>
  #include <sys/socket.h>
--- 4,12 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	defined(DO_SCCS) && !defined(lint)
  static char sccsid[] = "@(#)inet.c	5.4 (Berkeley) 2/25/86";
! #endif
  
  #include <sys/param.h>
  #include <sys/socket.h>
***************
*** 408,412 ****
  	}
  	return (line);
  }
- 
- #endif UCB_NET
--- 406,408 ----
*** /usr/src/new/crash/route.c.old	Sat Aug 22 14:30:49 1987
--- /usr/src/new/crash/route.c	Wed Dec 23 20:09:44 1992
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifdef UCB_NET
! 
! #ifndef lint
  static char sccsid[] = "@(#)route.c	5.6 (Berkeley) 86/04/23";
  #endif
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	defined(DO_SCCS) && !defined(lint)
  static char sccsid[] = "@(#)route.c	5.6 (Berkeley) 86/04/23";
  #endif
  
***************
*** 406,410 ****
  		*p += ('A' - 'a');
  	}
  }
- 
- #endif UCB_NET
--- 404,406 ----
