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

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

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

Remove unnecessary <sys/malloc.h> include.

Pull up following revision(s) (requested by tsutsui in ticket #1721):

	sys/arch/mac68k/nubus/grf_nubus.c: revision 1.78

Set sc_dev field of softc.
Should pullup to 7.

update from HEAD

Sync with HEAD

Set sc_dev field of softc.

Should pullup to 7.

Rebase to HEAD as of a few days ago.

sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs.  ("Protocol error: too many arguments")

sync with head

Simplify

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

Merge the ppcoea-renovation branch to HEAD.

This branch was a major cleanup and rototill of many of the various OEA
cpu based PPC ports that focused on sharing as much code as possible
between the various ports to eliminate near-identical copies of files in
every tree.  Additionally there is a new PIC system that unifies the
interface to interrupt code for all different OEA ppc arches.  The work
for this branch was done by a variety of people, too long to list here.

TODO:
bebox still needs work to complete the transition to -renovation.
ofppc still needs a bunch of work, which I will be looking at.
ev64260 still needs to be renovated
amigappc was not attempted.

NOTES:
pmppc was removed as an arch, and moved to a evbppc target.

Sync with head.

Sync with HEAD

Sync with HEAD.

sync with head.

Sync with HEAD.

Fix typo in comment.

Sync with HEAD.

Use a char* helper variable for pointer arithmetic.

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

Sync with head.

sync with head.

sync with head.

Support for four nubus video cards:

Formac ProNitron 80.IVb (1024x768/8)
Relax 19" Model 200 (1024x768/8)
Apple Monochrome Video Card (640x480/1)
VillageTronic Mac Picasso 320 (up to 1920x1080/up to 24)

Nubus identifiers for Creative Solutions parallel & serial cards,
and a Becton Dickinson data acquisition card.

sync with head.

Remove leading __ from __(const|inline|signed|volatile) -- it is obsolete.

merge ktrace-lwp.

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()

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.

catch up with -current on kqueue branch

Catch up to -current.

Don't use multi-line string literals.

Sync kqueue branch with -current.

Catch up to -current.

prepare for ELF:
 - add "%" prefix to register names in assembly code.
 - use _C_LABEL() where necessary.
 - use packed structures where necessary to match the old ABI.

Sync with HEAD.

Clear interrupts on the RasterOps PaintBoard Prism GT 1.0.  From
Alastair Bridgewater <nyef@softhome.net>.

Handle interrupts on the Radius DirectColor/GX (id 0x27c).  From
Alastair Bridgewater <nyef@softhome.net>.

Pull up revision 1.60 (requested by briggs):
  Clear interrupts on the Apple "Boogie" card.

Pull up revision 1.60 (requested by briggs):
  Clear interrupts on the Apple "Boogie" card.

Sync with HEAD (for UBC fixes).

Clear interrupts on the Apple "Boogie" card.  Information grovelling
and testing by Lucas Lay.

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.

Pullups approved by thorpej --
Add byte-swap and stride options to bus_space.  Allocate as normal, then
call mac68k_bus_space_handle_swapped() or mac68k_bus_space_handle_set_stride().
Stride is untested.  Swapped code works for SMC ethernet.

Add bus_space_*_stream_N functions to bus_space.

Add a DIAGNOSTIC panic if (count-using) bus_space macros are called with
a count of zero.  Some drivers do this accidentally and some bus_space
implementations will fail if count is passed as zero (they are set up in
a do-{}-while structure).

There were some bogus assumptions about bus_space_handle_t and some
function calls that didn't match prototypes--fix those here, too.

Update hack to point to bus_space_handle base address.

Remove advertising clause with my name.

Add the RasterOps 24MxTV; this card operates in the same manner as two
other RasterOps boards we already handle.  Information provided by
Greg Kerr.

Merge wscons work onto the main development branch.

bring in latest KAME (as of 19991130, KAME/NetBSD141) into kame branch
just for reference purposes.
This commit includes 1.4 -> 1.4.1 sync for kame branch.

The branch does not compile at all (due to the lack of ALTQ and some other
source code).  Please do not try to modify the branch, this is just for
referenre purposes.

synchronization to latest KAME will take place on HEAD branch soon.

pullup 1.52->1.53 (briggs)

Sync w/ -current.

Sync with main branch.

Clear interrupts on a Radius GS/C card.  Thanks go to Yasufumi Suzuki
<yattin@sco.bekkoame.ne.jp> for doing the MacsBug "leg"work for me.

Use information from Kensuke Ogawa <kenogawa@festa.or.jp> to disable
interrupts on a Micron Exceed color video card.

PR 7021 from Yoshihisa Sugimoto <sugimoto@sums.shiga-med.ac.jp>:
Clear interrupt properly on the RasterOps 24XLTV.  Same as the 24LX.

First cut at grf emulation.  Neither GRFIOCMAP nor mmap'ing a wsdisplay device
work, though several other grf ioctls are properly emulated.

Make this compile again, as pointed out by Paul Goyette.

Interrupt handling for the MicroConversions 2124NB II, from Paul Goyette.

Update comment after cut and paste.

New and improved console framebuffer initialization and autoconfig.  This
resolves a great many issues, including Performa 58x interrupt handling
and offset displays on some models.

Programs that depend on the old (pre-NetBSD 1.1) grf interface may break.
That's actually a separate issue uncovered by this code, not caused by it.

Support video interrupt for GrandVimage 17iL video card.

Add a GRF_COMPAT option so that old-style grf ioctl() code can be
removed from the kernel.

Store the PA of the framebuffer in the softc.  This eliminates the need
for the sc_phys callback; we can just store the PA in the grfbus attach
args, rather than a function pointer, which simplifies the code nicely.

Handle video interrupts for the Radius PrecisionColor 24X card.  Thanks for
sleuthing and testing go to Robert Oelkers <windcatcher@earthlink.net>.

Handle the interrupt for the Vimage graphics adapter.  Thanks to
Sadamu Gohyakuda <joyhiro@joyful.gr.jp> for remote testing.

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.

Deal with the video interrupt for the RasterOps 8/24XLi.  Thanks for the
information go to Tadashi Ueda <ng6t-ued@asahi-net.or.jp>.

Garbage collect the second (slot number) parameter to NuBus interrupt
handlers.  (Only slot_ignore() and slot_noint() need this, and we already
have a place to put this information.)  Adjust add_nubus_intr() so that if
the client_data arg is specified as NULL, pass the slot number as
client_data to the interrupt handler.

Add interrupt support for two more video cards: the Formac color card II
and the Radius PrecisionColor 24Xp.  Thanks to <falk.stern@luene.net> and
<Mario_Magliocco@broder.com> for their remote sleuthing and testing.

Update for changes to config.

Thanks to Paul Goyette <paul@whooppee.com> for a patch to clear the
interrupt properly on a SuperMac Spectrum/8 Series III, and thanks
to Dan McMahill for loaning the card to Paul.
I modified Paul's patch somewhat to change grfmv_intr_generic_{1,4}
to grfmv_intr_generic_write{1,4} and added grfmv_intr_generic_or4 to
handle this card.

Pull rev 1.36 and 1.37 up from trunk (briggs) (reviewed by mellon)

Correct a comment from previous commit.

Support for the Lapis ProColorServer 8 PDS on the SE/30.  This prevents
hangs when trying to use this video card in conjunction with an ethernet
card.  Thanks to David Condon <david@apk.net> for information and testing.

Pull rev 1.35 up from trunk (briggs)

Handle interrupts on E-Machines Futura-SX.  From Paul Goyette, PR 4348.

Update marc-pcmcia branch from trunk.

Clear interrupts properly on the Radius PrecisionColor 8.
Thanks for the info go to Andrew MacGibbon <andrew-m@cs.auckland.ac.nz>

Update marc-pcmcia branch from trunk.

Add interrupt handler for SuperMac GFX.
Tested by Kai-Yew Lum <kaiyewl@engin.umich.edu> back in May.

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.

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

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

Fix grf{i,m}v_phys() prototypes.

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.

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.)

