Subject: CVS commit: syssrc/sys/dev/pcmcia
To: None <source-changes@netbsd.org>
From: Martin Husemann <martin@netbsd.org>
List: source-changes
Date: 03/10/2002 13:32:19
Module Name:	syssrc
Committed By:	martin
Date:		Sun Mar 10 11:32:18 UTC 2002

Modified Files:
	syssrc/sys/dev/pcmcia: if_ray.c if_rayreg.h

Log Message:
Remove RAY_USE_AMEM. This option claimed to use attribute memory access
for the registers, which was true, but actually the same as the driver
did without this option.

What it realy did is work around a stupid bug in the driver that did not
use the "offset" result from the pcmcia_mem_map call mapping the CIS memory.

We got away with this for a long time since on i386 and typical pcmcia
bridged the offset returned will be 0. It always failed (without
RAY_USE_AMEM=1) if the check for a different function CCR aliases in pcmcia.c
failed and mapped the CCR base new - this time at the CCR base of this
function (0xf00), so all register acceses (that had 0xf00 added) happened
way off in neverland.

Now we do not hardcode the CCR base to the register definitions, but
instead use the offset returned by pcmcia_mem_map. This makes the driver
work with and without CCR base aliases being found.


To generate a diff of this commit:
cvs rdiff -r1.31 -r1.32 syssrc/sys/dev/pcmcia/if_ray.c
cvs rdiff -r1.3 -r1.4 syssrc/sys/dev/pcmcia/if_rayreg.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.