Commit Graph

12668 Commits

Author SHA1 Message Date
is 2f824e16e8 Oops, forgot this in last kilocommit:
Attach com at drsupio, drsupio at mainbus, and make
the ttyC0 stuff refer to the com driver.
1997-08-27 20:18:19 +00:00
is 0564e80e3e This is no longer needed. 1997-08-27 19:37:30 +00:00
is f7c9a70a19 Define supio, a direct bus with a single locator, the port number. This
is for "standard PC i/o stuff" at known and constant locations, e.g. when
multi-io chips are used on non-ISA mainboards.
Implement drsupio.c, the DraCo version of this.
Attach the generic com.c to this bus.
Remove the old drcom hack.
1997-08-27 19:32:47 +00:00
is 45a8ec2d22 Amiga port bus.h. Currenlty, only the _1 functions are implemented. 1997-08-27 18:52:57 +00:00
is 2e45e81622 machine/intr.h for the Amiga port. Mostly a wrapper around other includes. 1997-08-27 18:41:25 +00:00
is 47e8019573 Add __GENERIC_SOFT_INTERRUPTS implementation.
Currently, this is only kind of a wrapper around the *_sicallback() function
family. This way, we'll only break the new driver if it doesn't work.
After more drivers are converted, we'll change it to be the other way round.
1997-08-27 18:31:14 +00:00
bouyer 6f3bab1f59 Merge scsipi branch in the mainline. This add support for ATAPI devices
(currently only CD-ROM drives on i386). The sys/dev/scsipi system provides 2
busses to which devices can attach (scsibus and atapibus). This needed to
change some include files and structure names in the low level scsi drivers.
1997-08-27 11:22:52 +00:00
leo c9f11609e3 According to Andre Lange, the Hades has the DTR/RTS lines exchanged on
the 68901 UART-port due to a PCB error. Take care of this.
1997-08-27 06:59:19 +00:00
leo a905a75ff7 Number the slots 0&1 instead of 1&2 . 1997-08-27 06:56:14 +00:00
leo c8c7fe38ca Add the isa-bus. 1997-08-27 06:52:46 +00:00
leo 2ca332c7bc Add a char entry for md and add it to the chartoblk table. This fixes
the problem that kernfs was unable to determine the root device while
booting from the install floppy.
1997-08-27 06:21:06 +00:00
leo d0301b58ee Don't enable the dma-interrupt while polling for dma to end. This sometimes
caused a system panic on the Hades while probing the SCSI devices.
1997-08-27 06:16:49 +00:00
mikel a6a1f307de sync with GENERIC 1.96, no functional change 1997-08-27 04:56:38 +00:00
augustss a50d4ba893 XXX Add a drq2 locator for the ISA bus. Many sound cards need
two DMA channels to do e.g. full-duplex.  This allows
a way of specifying the second channel in a sane way.
THIS IS TEMPORARY.  The drq2 locator will go away when
the locator system has been changed to allow multiple
values per locator.
1997-08-26 19:26:38 +00:00
fvdl a153e98871 Recognize Cyrix M2 1997-08-26 18:56:40 +00:00
fvdl d792a4aa54 Activate SCSIVERBOSE by default. 1997-08-26 18:39:02 +00:00
thorpej 75a4512f7f Notify drivers that we "prefer" I/O mapped space, per discussion with
Chris Demetriou and Matt Thomas, some two or three months ago.  (This hint
is used by the latest "de" driver.)
1997-08-26 03:14:06 +00:00
thorpej 9ffe59d049 In i386_mem_add_mapping(), don't bother calling pmap_changebit() to mark a
device memory mapping cacheable/non-cacheable:
- PG_N doesn't exist on the 386.
- pmap_changebit() only deals with managed pages.
Basically, calling it is unnecessary, and never did anything.  Pointed
out by Chuck Cranor, and further discussed with Frank van der Linden.

Also, add a comment about why we don't mark pages non-cacheable in
_bus_dmamem_map().
1997-08-25 23:02:25 +00:00
thorpej 38f15737fd Protect access to kmem_map with splimp()/splx(). From Chuck Cranor. 1997-08-25 21:17:48 +00:00
augustss 6616d47838 - Change audio_hw_if a little: set_param now sets the play and record modes
at the same time instead by using two different calls.  This enables
  it to check more easily if the combined mode is all right.
- Improve the error checking in audio.c.
- Add a new audio property, AUDIO_PROP_INDEPENDENT, show if the
  play and record settings are independent.
- Fix some buglets in audio.c.
1997-08-24 22:31:23 +00:00
drochner 9518da7563 Remove over-sensitive sanity check for console port == KGDB port. 1997-08-24 09:38:19 +00:00
cgd ce0a826c55 fix various bogons: copy SCSIVERBOSE option (still commented out) and ISA lc
driver to ALPHA.  Also, sort them into their respective lists correctly,
rather than punting completely (SCSIVERBOSE), or mis-sorting(!) (lc).
1997-08-24 06:40:18 +00:00
cgd 1173f77359 fix spaces/tabs lossage: if we're going to do "options<space><tab>", be
consistent about it (fix it in all files)!  Also, there's no point at all
in doing "file-system<space><tab>", so kill the spaces.
1997-08-24 06:37:12 +00:00
mjacob 6ac7f6248f add a before tab to SCSIVERBOSE 1997-08-23 19:16:06 +00:00
drochner 44224e6fd5 Adapt to serial console attachment changes. 1997-08-23 14:28:16 +00:00
drochner 350184a9b7 Remove unneeded dev/cninit.c. 1997-08-23 14:26:46 +00:00
drochner 01930ff909 Update prototype options for serial console / KGDB for new reality.
"option\t" -> "option \t", as wished by Bernd Ernesti.
1997-08-23 14:25:55 +00:00
drochner dfbc80bd71 Delete unused constab[]. 1997-08-23 14:22:59 +00:00
drochner 2f05375163 Use functions provided by the drivers to initialize and attach console
and KGDB. Make port address, speed and (7/8bit,parity,stopbits) for serial
lines configurable.
1997-08-23 14:22:03 +00:00
drochner d09a42059f Put all console initialization into 1 exported function (pccnattach()).
Delay setting of cn_tab->cn_dev until autoconfiguration attach
  to get the minor number right. (not really needed, but for
  consistency with pccons and serial consoles)
