CVS log for src/sys/arch/mac68k/nubus/nubus.c

Up to [cvs.NetBSD.org] / src / sys / arch / mac68k / nubus

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

Merge thorpej-cfargs2.

Adapt to CFARGS().

Merge thorpej-cfargs branch:

Simplify and make extensible the config_search() / config_found() /
config_attach() interfaces: rather than having different variants for
which arguments you want pass along, just have a single call that
takes a variadic list of tag-value arguments.

Adjust all call sites:
- Simplify wherever possible; don't pass along arguments that aren't
  actually needed.
- Don't be explicit about what interface attribute is attaching if
  the device only has one.  (More simplification.)
- Add a config_probe() function to be used in indirect configuiration
  situations, making is visibly easier to see when indirect config is
  in play, and allowing for future change in semantics.  (As of now,
  this is just a wrapper around config_match(), but that is an
  implementation detail.)

Remove unnecessary or redundant interface attributes where they're not
needed.

There are currently 5 "cfargs" defined:
- CFARG_SUBMATCH (submatch function for direct config)
- CFARG_SEARCH (search function for indirect config)
- CFARG_IATTR (interface attribte)
- CFARG_LOCATORS (locators array)
- CFARG_DEVHANDLE (devhandle_t - wraps OFW, ACPI, etc. handles)

...and a sentinel value CFARG_EOL.

Add some extra sanity checking to ensure that interface attributes
aren't ambiguous.

Use CFARG_DEVHANDLE in MI FDT, OFW, and ACPI code, and macppc and shark
ports to associate those device handles with device_t instance.  This
will trickle trough to more places over time (need back-end for pre-OFW
Sun OBP; any others?).

Give config_found() the same variadic arguments treatment as
config_search().  This commit only adds the CFARG_EOL sentinel
to the existing config_found() calls.  Conversion of config_found_sm_loc()
and config_found_ia() call sites will be in subsequent commits.

Sync with HEAD

Synch with HEAD

no need to include <machine/param.h> if <sys/param.h> already included

update from HEAD

src is too big these days to tolerate superfluous apostrophes.  It's
"its", people!

Resync to 2012-11-19 00:00:00 UTC

sync with head

split device_t/softc for all remaining drivers.
replace "struct device *" with "device_t".
use device_xname(), device_unit(), etc.

sync with head.

Sync with HEAD.

Sync with HEAD.

kill MALLOC and FREE macros.

sync with head.

Sync with HEAD.

Change variables which are used to read byte stream data
from (void *) to (char *).

Kill caddr_t; there will be some MI fallout, but it will be fixed shortly.

merge ktrace-lwp.

Sync with HEAD. Here we go again...

Add const.

Sync with HEAD.

de-__P, remove register, ansify, b* -> mem*.

Fix the sync with head I botched.

Sync with HEAD.

Sync with HEAD

__KERNEL_RCSID()

Sync with HEAD.

Use aprint_normal() for cfprint routines.

Catch up to -current.

sync kqueue with -current; this includes merge of gehenna-devsw branch,
merge of i386 MP branch, and part of autoconf rototil work

Use CFATTACH_DECL().

Declare all cfattach structures const.

catch up with -current on kqueue branch

Catch up to -current.

Fixes and changes from Hauke Fath <hauke@Espresso.Rhein-Neckar.DE>.
* Clean up after briggs@ changes to support bus_dma.
* Add support for reading sMemory resources from nubus cards.
* Add support for old cards with only the board rsrc (NatSemi NB-GPIB, e.g.)
* Add a few more card identifiers.

Use m68k/m68k/cacheops.[ch]
Use m68k/m68k/bus_dma.c
	- Add mainbus_attach_args with bus_space_tag_t and bus_dma_tag_t.
	- Use passed-in tags for nubus scan.

Merge Aug 24 -current into the kqueue branch.

file nubus.c was added on branch nathanw_sa on 2002-04-17 00:03:39 +0000

"wierd" is weird.

Update thorpej_scsipi to -current as of a month ago
A i386 GENERIC kernel compiles without the siop, ahc and bha drivers
(will be updated later). i386 IDE/ATAPI and ncr work, as well as
sparc/esp_sbus. alpha should work as well (untested yet).
siop, ahc and bha will be updated once I've updated the branch to current
-current, as well as machine-dependant code.

Fix code to read a string from the nubus board--it was not terminating
the string properly when the string on the board is longer than the
pre-allocated space.

remove include of <vm/vm.h>. <vm/vm.h> -> <uvm/uvm_extern.h>

remove/move more mach vm header files:

	<vm/pglist.h> -> <uvm/uvm_pglist.h>
	<vm/vm_inherit.h> -> <uvm/uvm_inherit.h>
	<vm/vm_kern.h> -> into <uvm/uvm_extern.h>
	<vm/vm_object.h> -> nothing
	<vm/vm_pager.h> -> into <uvm/uvm_pager.h>

also includes a bunch of <vm/vm_page.h> include removals (due to redudancy
with <vm/vm.h>), and a scattering of other similar headers.

Repair merge-related damage

Sync with main branch.

Garbage-collect reference to <sys/dmap.h>.

Sync w/ -current.

Add debug routine as an aid for working out new nubus cards.

An inability to map a slot's address space may be a normal condition --
for instance, on-board video may live here.  Make the complaint about
this a DEBUG rather than a DIAGNOSTIC message.