Add support for Portrait Video Card.  From SUNAGAWA Keiki
<kei_sun@ba2.so-net.or.jp> in PR 3821.

Convert several interrupt handlers to bus space model, removing some
XXX's.  Also, fix a bug in grfmv_intr_generic() that I found and
confirmed with Allen.

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.

Support for clearing interrupts on a Rasterops Colorboard 364.
Thanks go to Michel Chalufour <michelc@tiac.net> for grovelling around for
me.

Thanks to Tobias Beal <tbeal41@maine.maine.edu>, we can clear interrupts
on at least one Radius Precisioncolor 8 board.

Clear the interrupts properly on an E-Machines Futura II LX and make a wild
guess at clearing them on a Futura II SX/DSP and RasterOps ColorBoard 364.
Thanks to Michel Chalufour <michelc@tiac.net> for loaning me the II LX.

Purely cosmetic cleanup:

  - Remove unused `register' modifier on declarations
  - Reverse the sense of some tests to make the code more clear
  - Type casts per KNF
  - Move a static variable into the only function that uses it (perhaps
    we can eliminate it entirely, someday?)

Ignore SE/30 faux-video card.

Add DrHW for RasterOps CB264--From Scott Reynolds--and link it in to the
proper interrupt routine.

  - Support DAFB machines mo' better.  Actually detect if a monitor is
    present and initialize a few things.  No color support, yet.
  - Properly disable interrupts for DAFB.
  - Rearrange for better nubus display card interrupt support.  Only register
    an interrupt if we know how to clear it.
  - Complain if we don't know about a given display card and can not install
    an interrupt handler.
  - Change MYSTERY stuff to cb264--still need to get the DrSW so we can
    actually call the routine to clear an interrupt from this card.

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

NUBUS_SLOT_TO_PADDR -> NUBUS_SLOT2PA

We need bus.h now, due to recent nubus_attach_args change.

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.

backout previous kprintf change

printf -> kprintf, sprintf -> ksprintf

Pulled up from rev 1.12 by request from Scott Reynolds

Add a way to tell grf_establish() that internal video doesn't actually
occupy a slot.  This is necessary so that GRFIOCMAP can find the correct
physical address of the framebuffer.  Fixes P550, some LC models, and
perhaps the PB520.

New grf attachment code, mostly by Jason Thorpe with some cleanup by me.
This will allow dt and X to work with a generic kernel, rather than
compiling different kernels that attach grf0 to a NuBus adapter or
internal video.

Set sc_slot--we need it later.

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.

Some code to support a vector passed in from booter 1.8.

Add another routine for the grf display-specific drivers to return a physical
address.

Set and use new fboff element from grfmode structure.

Fix oversight.

Make no assumptions about the absolute address of nubus cards.

Get rid of a printf() that got left behind in the probe.

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