Comment out unused pccnprobe() and pccninit().
XXX I didn't use "#if PCVT_NETBSD > ???" anymore, nor separated from
  FreeBSD. The driver is not centrally maintained anyway.
1997-08-23 14:17:46 +00:00
drochner fe882d2810 Put all console initialization into 1 exported function (pccnattach()).
Delay setting of cn_tab->cn_dev until autoconfiguration attach
  to get the minor number right.
Delete unused pccnprobe() and pccninit().
1997-08-23 14:10:12 +00:00
kleink dc91486be3 bootp vs. mop: don't clobber `netboot' flag. 1997-08-23 10:18:33 +00:00
perry 423eab6e13 Stop people from trying to build the obsolete boot blocks by accident. 1997-08-22 21:53:00 +00:00
augustss 556cf1abc0 Make it possible for audio to attach to audioamd. 1997-08-22 11:45:06 +00:00
cgd fc2e81c6d5 lie to the compiler when doing mkdep so that it depends .s files correctly. 1997-08-22 06:37:17 +00:00
scottr 4cb1ba2dac Make this compile again when we only specify a machine with the
HP MMU (320, 350).
1997-08-21 18:12:34 +00:00
mjacob 1a7afa3853 add commented out reference SCSIVERBOSE option 1997-08-20 18:38:13 +00:00
mjacob 0e3c7b7f44 Commented out SCSIVERBOSE option; reference 1997-08-20 18:35:55 +00:00
drochner e153e51fa3 Make "genprom" work in objdir.
Minor cleanup to ease bootcode development at non-standard locations.
Closes PR port-i386/4013 by Luke Mewburn.
1997-08-20 16:53:30 +00:00
jonathan 43bc0b92d2 Turn DDB on by default in GENERIC kernel; turn DDB_ONPANIC off.
Remove obsolete comments.
1997-08-20 04:33:04 +00:00
jonathan d2ecd3da2a update based on NFSINSTALL. 1997-08-20 04:22:41 +00:00
jonathan 378facc384 consistent whitespace after "options". 1997-08-20 04:21:28 +00:00
jonathan e14d1d4768 Move SSIZE and DELAY() definitions to sys/arch/mips/include/mips_param.h.
Update comment in pmax/include/param.h (pr 3988).
1997-08-20 03:47:17 +00:00
augustss 332ad95e76 Change the MI audio driver so it attaches to the MD driver in the
normal way.  This requires adding a line to the config files to
get audio to work again.
1997-08-19 23:49:33 +00:00
hannken a44c1f66a7 Change "it's" to "it is" inside assembler comments to
stop "unterminated character constant" messages from `mkdep'.
1997-08-18 22:44:01 +00:00
scottr af6b181686 Fix typo in getting the 040 access fault address, noticed by
Allen Briggs in the mac68k locore.s
1997-08-18 17:52:48 +00:00
mhitch 5170e3eccc Use the free-running microsecond counter on the Maxine for high-resolution
clock.
1997-08-17 18:13:22 +00:00
mhitch 4c88f43717 Get $ra contents from the proper location in the exception/interrupt frames.
Use DDB symbols if available for stack traceback.
1997-08-17 17:02:07 +00:00
mhitch 549e36420e Display jump and branch target with symbols if available.
Clean up indentation - seems to have gotten messed up when the mini-debug
routine was added.
1997-08-17 16:58:53 +00:00
mhitch 748703e737 Correct the check for a recovered error (I did it wrong the first time). 1997-08-17 16:51:21 +00:00
briggs e39cac5a38 Get the correct fault address on a bus error on a 68040. 1997-08-16 23:10:49 +00:00
mjacob 23d0cae1eb It helps streaming performance substantially to enable bursts and more up hose
packets. It's not clear whether latency will be affected much. It could be.
However, for the time being, getting full rates out of HIPPI or SCSI are what
interests us at NASA, so we'll hew to this bias.
1997-08-16 01:18:30 +00:00
mjacob 92995a3a9f a minor bit of cleanup 1997-08-16 01:16:33 +00:00
mjacob ecd1b40ab3 Add some PCIA_CTL defines. 1997-08-16 01:14:32 +00:00
mjacob 419960bd0e Changes for PCI Qlogic ISP2100 meant a few minor changes. 1997-08-16 00:33:04 +00:00
perry 51ed105af6 comment out APM -- it hurts some systems during install. 1997-08-15 21:44:31 +00:00
mikel d540ff911c wrap bus_space I/O tag checks with #ifdef DIAGNOSTIC.
wrap actual read port map/unmap with #ifdef _KERNEL, so userland probe
  code will still work.
1997-08-15 06:48:29 +00:00
cgd efecf08fef Sync with bus_space(9):
* make map and alloc take 'flags' rather than 'cacheable,' for
  more flexibility.
* rename BUS_BARRIER_* to BUS_SPACE_BARRIER_*, for consistency.
* rename bus_space_copy_* to bus_space_copy_region_* and make their
  defns match the updated spec.
Backward compatibility is provided by defining __BUS_SPACE_COMPAT_OLDDEFS,
which is currently defined by default.
1997-08-15 00:45:16 +00:00
briggs 2a83a9363a Add interrupt handler for SuperMac GFX.
Tested by Kai-Yew Lum <kaiyewl@engin.umich.edu> back in May.
1997-08-15 00:15:32 +00:00
scottr c7079260e5 More machine support:
- Add entries for the LC520, Color Classic, and PB150 to intvid_info[].
 - Make the PB150 a Duo-class machine, as it seems to work better this way.

Now that we're doing the latter, it points out something I missed a long
time ago when I added Duo support:  CLASSDUO was being ignored in
mac68k_set_io_offsets().

PowerBook 150 changes and bug fix provided by Dave Huang <khym@bga.com>
in PR 3970.
1997-08-14 18:23:20 +00:00
drochner 80a5032beb Make new memory detection default.
Introduce a new option, "CONSERVATIVE_MEMDETECT", which disables the
new BIOS calls.
1997-08-14 17:00:18 +00:00
drochner e3045dd1ce Add prototype definitions for serial console and KGDB. 1997-08-14 16:23:41 +00:00
drochner 473b4f1222 Initialize system console from a central place (don't use cninit()
anymore). This makes the code cleaner (no more bus tag guessing in the
serial console driver) and it allows to share code with KGDB port
initialization.
The console device is now given as string ("pc", "com0".."com3").
Modelled after alpha port.
1997-08-14 16:21:49 +00:00
drochner 3bbb2f7b18 Export variables needed for system console initialization.
Do this in a separate file because pcvt_hdr.h contains too many definitions
which can cause namespace trouble. (eg, a structure element "m_len")
1997-08-14 16:07:12 +00:00
drochner 5a32b608a0 -Export variables needed for system console initialization.
-Because *cnputc()'s second argument is an "int" in cons.h, correct
  pccnputc() accordingly.
1997-08-14 16:02:14 +00:00
drochner c4af2e3042 Build the new memory detection stuff. 1997-08-14 15:40:28 +00:00
drochner 26f8c5bd65 Prepare definition for EXTENDED_MEMDETECT.
Not yet default.
1997-08-14 15:38:30 +00:00
drochner a6d6ef3a20 Use traditional memory detect function (int15/88) as indication for
a XMS driver.
From Martin Husemann.
1997-08-14 15:28:47 +00:00
drochner 2092d92ef2 New, optional, method to get size of extended memory.
It will be used for getextmem() if EXTENDED_MEMDETECT is defined.
Worked on all tested machines.
Thanks to all testers, especially Martin Husemann!
1997-08-14 15:22:00 +00:00
scottr f9904b191f Recognize the Sigma Designs ColorMax card, and handle the interrupt. Code
provided by Brian Foley <bfoley@gpo.iol.ie> via Allen Briggs, updated for
bus.h by me.
1997-08-14 06:16:46 +00:00
jonathan bf61f3291a Add checks for DS 3100, 2100. Use more generous delay values, these
systems may be memory-bound.
1997-08-14 00:15:37 +00:00
cgd 9d532f482c don't forget to set hwrpbsize to zero explicitly 1997-08-13 20:49:56 +00:00
cgd bf596ddb89 don't define __BUS_SPACE_COMPAT_OLDDEFS if it's already been defined 1997-08-13 02:53:03 +00:00
perry 03c3f2c28f fix spelling error, pr-3974 from Dave Huang 1997-08-12 23:53:54 +00:00
drochner 7427d7b340 Attach KGDB in early system startup. 1997-08-12 17:28:12 +00:00
drochner e553e8219f Enable single stepping with KGDB. 1997-08-12 17:26:57 +00:00
gwr 6b93a0192b cosmetic 1997-08-12 16:52:11 +00:00
gwr 5c339e9f73 Resolve conflict with <m68k/cpu.h> 1997-08-12 15:47:00 +00:00
cgd 9b263847db clean up RCS IDs 1997-08-12 06:08:21 +00:00
jonathan a5266cdd64 Fix for mbufs that start on odd-byte-aligned boundaries, and use. 1997-08-12 06:05:28 +00:00
cgd 73596f5504 sort miata defs 1997-08-12 02:59:43 +00:00
cgd 5544e7e348 update for moved files, placeholder for miata flag header 1997-08-12 02:08:12 +00:00
jonathan d3a3872e1a Fix 3MIN model-string braino from PR# 3965. 1997-08-12 01:52:10 +00:00
cgd 0bc9a09170 cia_bus_* -> cia_swiz_bus_* 1997-08-12 00:58:01 +00:00
cgd 46d5a50540 rewire a few file dependencies for cleanliness 1997-08-12 00:46:11 +00:00
cgd 4b8f75045a define a defopt for the miata systype 1997-08-12 00:04:14 +00:00
cgd 2d184c2262 clean up bootinfo v1 struct a bit: add a hwrpb size field (in a backward-
compatible way), and clean up the comments to make things a bit clearer.
1997-08-11 23:43:38 +00:00
scottr c988c6f85f Make #include directives consistent. All MD headers are of the form:
#include <mac68k/{dev,mac68k}/foo.h>
1997-08-11 22:53:26 +00:00
cgd b38691223e s/bogus/unknown/; just because we don't know about it doesn't mean it's wrong 1997-08-11 22:46:37 +00:00
jonathan cfc1040a1f Revert syscall interrupt re-enable of previous revision:
introduces a race in trap logging.  Reported by Michael Hitch.
1997-08-10 01:14:49 +00:00
ender 85f80dd2c7 o Fixed definition of PowerBook extended keyboard from previous commit
o Added recognition of some additional ADB device types
1997-08-09 20:21:45 +00:00
jonathan 85d2b918cd Definition of cpu_mhz. 1997-08-09 19:06:45 +00:00
jonathan baad4266be Fix printf() format strings for VMFAULT_TRACE (see PR port-pmax/3777).
Re-enable interrupts in syscall() before doing anything else; marginal
impprovment (2ms?) in NTP accuracy on 5000/240.
1997-08-09 06:06:37 +00:00
jonathan 95a12ee943 MIPS cpu-speed detection using mc146818 clock.
Compute CPU speed(MHz) and loop multiplier for DELAY() based on
counting empty loop between mcclock ticks.  New global: cpu_mhz.
Change pmax/pmax/machdep.c to build baseboard model names from cpu_mhz.
Set  'cpuspeed' for more realistic DELAY() on mips3 models.

Mips CPU constants, testing, and calibration from D. Sean Davidson
<davidson@zk3.dec.com> and Simon Burge <simonb@telstra.com.au>.
1997-08-09 05:51:56 +00:00
jonathan 003ccf3b1c mips pmap_activate:
* prototype and definition for pmap_activate(p). Updates the segtab,
   and changes the active ASID if p == curproc.
 * Make reserved fixed-address (UADDR) kernelstack PTEs global,
   so we still have a kernel stack after pmap_activate() on curproc.
 * make KSEG2 mappings for p_addr global (see above.)

Seems to detune contextswitch and NTP resolution (by 60 ms), but
thepmap_activate() interface is mandatory.  Needs more thought.
1997-08-09 03:41:02 +00:00
ender f8f304c76c Add recognition of more keyboard types (including ISO layouts) 1997-08-08 17:58:48 +00:00
jonathan 1c7fa31659 Add mips_read_causereg() 1997-08-08 06:52:59 +00:00
scottr 3aa6a4e333 Make the diagnostic panic message when we don't have a pcb consistent
with the message one normally gets when the kernel panics due to
some other unhandled trap.
1997-08-07 21:37:03 +00:00
scottr 740b91a80c Add the Classic II to intvid_info[] 1997-08-07 21:30:20 +00:00
christos a9be2ab366 PR/3954: Izumi Tsutsui: Add id for the ESS1868 joystick. 1997-08-07 19:44:54 +00:00
christos 7bd5c461f5 Check if we can map the read port, but don't really allocate it because it
will cause a conflict with the SoundBlaster Joysticks that say that they
require 200/8 and 207 is usually the read port. XXX: This is a hack.
1997-08-07 19:44:03 +00:00
pk dd07701791 Do not use `rasterconsole' by default on this framebuffer. 1997-08-07 19:12:30 +00:00
scottr c03541be22 Strip down to bare essentials for these machines. 1997-08-07 19:07:08 +00:00
mark 0efc44fd71 Cast the destination address for the cpu_cache_syncI_rng() function in
db_write_text().
1997-08-07 16:24:34 +00:00
veego 3dac730d96 French keymap. From Eric Delcamp in pr: port-amiga/3923 1997-08-06 17:08:15 +00:00
jonathan 5d53ad5ef5 Garbage-collect Mach_clock_addr outside of machdep.c.
Use as mcclock_addr inside machdep.c, to disable clock interrupts
until the clock is autoconfigured.
1997-08-06 12:03:34 +00:00
ragge cd0d651d0f delay() must be protected by #ifdef _KERNEL. 1997-08-05 13:28:51 +00:00
pk 46ca64dc14 Comment out body of pmap_copy() which got committed accidentally (btw. it
works, but its performance benefits are not immediately obvious).
1997-08-05 11:06:58 +00:00
pk b449c91f9b Correct typo that has been lurking undetected for some time. 1997-08-05 11:00:10 +00:00
pk a7f1e52ffd Some cosmetic changes suggested by Brian Baird: cache config msgs & RT625 fpu. 1997-08-05 10:40:21 +00:00
drochner 23fd5d0d9b #if -> #ifdef, fixes XMS support
from Martin Husemann, pr port-i386/3941
1997-08-05 10:27:57 +00:00
pk 7841423191 Hypersparc detection. 1997-08-04 22:41:25 +00:00
pk 8f937196fb Don't flush the cache in setpte4m(). Most callers have flushed the page
already and some MMUs might require a valid mapping to exist for the
virtual address to be flushed.
1997-08-04 20:09:54 +00:00
pk 3ffd287cc0 Move MMU dependent DDB goo into a pmap helper function. 1997-08-04 20:02:59 +00:00
pk 24ad0e8316 Prototype pmap_writetext(). 1997-08-04 20:00:47 +00:00
perry 8b27678e4e Added CAPS_IS_CONTROL option that switches the caps lock and control
keys on a pccons console keyboard.
submitted in PR 899 by Alistair G. Crooks
Note that I only did this for the US type keyboard maps.
This and all other such options should be documented, and perhaps
rennamed with consistant PCCONS_ prefixes.
1997-08-04 05:29:20 +00:00
perry 6adc9468b2 1) add Matthieu Herrb's support for iso-latin1 and non-U.S. keyboards
o option DISPLAY_ISO8859 enables the display of iso-latin1
       character set (instead of the IBM page code 437)
    o option FRENCH_KBD, GERMAN_KBD or NORVEGIAN_KBD implement
       support for national keyboards (implies DISPLAY_ISO8859).
   Originally supplied in PR #1529