Move on-board I/O and NuBus drivers to their own directories
via repository copy, and make the necessary adjustments to reflect
the moved files.

Update for bus.h changes.

Update for changes to config.

Update marc-pcmcia branch from trunk.

Make #include directives consistent.  All MD headers are of the form:

	#include <mac68k/{dev,mac68k}/foo.h>

In nubus_print(), always print the NuBus slot number.  Also, refine it so
that when no driver matches, our output is a little more consistent with
existing practice.

Clean up some DIAGNOSTIC messages:  use %x to display the slot number.

Update a recently-added comment re: bytelanes values.

Implement new NuBus slot space mapping/probing code, utilizing bus.h (and
our MD bus_space_probe() extension).  This has several side effects:

 - NuBus drivers must map and unmap slot space, rather than relying
   on this happening before they are attached.
 - Functions exported to NuBus drivers from nubus.c now need to be
   supplied with a bus space tag/handle pair.
 - Old bus map/peek functions can be garbage collected, as can pmap
   support for the same.

Because of some current limitations of the bus space specification, we
are violating the abstraction in grf_mv (NuBus grf driver).  All such
violations are clearly marked /* XXX */, and must be addressed when
the specification is updated.

On video devices, if we're loading non-default resource values, save the
resource ID.  Thanks to Paul Goyette <paul@pgoyette.bdt.com> for spotting
this one.

#ifdef DIAGNOSTIC, print the NuBus type fields for unrecognized boards.

Some patches from Bob Nestor <rnestor@metronet.com> and myself to edge
toward support for an Apple SONIC-based ethernet card.  Some cards, like
his, were being missed and/or probed like video cards!

Defer enabling NuBus slot interrupts until all slots have been probed
and drivers attached.  This removes the need for the MAC68K_BROKEN_VIDEO
option.  From Allen Briggs.

Merge in changes from The Trunk, partially just reimplementing newarp.

Remove duplicate <machine/bus.h> include that crept in.

NUBUS_SLOT_TO_PADDR -> NUBUS_SLOT2PA

Make this compile again; missed this file when fixing nubus.h errors.

Revamp mainbus and obio autoconfiguration, with some direction (and the
indirect bus code framework) from Jason Thorpe.  This allows us to dump
bus_scan() and bus_print(), and move bus_peek() and bus_mapin() to the
NuBus code (since they'll eventually go away, anyway).

Convert all foo_match() functions to use a `struct cfdata *' for their
second argument.  The NuBus autoconfig code had to be reorganized as a
result of this, and looks much more like a directly-attached bus now.
These changes eliminate __BROKEN_INDIRECT_CONFIG.

Fix a raft of printf format strings and some declaration problems for
the case where we define DEBUG.  From Erik Bertelsen, closes PR 2871.

backout previous kprintf change

printf -> kprintf, sprintf -> ksprintf

change cfprint_t type definition to take a const char *, rather than
a char *, because that's what was really intended, and because
if the print function modifies the string, various things could become
unhappy (so the string should _not_ be modified).

Make this compile if DEBUG is defined.

Clean up an error printf() and use proper macro.

Ooops.  Remove debugging printf().

Do not depend on the nubus being mapped in one huge segment.

Prototype for -Wall -Wstrict-prototypes -Wmissing-prototypes -Wno-uninitialized
Also change the device probing scheme to use something a bit more rational.
A current side-effect is that nubus cards are double-mapped.  I expect
to fix that shortly.
Also change splclock() to block everything but serial hardware interrupts.

Make this compile again; will need to deal with matchbyname() later, though.

Clean up for higher warning level.

New device attachment scheme:

	- split softc size and match/attach out from cfdriver into
	  a new struct cfattach.

	- new "attach" directive for files.*.  May specify the name of
	  the cfattach structure, so that devices may be easily attached
	  to parents with different autoconfiguration semantics.

Fixes from PR #1931 w/ minor mod in vm_machdep.c

Nuke int_video_start in favor of consistent use of mac68k_vidlog.
Don't find the internal video more than once.
Probe for internal video before nubus instead of after.

Fix the internal video probe again.

Add some debugging (conditional on DEBUG).  Add a more correct probe for
internal video.  Clean up nubusprint() a bit.

Add new nubus handling that's much more robust.
Update via, if_ae, and grf accordingly.
Revamp grf.

First pass of KNFication.  Needs more.

Make nubus indirect.  Duh.

new RCS ID format.

Don't assume NuBus is at NBBASE.  We might remap it.

Do a cleaner probe.  This still needs lots of work, but will work on
reasonable cards...

Minor tweaks to prevent hangs and other bad behavior...  Needs much more
work now that we have more info (Designing Cards and Drivers for the
Macintosh Family Hardware.

Just playing include-cop.

Update ethernet driver to use config.new.  At least, it's a first stab
working from mycroft's magnum changes to if_ed.c.

Update to current work in progress.  This includes an update to
use config.new.
Numerous updates to console so it works better on the SE/30 screen.
Some nice changes from Brad Parker for handling NuBUS and an ethernet
driver that I haven't worked on, yet.

The current MacBSD architecture sub-directory for NetBSD-0.9--more or
less.  It needs some help to get to be -current.  Support for minimal
hardware on the SE/30, II, IIx, and IIcx exists.

Initial revision