Subject: Re: sb0 and 1.3.2
To: Manuel Bouyer <bouyer@antioche.lip6.fr>
From: None <dbsaint@bellsouth.net>
List: port-i386
Date: 03/08/1999 09:43:14
Hey .
I tried the patch .
but ofcourse .. it failes.
heres the output:
netbsd> patch < /root/SBpatch
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|RCS file: /archive/cvs/cvsroot/NetBSD/src/sys/dev/isapnp/sb_isapnp.c,v
|retrieving revison 1.1.1.2
|retrieving revision 1.2
|diff -u -r1.1.1.2 -r1.2
|--- sb_isapnp.c 1998/01/26 13:45:42 1.1.1.2
|+++ sb_isapnp.c 1998/02/12 10:11:42 1.2
--------------------------
Patching file sb_isapnp.c using Plan A...
Hunk #1 failed at 94.
1 out of 1 hunks failed--saving rejects to sb_isapnp.c.rej
done
So anyhow I was trying to do it by hand .. but Im not sure I understand what
you mean by "lines stating with a "-" need to be removed from the file and
lines with a "+" added.
Are you talking about sb_isapnp.c ?
beacuase it appears that those lines are allready in there.. like so:
{
struct isapnp_attach_args *ipa = aux;
if (strcmp(ipa->ipa_devlogic, "ADS7150") && /* AD1815 */
strcmp(ipa->ipa_devlogic, "ADS7180") && /* AD1816 */
strcmp(ipa->ipa_devlogic, "CTL0001") &&
strcmp(ipa->ipa_devlogic, "CTL0031") && /* SB AWE32 */
strcmp(ipa->ipa_devlogic, "CTL0041") && /* SB16 PnP (CT4131) */
strcmp(ipa->ipa_devlogic, "CTL0042") && /* SB AWE64 Value */
strcmp(ipa->ipa_devlogic, "CTL0044") && /* SB AWE64 Gold */
strcmp(ipa->ipa_devlogic, "CTL0045") && /* SB AWE64 Value */
strcmp(ipa->ipa_devlogic, "ESS1868") &&
strcmp(ipa->ipa_devlogic, "OPT9250") && /* Televideo card, Opti */
strcmp(ipa->ipa_devcompat, "PNPB000") && /* generic SB 1.5 */
strcmp(ipa->ipa_devcompat, "PNPB001") && /* generic SB 2.0 */
strcmp(ipa->ipa_devcompat, "PNPB002") && /* generic SB Pro */
strcmp(ipa->ipa_devcompat, "PNPB003")) /* generic SB 16 */
return (0);
return (1);
}
Thanks for your support in this matter ..
cheers
Tony
On 08-Mar-99 Manuel Bouyer wrote:
> On Mar 8, Rene Hexel wrote
>> I'm afraid, I have to disappoint you here. With PnP devices (on
>> isapnp/pci/pcmcia ...) this simply means that a PnP device was
>> identified. 'not configured' in this case means that no driver was
>> configured to actually make use of the identified device (in most cases
>> because of a missing driver).
>>
>> Under NetBSD-1.3.2 the Creative ViBRA16X PnP (CTL0043) is not
>> supported. There is support for this card, however, under
>> NetBSD-current.
>
> This board works fine under 1.3.2, you just need the following patch:
>
> Index: sb_isapnp.c
> ===================================================================
> RCS file: /archive/cvs/cvsroot/NetBSD/src/sys/dev/isapnp/sb_isapnp.c,v
> retrieving revision 1.1.1.2
> retrieving revision 1.2
> diff -u -r1.1.1.2 -r1.2
> --- sb_isapnp.c 1998/01/26 13:45:42 1.1.1.2
> +++ sb_isapnp.c 1998/02/12 10:11:42 1.2
> @@ -94,6 +94,7 @@
> strcmp(ipa->ipa_devlogic, "CTL0001") &&
> strcmp(ipa->ipa_devlogic, "CTL0031") && /* SB AWE32 */
> strcmp(ipa->ipa_devlogic, "CTL0041") && /* SB16 PnP (CT4131) */
> + strcmp(ipa->ipa_devlogic, "CTL0043") && /* SB16 PnP (CT4170) */
> strcmp(ipa->ipa_devlogic, "CTL0042") && /* SB AWE64 Value */
> strcmp(ipa->ipa_devlogic, "CTL0044") && /* SB AWE64 Gold */
> strcmp(ipa->ipa_devlogic, "CTL0045") && /* SB AWE64 Value */
>
>
> --
> Manuel Bouyer, LIP6, Universite Paris VI. Manuel.Bouyer@lip6.fr
> --
----------------------------------
E-Mail: dbsaint@bellsouth.net
Date: 08-Mar-99
Time: 09:39:11
This message was sent by XFMail
----------------------------------