2) Add option PCCONS_REAL_BS which (for US keyboards only) forces
   backspace to really be backspace and not delete. Intended to close
   PR #2264 submitted by Greg Woods. He wanted it changed for everyone
   -- I thought adding a kernel compile option was friendlier.

Note: Both of these sets of options really should be documented in an
i386 specific version of options(4).
1997-08-04 05:05:31 +00:00
fvdl 62e9894c48 Recognize some more chipsets. 1997-08-03 23:42:05 +00:00
perry 7498ff5250 Add (commented out) COM_HAYESP option, per pr-2189 from John Vinopal 1997-08-03 21:59:11 +00:00
scottr 06ac03dd55 Fix typo found by Colin Wood, PR 3934: ga_handle should get the value of
the handle, not the tag.
1997-08-03 16:44:24 +00:00
mikel 01a1b97f78 use compatID to find P&P joysticks; isapnp drivers should never use
ipa_devident or ipa_devclass to match devices, those strings are
  informational only!
1997-08-03 08:16:55 +00:00
scottr 6f33c6446c Drop splsched() to spl3(), so that it no longer blocks serial interrupts. 1997-08-03 07:20:40 +00:00
scottr 741cf383d0 Adjust prototype for ga_phys field in grfbus_attach_args. 1997-08-03 07:17:31 +00:00
scottr cd74e0d31a Adjust grf_establish() prototype. 1997-08-03 06:52:23 +00:00
scottr f4ef74ae32 Fix grf{i,m}v_phys() prototypes. 1997-08-03 06:42:29 +00:00
scottr dfa83e4861 Overhaul grf drivers to correct recent problems with X and dt
(address error faults), as well as other reported problems:

 - Simplify grfmv_phys() to work like grfiv_phys(), and eliminate the
   second argument to both, as we don't use it anyway.
 - Handle fbbase and fboff consistently throughout.  Closes PR 3862.
 - Eliminate grfaddr() by pulling it into grfmmap(), which is the
   only place it was used, previously.
 - grfmap() now gets the physical address of the framebuffer from
   the appropriate driver, rather than try to compute it by itself.
   Be careful with aligning the base to a page address and increase
   the length of the mapped region appropriately.  Closes PR 2867.
