Commit Graph

793 Commits

Author SHA1 Message Date
jonathan 3d2676b809 Garbage-collect '#include <machine/pte.h>'. 1997-06-16 23:52:06 +00:00
jonathan fef3e76b31 Changes for configuring both MIPS1 and MIPS3, from a merge of
similar design and code by Jason Thorpe and Jonathan Stone.

NOTE: the kernel-stack-switching code and cacheflush() calls in
locore.S still use #ifdef MIPS3 and need more work.

mips/include/cpu.h:
    Add CPUISMIPS3 for run-time tests of what CPU architecture level
    we're running on.

mips/include/locore.h:
    Add declarations of locore cache-size variables for ref/def toolchain.

mips/include/mips1_pte.h:
    mips1 TLB bit definitions.

mips/include/mips3_pte.h:
    mips3 TLB bit definitions.

mips/include/pte.h:
    define accesor macros for TLB bits (e.g., mips_pg_m_bit(),
    that expand to CPU constants if only one CPU arch is configured,
    or to inline functions if both MIPS1 and MIPS3 are configured.

mips/mips/locore_r2000.S:
    Use MIPS1_PG_xxx constants inside mips1-specific code.

mips/mips/locore_r4000.S:
    Use MIPS3_PG_xxx constants inside mips3-specific code.

mips/mips/locore.S:
    Use MIPS1_PG_xxx constants inside mips3-specific code.
    Use MIPS1_PG_xxx constants inside mips1-specific code.
    (Needs more  work!)

mips/mips/{pmap.c,vm_machdep.c,trap.c}, pmax/pmax/machdep.c:
    Use MIPS3_PG_xxx constants inside mips3-specific functions,
         and MIPS1_PG_XXX inside mips1-specific code.
    Otherwise, use mips_pg_XXX_bit() macros where they apply,
    and use "if (CPUISMIPS3) { ... } else {... }" where they don't.

mips/mips/mips_machdep.c:
    Import Michael Hitch's fixes from the pmax locore-init code
    into mips_vector_init().

pmax/pmax/machdep.c:
    Use generic mips_vector_init() locore vector-init function.
1997-06-16 23:41:40 +00:00
jonathan 2eec9b0bc3 Back out previous change:
Add placeholder for Ted Lemon's years-old-but-new cursor-movment range checks.
1997-06-16 09:53:14 +00:00
jonathan eb1d8427cc Garbage-collect redundant declarations:
mips/include/locore.h:
  Add prototypes for HitFlushDCache() functions. Moe cpu_prid definition here.
mips/include/cpu.h:
  remove  cpu_prid definition.
pmax/pmax/machdep.c:
   remove local protoypes of HitFlushDCache() functions.
mips/mips/vm_machdep.c, mips/mips/vm_machdep.c::
   remove local protoypes of HitFlushDCache() functions.
1997-06-16 09:50:26 +00:00
jonathan b0e19a6a74 Set model string for 5000/150 (kmin with r4000 daughterboard). 1997-06-16 09:19:25 +00:00
jonathan 2d10220f8f Yet more mips1/mips3 merging:
Move mips-specific pmap definitions (PMAP_PREFER for mips3, declaratin
of pmap_bootstrap() for the system-specific machdep.c) from
arch/pmax/include/pmap.h to arch/mips/include/pmap.h.
1997-06-16 07:47:42 +00:00
jonathan 5db35a8cce Yet more merging:
* Move declaration of locore communcation variables (CPU family,
     cache sizes, etc) to mips/include/locore.h.  Delete from
     pmax/include/cpu.h and older versions from pica/include/cpu.h.

   * Move definitions of CLKF_BASEPRI, CLKF_USERMODE to mips/include/cpu.
   * Delete duplicate definitions in pica/include/cpu.h, pmax/include/cpu.h.
1997-06-16 06:17:25 +00:00
jonathan 3409ae8dcd Garbage-collect <machine/locore.h> 1997-06-16 04:30:15 +00:00
jonathan 157d46c672 Commit addition of `#include <mips/locore.h>' to pmax/include.bus.h. 1997-06-16 04:22:15 +00:00
jonathan c34f92cbd1 <machine/locore.h> -> <machine/bus.h> 1997-06-16 04:18:57 +00:00
jonathan 2557a6fa43 GC more old header files:
<machine/locore.h> -> <mips/locore.h>
    <machine/mips_opcode.h> -> <mips/mips_opcode..h>
1997-06-16 03:29:07 +00:00
jonathan f4dc901780 Use #include <machine/bus.h> in pmax device drivers.
Garbage-collect `#include <pmax/locore.h>' lines.
1997-06-16 02:53:23 +00:00
jonathan 817af928bf Add placeholder for Ted Lemon's years-old-but-new cursor-movment range checks. 1997-06-16 02:18:47 +00:00
jonathan cd48c79960 Remove the machConst.h (wrapper for Sprite-derived source), and all
#includes <machine/machConst.h> uses.
Other header files now include <mips/cpuregs.h> where necessary.
1997-06-16 01:45:05 +00:00
jonathan c6b9463cd1 Remove all references to <machine/machAsmDefs.h>.
Use #include <mips/asm.h> instead.
1997-06-16 01:23:56 +00:00
jonathan f8b757f8f4 Remove. Already copied to arch/mips/mips/fp.S. 1997-06-16 01:14:50 +00:00
jonathan 15628b2d97 Move merged pmax psl.h with mips1/mips3 support to mips/include/psl.h.
Change pmax/include/psl.h to just do #include <mips/psl.h>.

pmax/include/psl.h would go away completely if it wasn't stil required
by compat/common/kern_exit_43.c.
1997-06-16 01:10:03 +00:00
jonathan 8e5f767c50 Use generic MIPS pmap vm_machdep.c 1997-06-16 00:35:10 +00:00
jonathan 5d94de1a79 Moved to arch/mips/mips/ with CVS revsion history. 1997-06-16 00:17:27 +00:00
jonathan 747e2b5e7e Generic mips pmap/vm code: move the merged pmax mips1/mips3 vm_machdep
and pmap code to arch/mips/mips.
Use <mips/XXX.h> header files, not <machine/XXX.h>.
1997-06-16 00:16:08 +00:00
jonathan 8a00c90491 Remove old 4.4bsd/pmax rules and targets. 1997-06-15 22:53:49 +00:00
mhitch ab0eff4a87 From Toru Nishimura: _FORKBRAINDAMAGE is gone, user process entered through
proc_trampoline().
More merged MIPS1/MIPS3 support.
1997-06-15 18:21:17 +00:00
mhitch f42f8eb4e6 More merged MIPS1/MIPS3 support - from pica pmap.c 1997-06-15 18:19:47 +00:00
mhitch bbd8bca4a4 More merged MIPS1/MIPS3 support for DECstations.
From Toru Nishimura: separate out FP registers in user pcb.
1997-06-15 18:18:57 +00:00
mhitch 4eb69e0839 DECstation MIPS3 support: wbflush() is cpu-dependent, need declaration from
machine/locore.h.
1997-06-15 18:03:24 +00:00
mhitch 76f5c2a6c6 More merged MIPS1/MIPS3 support for DECstations. 1997-06-15 18:02:20 +00:00
mhitch 74245805bb DECstation MIPS3 support: wbflush() is cpu-dependent, need declaration from
machine/locore.h.
1997-06-15 17:58:56 +00:00
mhitch 4ccdbb1c9e Don't return error status on recoverable errors 1997-06-15 17:17:07 +00:00
mhitch 0a9912635f From Toru Nishimura: don't assemble pmax buffer copy routine if not
configured for DS2100/DS3100.
1997-06-15 16:57:57 +00:00
mhitch 8059cbb275 Use TC_SPEED* for turbochannel speed values (keeps me from being confused
more than I am).
1997-06-15 16:53:40 +00:00
mhitch 56b72a34f3 Since locore_r2000.S and locore_r4000.S are included by locore.S, they need
to be included in the dependency list for locore.o.
1997-06-15 16:27:47 +00:00
mhitch d2ce63e3bc DECstation MIPS3 support: a GENERIC config file for the R4000/R4400-based
DECstations.
1997-06-15 16:21:19 +00:00
mhitch 074ad77297 Correct an #endif comment to match the #if comment. 1997-06-15 16:18:29 +00:00
jonathan 62e846995f findroot() fix for kernels configured "root on ? type ?" (i.e., disk)
that are booted via MOP or tftp:: if we don't find a block device name
that matches bootdev, give up and let setroot() force RB_ASKNAME.
1997-06-15 11:23:52 +00:00
jonathan 957e3b4622 Turn on -Wall -Weror and -Wstrict-prototypes -Wmissing-prototypes.
Turn off warnings for uninitialized variables to avoid spurious warnings.
1997-06-15 01:20:59 +00:00
mrg 1258c8d25b remove now obsolete "swap on..." lines. 1997-06-12 18:41:58 +00:00
mrg 552af779d2 bring mrg-vm-swap2 onto mainilne. 1997-06-12 15:46:19 +00:00
jonathan 19e4111ef7 Move the mips sys_machdep.c from pmax/pmax to mips/mips, to enforce a
common sysarch on all mips ports.
1997-06-09 02:14:56 +00:00
veego a204fb7981 Initialize machine from MACHINE. 1997-06-08 23:54:19 +00:00
jonathan ccc08d5a61 Move MACHINE_ARCH and _MACHINE_ARCH from pmax/include/param.h to
mips/include/mips_param.h.  (They should be common to all mips ports.)
1997-06-08 10:46:01 +00:00
jonathan 0a875d4298 A pre-busdma pmax <bus.h> skeleton. 1997-06-08 05:10:25 +00:00
jonathan 3844d313b1 Add CD9660 and PROCFS filesystems. Sort filesystem options.
Add tun, and reorder pseudo-devices to match other systems' GENERIC config.
1997-06-01 08:44:57 +00:00
mhitch ad9b4015c2 Comment out the dc0 at mainbus0: that attempts to include the DS3100 dc
device attachment.  The 3max dc0 device attaches to the pretended IOASIC.
1997-05-31 20:45:07 +00:00
mhitch 122ef4a659 -Wall cleanup when compiling without all DECstation models defined. 1997-05-31 20:33:30 +00:00
jonathan 3906c8cde5 Fix possible uninitialized variable bug which trips -Wall. When
recovering from a possible race condition in sii_intr, read the active
target from the destat register, and set the softc state pointer
`state' appropriately.  (This warning is in a block that prints a
warning message, and the warning message has _never_ been seen. The
bug is probably innocuous.)

Also addresses the `more thought needed' in the log message for rev. 1.12.
1997-05-29 19:26:06 +00:00
mhitch fe468f64bc Include pm_ds.c if pm_ds, not dc_ds - dc_ds gets set for the 5000/200 as
well as the 3100, but trying to include pm_ds.c for a 5000/200-only
configuration fails.
1997-05-29 03:08:40 +00:00
mhitch 660cdaec8a Use the generic root/swap in the model-specific configuration files. 1997-05-29 02:22:27 +00:00
jonathan ceff1980b7 lint: Add prototypes for the redirection hoks used for rcons/4.3bsd
qvss-style in-kernel X inputevent processing.
This whole interface should be replaced with wscons.
1997-05-28 14:21:39 +00:00
jonathan ed8e9558ab Lint: printf formats inside #ifdef DEBUG (long vs int, %x vs pointer).
Add XXX to inconsistency: sometimes pmap.c calls blkclr(), sometimes it uses
an inline C loop tuned for 4-entry writebuffer.  Why?
1997-05-26 23:02:11 +00:00
jonathan 03bb8c9b9e lint: #ifdef DEBUG code: use %p for pointers, %ld for vm_offset_t's. 1997-05-26 06:21:20 +00:00
jonathan 0978222b09 lint:#ifdef DEBUG code. Add parens where requested, Prototype stacktrace(). 1997-05-26 02:25:58 +00:00
jonathan d21acac556 Create standard Makefile for arch/pmax/stand.
Copy old Makefile with bootblock rules to Makefile.booters.
1997-05-25 22:03:23 +00:00
jonathan 40b20f7799 Move dec_label into a subdir. 1997-05-25 21:39:08 +00:00
jonathan e319f99e4b lint: include header files with declarations of input-redirect hooks.
Add prototypes and explicit casts where the hooks are polymorphic.
This whole interface should be replaced with wscons.
1997-05-25 10:53:33 +00:00
jonathan 4cf3fe8b78 lint: add prototype for pmax serial-console inithook. 1997-05-25 10:28:22 +00:00
jonathan 2548f9ceee lint: add prototype for kvtophys(). 1997-05-25 10:16:17 +00:00
jonathan 59c42b27b1 Lint: use new headers with prototypes. Add local prototypes for
locore spl functions; they should only be lint used directly here.
Delete  unused variables, etc.
1997-05-25 10:07:38 +00:00
jonathan 5520aec6bb Oops, #include <machine/autoconf.h> after previous change. 1997-05-25 08:17:00 +00:00
jonathan 88787ea86a Lint: machdep.c calls configure() and makebootdev().
Move their declaratinos to pmax/autoconf.h.
1997-05-25 06:10:46 +00:00
jonathan 19743d60e1 Lint: add prototype for badaddr() (the expansion of tc_badaddr). 1997-05-25 05:58:36 +00:00
jonathan c17d51a55d Add (bogus) prototype for tcinfo() PROM callback until we know what it is. 1997-05-25 05:44:13 +00:00
jonathan a2051af8b9 RCSid police. Delete obsolete function-scope extern declarations. 1997-05-25 05:26:00 +00:00
jonathan cedd6dbe25 Lint: move forward declarations to beginning of file and protoize.
delete unused variables and add redundant parens where suggested.
1997-05-25 05:19:51 +00:00
jonathan a0600d7d94 Prototype for pmap_bootstrap(). 1997-05-25 05:04:03 +00:00
jonathan 03953c0e63 Apply NetBSD-1.2 name changes to pmax board-specific trap handler declarations. 1997-05-25 05:01:51 +00:00
jonathan 352da01442 Remove #ifdef NDTOP/#endif wrapper, not needed with new config.
Annotate strange #includes (dcreg.h?).
1997-05-25 04:58:36 +00:00
jonathan 42ad3d85be Move prototypes for X11-upcall hooks to dtopvar.h, for the benefit of
the Ultrix framebuffer-API compatibility code.
1997-05-25 04:49:59 +00:00
jonathan ce0a173bf6 Add prototypes for device-specific handlers and input-event (X11) upcalls. 1997-05-25 02:37:55 +00:00
jonathan a9700d60e4 lint: add missing %d (unit number of unconfigurable device) to panic msg. 1997-05-24 09:37:45 +00:00
jonathan 52afc81f2a lint: delete unused variable 'dv'. 1997-05-24 09:32:34 +00:00
jonathan c0c7efb178 Delint debugging-printf() macro. 1997-05-24 09:30:27 +00:00
jonathan 588324e3fb Lint: include prototypes for TurboChannel framebuffer console-init functions.
include prototype for printf() and panic() and delint calls.
1997-05-24 09:17:24 +00:00
jonathan d617788337 Fix typos in prototypes of console-init entrypoints. 1997-05-24 09:15:46 +00:00
jonathan 8f17cfaec1 Add 'needs-flag' to pmax, 3max dc (DZ-11 clone) front-ends (dc_ds, dc_ioasic
respectively), so console setup code can test forconfiguration of the
correct front-end (via NDC_DC and NDC_IOASIC, respectively).

Delete 'needs-flags' from dc.c.  GC obsolete uses of NDC, "dc.h".
1997-05-24 08:19:44 +00:00
jonathan 20e5e29aef Use a ldscript to work around `features' (not enough section headers)
when linking kernels with GNU binutils-2.7 or newer ld.
1997-05-24 05:56:06 +00:00
jonathan 02b403c0bf #ifdef notyet out the as-yet-Undefined bold mode, instead of commenting it out. 1997-05-24 05:49:22 +00:00
jonathan 5cf71bf343 Add declarations and cdevsw/bdevsw entries for cd, ccd, ss, uk, tun. 1997-05-24 05:28:17 +00:00
mhitch 0db8e55935 DMA state was not getting saved if dmaCurPhase was data-out. If the
message-in was a save data pointer, the driver would loop in the
interrupt routine.
1997-05-22 03:26:16 +00:00
jonathan d212e8744e Include "rasterconsole.h" to get definition of NRASTERCONSOLE (rcons flag).
Don't try rcons on 3100s with keyboards if rcons isn't configured,
1997-05-21 19:41:08 +00:00
jonathan b088f1b7fd Change default le entry from "le*" to "le0" so GENERIC kernels
configure the pmin/pmax (2100/3100) baseboard ethernet as le0, not le1.
1997-05-20 08:36:42 +00:00
jonathan 1175a38b7f Use cpu_splXXX() functions to enforce the required ordering of spl()s. 1997-05-19 23:34:40 +00:00
mhitch 8e9925b45b Eliminate vm_pmap. 1997-05-18 17:26:30 +00:00
mellon dcf4d707a4 Only compile in rcons tests if rcons pseudo-device was declared 1997-05-15 16:43:36 +00:00
mellon d3c5a81e19 Don't do rcons-specific things if no rcons pseudo-device was declared. Clean up probe-time printfs. 1997-05-15 07:24:37 +00:00
jonathan d592c85696 The pmax interrupt handlers were re-enabling clock interrupts ASAP after
hardclock() is called. Now, only do so if clock intrs were enabled beforehand.
1997-05-15 05:03:42 +00:00
jonathan 13f3645083 Merge in changes from Alpha scc driver with RCS log message:
>  revision 1.33
>  date: 1997/05/15 02:15:55;  author: thorpej;  state: Exp;  lines: +8 -4
>  - In sccmatch(), check any user-specified offset, allowing scc unit numbers
>  to be nailed down.  From Ken Hornstein <kenh@cmf.nrl.navy.mil>, PR #3626,
>  slightly modified to allow wildcarded offsets.
>  - Blow away the cf->cf_unit check in sccmatch(); it's bogus.

Also gc usused references to  NSCC and #include "scc.h"
1997-05-15 04:49:32 +00:00
jonathan a72c2263f5 Change `needs-count' on scc to `needs-flag': should have been `needs-flag'
since rev 1.18  of pmax/tc/scc.c.
1997-05-15 04:42:12 +00:00
jonathan 3480029167 Add `offset' locator to ioasic-attached devices, for compatibility with
the ioasic_submatch() used in drivers shared by pmax and alpha ports.
1997-05-15 00:43:22 +00:00
mycroft 84bca5d679 Don't use _SUBDIRUSE outside of bsd.subdir.mk. 1997-05-07 17:28:47 +00:00
jonathan d6611ebcef * Add fixes for possibly-uninitialized variables from rev 1.11.
(The operator-precdence changes in 1.11 were pulled up in rev 1.14).

* If the chip asserts a SCSI-bus error (SII_BER) in sii_intr,
  reset the SII_BER bit instead   of ignoring it.
  XXX SII_BER May need checking and resetting elsewhere.
1997-04-29 01:58:38 +00:00
jonathan 26adc250c2 Stop ignoring DCD transitions on ioasic SCC serial lines.
From entropy@zippy.bernstein.com>.
1997-04-26 02:26:54 +00:00
jonathan 45d369d5fb Ted Lemon's (RR 3540) cross-compilation patch: use ${SIZE} instead of size,
Also add "SIZE=? size",  so that native kernel compiles work, too.
1997-04-26 02:20:59 +00:00
jonathan 55a34d0cf4 Add "options MIPS1" and delete commented-out lines inherited from GENERIC. 1997-04-26 01:35:41 +00:00
jonathan 902f17af37 Correct sense of fi->fi_blanked in bt455_video_off(). 1997-04-19 08:25:31 +00:00
jonathan 22d3d9819d Correct sense of FBIO[GS]VIDEO ioctl as noted in PR #3515. 1997-04-19 08:21:59 +00:00
jonathan 4ecce8621c * 2048 bytes between vertically-adjacent pixels on 1280x1024 mfb.
Fixes broken blitting from rcons.
* Put back old 4.4bsd range test on cursor movement.  1.2 code is broken.
* Disable screensaver, it reportedly never comes back on properly.
1997-04-10 08:37:54 +00:00
thorpej cb24b0200a Don't allocate mclrefcnt[]; it's dead and gone. 1997-03-27 21:01:20 +00:00
gwr 37b247edde Renames: /dumpconf/cpu_dumpconf/, /boot/cpu_reboot/ 1997-03-26 22:42:13 +00:00
gwr 71e43d14ab Move findroot/setroot stuff from configure() to cpu_rootconf(). 1997-03-26 22:38:40 +00:00
jonathan 3f9bb9b9e8 Add <if_media.h>, am7990var.h requires it. 1997-03-25 19:06:02 +00:00