1997-08-03 06:25:56 +00:00
mikel 94dcb3ed4a sync with GENERIC version 1.88, no functional changes
kill outdated aha vs. bha comment
1997-08-03 05:30:14 +00:00
mikel b4819557ca order of devices in this file is irrelevant, so move isapnp0 up with
other buses and pair isapnp devices with isa equivalents.
1997-08-03 05:26:35 +00:00
leo 032fb7a2d9 Remove 030 support, add 060 support instead. 1997-08-02 12:12:25 +00:00
leo 6ad4ee1142 lpt -> lp 1997-08-02 10:04:44 +00:00
mark fdcef230ca Added support for built in miniroot ramdisk. Define MINIROOTSIZE to be
the number of blocks to reserve for the ramdisk.
1997-07-31 23:13:12 +00:00
mark 4f2ae66cf0 Cleaned up mmmmap(). No point in trying to support mmap of /dev/kmem since
physical addresses could be in transit.
1997-07-31 23:02:24 +00:00
augustss 658656bb99 Audio changes:
- Change the way attach and open works to allow multiple audio
	  devices.
	- Split the mulaw.c file into two to avoid dragging in mulaw
	  convertsion when they are not needed.  Add 16 bit alaw/mulaw tables.
	- Change the way audio properties are gotten.
	- Recognize more versions os SoundBlaster.
1997-07-31 22:33:08 +00:00
matt 48aa5a6912 Add lc* line for DEC EtherWORKS III (it was written initially for a
NetBSD/alpha user).
1997-07-31 22:22:08 +00:00
matt fc86c650c6 Add lc0 entry for DEC EtherWORKS III. 1997-07-31 22:03:31 +00:00
mark 6c440cc51b Support kernels up to 4MB in size (was 2MB) in initarm().
Removed some un-necessary cache synchronisations.
Call the cpu_sleep() function in an infinite loop in halt().
Removed the long dead swap specifier from rc7500 initarm().
1997-07-31 02:59:06 +00:00
mark 3f42259896 If MEMORY_DISK_IS_ROOT is defined don't bother to compiling in the code
to extract the root filesystem name from the bootargs.
1997-07-31 01:11:33 +00:00
mark 67130a7f8d Added dev/clock_subr.c to the files list. 1997-07-31 01:08:26 +00:00
mark 0e8ba1b90b Overhauled and updated to work with dev/clock_subr.[ch] 1997-07-31 01:08:01 +00:00
mark e375e0f448 Disable the reporting of the easi space timings. At podulebus attach time
the only timings we know are the ones inherited from the boot and the
drivers that will attach to the bus may change these.
Use the IS_PODULE macro for checking manufacturer and podule id's
against attach args.
1997-07-31 00:43:28 +00:00
mark 18b47c4129 Define an IS_PODULE() macro to match a podule manufacturer and id with
podulebus attach args.
1997-07-31 00:40:56 +00:00
mark d02fe01663 Comment out a load of special debug messages.
Fix the mappings of the L2 page table used to map the process page tables
so there there is no user access (was user read only access).
1997-07-31 00:36:55 +00:00
mark d50cd34639 Remove a dead version of the _MCOUNT_DECL macro. 1997-07-31 00:22:15 +00:00
mark 4d5984d00a When syncing memory and cache after modifing the text area sync only
the modified address range rather than the whole cache/memory.
1997-07-31 00:19:31 +00:00
mark 2319a993f9 Add specific checks for user space accesses to the page table area (just
above the stack).
1997-07-31 00:16:12 +00:00
mark 905a93b982 Removed several lines of unreachable code in eagetpackets().
Reset the interface every time an error is detected in eagetpackets()
otherwise the interface can end up in a jammed state.
1997-07-31 00:13:18 +00:00
mark 504ddabd38 Removed several lines of unreachable code in ebgetpackets(). 1997-07-31 00:09:48 +00:00
mark 57a231e4b6 Modified the cpu_cache_purge_ID() calls in pagemove(), vmapbuf() and
vunmapbuf(). If the address range involved is 4KB or less purge the
specific address ranges. otherwise purge the whole cache.
1997-07-31 00:08:04 +00:00
mark 50633bf9a8 Added calls to mcount() for the assembly functions here if GRPOF and
PROFILE_ASM are defined.
Added missing .data directive prior to the curpcb declaration.
Fixed the calling of the cpu sleep function in idle(). The sleep function
takes a single argument which is the sleep mode. This is currently unused
but 0 should be passed for future compatibility.
1997-07-31 00:03:54 +00:00
mark 9767e83757 If a transfer completes and we have performed a check sense, check the
sense code for zero and if found repeat the request sense. This solves
a bug in the sbic driver when accessing JAZ drives that results in
faulty sense data being returned following a transfer. A retry returns
the correct information.
This is probably showing up a more fundemental bug in the sbic driver
and will probably have to wait for a complete overhaul of the sbic
driver (planned) for a perfect fix.
Fix supplied by Rob Black <r.black@ic.ac.uk>
1997-07-31 00:00:12 +00:00
mark 258768a81d Use the cookie field in the podulebus tag (current unused) as a register
shift value thus making register more flexible.
Remove the absolute shift of 2 in all the podule read/write routines and
use the tag cookie (passed in r0) as the shift value.
1997-07-30 23:52:08 +00:00
mark 4e641ac6d1 Utilise the cookie field in the podulebus tag (currently unused) as a
register shift value.
For the podulebus_bs_tag structure set the shift to 2 (the current
hardcoded value in the actual read/write routines).
Use the cookie to provide the register shift in podulebus_subregion().
1997-07-30 23:49:54 +00:00
perry 10838cb3ff Add another bridge ID, from pr 3926 submitted by Soren S. Jorvang 1997-07-30 21:25:00 +00:00
leo 83c69491b2 Add second md device. 1997-07-30 15:45:33 +00:00
leo baa16e912c Rename lpt to lp on some places to avoid botches between files.isa and
files.atari.
1997-07-30 15:43:23 +00:00
leo 89ac8e71d2 Use a buserror handler that just tests for 'nofault' being set when the
MMU is not yet initialized. This behaviour is necessary when probing
for the machine type - because we need the type before we can setup the
tables....
1997-07-30 15:37:48 +00:00
leo b61a48cef7 Include 'locators.h' 1997-07-30 15:32:37 +00:00
veego ccd583103e Fix the doublescan mode which was broken in the last commit. 1997-07-30 11:05:55 +00:00
phil 5bc246cdb1 Add cd9660 fs and msdos fs. 1997-07-29 18:36:19 +00:00
fair fc96112975 fix editing boo-boo 1997-07-29 17:55:38 +00:00
veego 777749b558 - Remove grfvideo_mode->hblank_stop and grfvideo_mode->vblank_stop.
- Add grfvideo_mode->disp_flags to select interlace, doublescan,
  sync-on-green and horizontal/vertical sync polarity.
- Add some constants for grfvideo_mode->disp_flags.
1997-07-29 17:54:11 +00:00
veego 1d8c390628 - Change the check in r[ht]_getvmode for md->DEP == 4 to md->DEP != 4.
This fixes a wrong output from grfconfig /dev/grf[23]
- changes for the grfconfig interface:
  - Remove gv->hblank_stop and gv->vblank_stop.
  - Only print doublescan and interlace flags. Horizontal/vertical sync
    polarities are not yet supported and sync-on-green will never be
    supported.
1997-07-29 17:52:05 +00:00
veego eb3d5738b5 - changes for the grfconfig interface (provided by Ignatios Souvatzis):
- Remove gv->{hblank_stop,vblank_stop} and use the other grfvideo_mode
    values to set ba->data.
  - Add gv->disp_flags to select interlace.
  - Not yet supported are: doublescan, sync-on-green and the horizontal/vertical
    sync polarity.
  This makes it possible to use xfree values for grfconfig.
1997-07-29 17:50:01 +00:00
veego f46269ea78 - increase the number of possible grfmodes from 8 to 24
- changes for the grfconfig interface:
  - Remove gv->{hblank_stop,vblank_stop} and calculate HBE and VBE from
    gv->{htotal,vtotal}.
  - Add support for gv->disp_flags to select interlace, doublescan and
    horizontal/vertical sync polarity.
  - Return EINVAL for gv->disp_flags and sync-on-green.
  This makes it possible to use xfree values for grfconfig.
1997-07-29 17:46:24 +00:00
veego ce2e3d407b - s/inline/__inline/
- Use interrrupt #6 instead of #2. #6 is the default interrupt and there
  seems to be a problem with Cyberstorm 060 and #2.
- Set the interrupt register before enabling the interrupt.
- GC M2INS
- minor cleanup
- Switch from +hsync/+vsync to -hsync/-vsync.
- changes for the grfconfig interface:
  - Remove gv->{hblank_stop,vblank_stop} and calculate HBE and VBE from
    gv->{htotal,vtotal}.
  - Add support for gv->disp_flags to select interlace, doublescan and
    horizontal/vertical sync polarity.
  - Return EINVAL for gv->disp_flags and sync-on-green.
  This makes it possible to use xfree values for grfconfig.
1997-07-29 17:44:20 +00:00
veego 8b5fbedb3c s/inline/__inline/ 1997-07-29 17:42:03 +00:00
christos 832c3f464d If we have xms print the xms memory size, and indicate that this is xms
memory in the banner. It is confusing to show 0 memory...
1997-07-29 16:01:45 +00:00
fair d074ca9f6e %x -> 0x%x 1997-07-29 10:09:51 +00:00
fair b4750d5084 missed %lx -> 0x%lx 1997-07-29 10:04:44 +00:00
fair 4c351f243e %x -> 0x%x 1997-07-29 09:58:04 +00:00
fair 53adf300b3 %x -> 0x%x 1997-07-29 09:41:53 +00:00
fair 7a06252f07 %x -> 0x%x, fixes for PR#3757 1997-07-29 06:43:51 +00:00
fair bb5815cc39 fix compiler warnings; %x -> 0x%x; add arg to panic in change_pte appropriate to format string; see PR#3757 1997-07-29 06:41:35 +00:00
mark 74bac48941 In wdcprobe() fail if the iobase defaulted rather than being specified in
the locators.
In wdcprobe_internal() set the WDCF_32BIT flag if the data32 io handle
is set.
All transfers to and from the data register now check for softc flags
to see if 32 bit transfers are enabled i.e. reading drive parameters
and doing a dump will use 32 bit transfers as well.
1997-07-29 01:59:20 +00:00
mhitch b4af013102 Resident count in pmap is now valid. I can now see RSS in ps. 1997-07-29 01:43:26 +00:00
mhitch fd5f2fd062 Get rid of the MIPS3 mess I left in pmap_enter_pv(). The cache inhibit
of cache-index incompatible virtual mappings for a physical page may be
required for hardware without secondary (level 2) cache to detect and
correct virtual coherency problems.  I'm not sure this is really needed
anymore, since pmap_prefer() took care of of the cache-index
incompatible mappings that I have seen.  Count the times a page is
cache inhibited in enter_stats if DEBUG.

Wait for memory instead of panic() on failure to allocate a page for the
segtab or segmap [from OpenBSD arc port].  Also check for malloc()
failure on allocation of a new pv entry and panic().

Increment resident_count when adding a new page to a pmap [also from
OpenBSD].  Process resident size is now valid.
1997-07-29 01:41:46 +00:00
mark 27646ce7d4 Keep note on when we are in postmortem() in order to avoid being
recursively called.
1997-07-29 01:37:30 +00:00
mark 02c17d67e3 Remove some redundant .global directives as ENTRY() macro includes
this anyway.
1997-07-29 01:20:34 +00:00
mark 0e187069c2 The cpu_cahce_*_rng() functions take a start address and a length rather
than a start address and end address so reflect this in the macros and
prototypes.
1997-07-29 01:18:29 +00:00
mhitch dfca3a7721 Add disk and tape devices for a second ASC SCSI option card. 1997-07-29 00:54:22 +00:00
perry 6473705cc6 disable the wt device for now -- it nukes ed devices too easily 1997-07-29 00:42:38 +00:00
perry 6d47f9593e comment out mcd for now -- it causes people too much trouble during installs 1997-07-28 22:58:21 +00:00
ragge 23e157b82b Handle XFC instruction faults. 1997-07-28 21:48:33 +00:00
mhitch cd0f6f6375 Add the PMAZ SCSI option. 1997-07-28 21:37:38 +00:00
augustss a63034762b Audio: Remove the machine dependant code I put in audio.c by mistake.
This adds another method to audio_hw_if.  Also remove a field from
audio_hw_if that was not read-only.
1997-07-28 20:56:05 +00:00
jonathan 98d9a419f8 Add comments to pmap_copy_page() and pmap_zero_page() describing the
cache flush operations required on a virtually-indexed, physically-tagged
mips3 with no L2 cache to provide cache-coherence exceptions.

(Similar to what's needed with a virtually-indexed, virtually-tagged cache.)
1997-07-28 20:41:58 +00:00
mhitch b3724cd5cd Add disk and tape devices for a second ASC controller. 1997-07-28 19:56:36 +00:00
mhitch 32060ee91a If the IOASIC ASC SCSI driver is not doing buffered DMA, don't allocate
the buffer memory (recovers 112K of memory!).
1997-07-28 19:40:44 +00:00
is d8e09ca5ea Align some comments, so that I'll be able to track changes better. 1997-07-28 19:01:13 +00:00
mark 716c89ccb2 Include locators.h for the definition MAINBUSCF_BASE_DEFAULT.
In the probe routines check the mainbus attach args mb_iobase field
to verify that the iobase did not default as an iobase address needs
to be specifically specified.
1997-07-28 18:07:03 +00:00
mark d34422f375 In iicmatch() fail the probe if the mainbus attach args iobase is equal to
MAINBUSCF_BASE_DEFAULT as an explicit iobase must be specified.
In iicsubmatch() fail the match if the iic address locator defaulted.
1997-07-28 18:01:49 +00:00
mark 03409a1eb4 Pass MAINBUSCF_BASE_DEFAULT in the mb_iobase field if none is specified
in the locators.
In mainbusprint() only print the iobase if it is not the default.
1997-07-28 17:58:56 +00:00
mark 73d4af0688 Support a boot option asc.hostid= to allow the adapter target ID to
be set.
1997-07-28 17:56:27 +00:00
mark fc9ce1cfd8 Recognise both Icubed and Acorn versions of the EtherH netslot card as
they have different podule ID's.
Always attach the driver even if it appears to fail the tx test as there
appear to be a collection of cards around that will fail this tx test but
will actually work ok - This problem needs further investigation.
1997-07-28 17:54:07 +00:00
mark d910d89af8 Rebuilt from podules rev 1.6. 1997-07-28 17:48:45 +00:00
mark be04b11f72 Added various new podule manufacturer ID's and product ID's. 1997-07-28 17:47:53 +00:00
augustss d828d675e3 Update forgotten audio driver for changes in audio_hw_if. 1997-07-28 10:04:35 +00:00
augustss d58bc6796f audio: Simplify handling of AUDIO_SETFD and committing of encoding mode. 1997-07-27 23:51:48 +00:00
augustss 9745684ebe Changes to the sudio system:
- It is now possible to handle devices that want "looping" DMA,
    e.g. the SoundBlaster correctly.  The WSS and SB drivers use this.
    To do this several new methods were introduced in audio_hw_if.
  - Different silence handling (forced by previous change).
  - The audio driver can now be mmap()-ed, but due to problems in
    the VM system only for writing for now.
  - The OSS (Linux) audio emulation takes advantage of some of the
    new features.
1997-07-27 01:16:32 +00:00
is 3ca46d33e1 Lowering spl when doing disk I/O below splbio() isnt recommended. 1997-07-26 22:07:54 +00:00
mhitch 8e145a319b Don't rely on curproc to access the current pcb when testing for kernel
faults.  Use curpcb, which always points to the current pcb.  If curproc
was NULL when the kernel faulted, the trap handling would fault recursively
and the kernel stack would overflow.
1997-07-26 19:46:40 +00:00
scottr e083a60af2 KNF 1997-07-26 18:13:30 +00:00
drochner d900f01e01 Don't call kernel debugger on CTL-ALT-ESC hotkey if the keyboard doesn't
belong to the actual console. (ie, we have a serial console)
Closes PR port-i386/3131.
1997-07-26 12:32:24 +00:00
ragge ab4412faad Actually do 'halt' or 'reboot' on MicroVAX. 1997-07-26 10:12:40 +00:00
scottr ef8ecc05da cli_offset should be a bus_size_t now, and cli_value is an unsigned 32-bit int. 1997-07-26 08:28:20 +00:00
scottr f65445ce80 Add support for Macintosh Display Card, using information provided
by Taras Ivanenko <ivanenko@ctpa03.mit.edu> in PR 3862.  (The PR
is still open, due to an unresolved issue regarding the fbbase
field.)
1997-07-26 08:21:15 +00:00
thorpej e31d380775 New welcome banner code, modeled after NetBSD/hp300's boot program
welcome banner code.  Includes additional build information, and it
generally nicer to look at.
1997-07-26 01:50:36 +00:00
scottr 5825a3f29c Add option-{1,2,3} as an alternative to option-{,left,right} for mouse
button emulation.  From SUNAGAWA Keiki <kei_sun@ba2.so-net.or.jp> in
PR 3887.
1997-07-25 23:08:15 +00:00
ragge b17d1e7207 Fixed bug causing machines with a memory size not a multiple of 16k
to crash. This is true on many MicroVAXen.
1997-07-25 21:54:48 +00:00
jonathan f9e3ce0f92 revert to MI in_cksum code. 1997-07-25 21:01:45 +00:00
scottr 0f06fa608f Add NETATALK, and be pedantic with a few comments. 1997-07-25 19:53:59 +00:00
cgd bd3cab1531 fix comment glitch in the last change 1997-07-25 07:01:42 +00:00
cgd d86134ca68 fill in the new pointers in the bootinfo_v1 structure. 1997-07-25 07:00:42 +00:00
cgd 395f4bac6b clean up bootinfo structure comments so they're more readable (to me,
at least 8-).  Add structure offssets for structure members, so we
know how much space we're using.  Make the version in the bootinfo
structure be a u_long, so there's no implicit padding in the structure.
Add a few more pointers to the bootinfo v1 structure, which will all
be set to NULL for now.
1997-07-25 06:59:47 +00:00
thorpej 8e341ad358 If loading an Elf kernel, load the symbol table immediately after
the kernel image.
1997-07-25 00:09:01 +00:00
thorpej f65454b2a6 Set up a version 1 bootinfo for the kernel. 1997-07-25 00:07:56 +00:00
thorpej f56c3c315f More DDB support:
- Add support for software single-stepping (Alpha does not have hardware
  support for single-stepping)
- Alpha uses Elf64 symbols.
1997-07-25 00:06:25 +00:00
thorpej 08d4c7e688 Update alpha_init() prototype; takes two more args. 1997-07-25 00:04:36 +00:00
thorpej 264f1c5acc Define the bootinfo magic number and bootinfo (version 1) structure. 1997-07-25 00:03:47 +00:00
thorpej 4d01f6fbee Add some DDB glue:
- Allow BUGCHK and BPT instruction faults in kernel mode if DDB is enabled,
  since they are used to invoke the debugger.
- Add a comment about how we'd like to invoke DDB on a trap panic condition,
  in a perfect world.
1997-07-24 23:55:01 +00:00
thorpej 020d0208d7 - Two additional arguments to alpha_init(): bootinfo magic number, and
pointer to boot program's bootinfo structure.  If the bootinfo magic
  matches, save a copy of the bootinfo structure, and use it to determine
  booted kernel name, the boot flags, and the location of the kernel symbol
  table.  If the magic number does not match, revert to the old method
  of finding this information (sans symbol table info).
- Add some additonal DDB glue.
1997-07-24 23:52:10 +00:00
scottr 35884534c1 Remove HOSTED_* targets; define and use CPP and SIZE symbols, as inspired
by cgd's recent changes for the Alpha port.
1997-07-24 05:48:51 +00:00
scottr 0755be1f84 Use optimized _splraise() implementation, from mac68k/intr.h 1997-07-24 05:43:08 +00:00
is 449feee671 Fix the mess I apparently have done committing 1.52 of autoconf.c
In particular: add back the 1.50->1.51 change, and add back Amiga audio.
Thanks to Thorsten Frueauf, who pointed this out in PR 3911.
1997-07-23 10:47:12 +00:00
is 181debe530 Fix a complaint by Eric Delcamp on port-amiga... looks like Thorsten Fruehauf
didn't find all occurences of unprotected is_draco(), and I didn't look hard
enough, either, when fixing.
1997-07-23 10:19:42 +00:00
cgd cfe8f450c7 update these to use the new 'correct' names for functions/constants
in bus.h.
1997-07-23 08:05:36 +00:00
cgd 9fae9984b0 remove a couple of outdated comments (pointed out by Kenneth Stailey 1997-07-23 07:56:05 +00:00
cgd 28b1691f4d when i was documenting the bus_space interfaces (the document
was sent to developers, but will eventually become a man page or
something), i noticed a few in various names:
(1) _map and _alloc should take a flags argument, rather than a
    'cacheable' boolean.
(2) BUS_BARRIER_* flags should be BUS_SPACE_BARRIER_*.
(3) bus_space_copy_* should be bus_space_copy_region_* for consistency
    with other region ops.
Fix all of these (in a backward-compatible way, at least for now).  Redefine
internal usees of those names to use the new names.  Also, while at it,
clean up the copy functions (remove unnecessary variables) and make sure
that they and other functions conform to the spec.
1997-07-23 07:47:51 +00:00
scottr ef7df42303 Since spltty() will not lower the spl, only raise it, we need to
use splx() to undo the effect of the splzs() in zstty_softint().
1997-07-23 07:20:01 +00:00
scottr 3518ffabce The PA of the framebuffer may not be page aligned, so make sure to
do this before comparing against the result of pmap_extract().
1997-07-23 07:17:52 +00:00
cgd 391589011c note differences in symbol names between ports (underscores). Also,
don't assume that the names/values to be put into defines in assym.h
start with the first .ascii in the assembler file; look for the array
start symbol, instead.
1997-07-23 07:06:59 +00:00
scottr c2362b1d29 Remove unused option MAPMEM, as suggested by Erik Bertelsen
<erik@erik-be.uni-c.dk> in PR 3896.  Also, revert to MRG_ADB
(for now), disable NETATALK, and remove unused drivers.
1997-07-23 06:42:40 +00:00
scottr 1a5689c4af Remove unused option MAPMEM, as suggested by Erik Bertelsen
<erik@erik-be.uni-c.dk> in PR 3896.
1997-07-23 06:36:59 +00:00
scottr ec622ce63c GC unused MMSEG definition, from Erik Bertelsen <erik@erik-be.uni-c.dk>.
Closes PR 3898.
1997-07-23 06:33:53 +00:00
scottr 257d26f174 New implementation of _splraise(): use word-length operands where possible
by implementing entirely in assembly.  This saves some 6 bytes on all MPUs,
and about 8 cycles on the 030.

Now that it's optimized, define spltty() in terms of _splraise() so that
we don't inadvertantly lower the SPL.
1997-07-23 06:24:33 +00:00
cgd 306cb0bd7e clean up RCS id. also, use __RCSID rather than __KERNEL_RCSID, since
this file isn't actually compiled into the kernel.
1997-07-23 06:23:14 +00:00
cgd ee60040e78 clean up rcs id 1997-07-23 06:21:57 +00:00
jonathan 83ebfc3545 Unroll pmap_copy_page() and pmap_zero_page() inlined loops even further. 1997-07-23 05:41:17 +00:00
jonathan b1032ac9db Substitute Mach 3.0 MK84 mips kernel bcopy() for Sprite bcopy().
Has unrolled loop for aligned-to-aligned copy.

Notes:
  1. this code tuned for DEC 5000/200.  ioasic decstations do more unaligned
     copies.  Better than old non-unrolled loop, but could be improved.

  2. Undoes changes made for MIPS3 with comment implying an r4000 TLB bug.
     We can't reproduce this on 5000/150 (jonathan) or 5000/50 (mhitch).
     Calls to previous  bcopy with a bad address show similar symptoms,
     reporting a trap in bcopy() after bcopy() has returned.  Same thing??
     Needs re-checking on an r4000 with no L2 cache.
1997-07-23 05:36:40 +00:00
kleink 97db364868 a2kbbc_match(): check unit explicitly against 0. Minor KNF. 1997-07-22 23:12:13 +00:00
pk 5a47438604 Add some missing entries. Make SINTR_VME()/SINTR_SBUS() more useful. 1997-07-22 20:19:10 +00:00
jonathan 7d9e8102ad Use new <dev/dec/clockvar.h> and and <dev/dec/mcclokvar.h>.
Garbage-collect original headers from sys/arch/alpha.
1997-07-22 18:50:52 +00:00
phil b6a75eabb2 Add "#file-system UNION" as per PR 1032. (Should mvme68k have a
GENERIC conf file with "everything?")
1997-07-22 18:49:21 +00:00
drochner bdb232d2b6 Don't use <lib/libsa/if_ether.h> anymore. This was a copy of the
old (before ARP changes) <netinet/if_ether.h>, intended for
temporary use.
1997-07-22 17:41:01 +00:00
kleink ac7da90b83 Remove old *_UNK style default defines, use standard names from locators.h.
Missed in "locators.h" cleanup; reported by Thorsten Frueauf in PR 3906.
1997-07-22 15:20:20 +00:00
is b3567b75c3 Fix PR 3907 by Thorsten Frueauf, using his first method. 1997-07-22 15:03:22 +00:00
mark c025aad597 Implement __indr_reference macro. 1997-07-22 14:35:22 +00:00
jonathan c5be7fca38 NEWCONF was prototype ``new config'' pmax kernel config file. Now obsolete. 1997-07-22 08:54:40 +00:00
jonathan 3234955c06 Identical to NFSINSTALL, bar comments. 1997-07-22 08:49:56 +00:00
jonathan e8414333ac Merge NFSROOT and NFSINSTALL. 1997-07-22 08:49:11 +00:00