Re: malo@pci vs malo@pcmcia

[FUKAUMI Naoki <fun%naobsd.org@localhost>]

On 08/01/2012 09:43 PM, KIYOHARA Takashi wrote:
> I have a 'I-O DATA WN-G54/CF'.  And some on-board 88W8686 has on
> pcmcia-bus of Gumstix.
> I think, malo@pcmcia and malo@pci is all different.  These drivers
> can't merge maybe.
>
> http://www.openbsd.org/cgi-bin/man.cgi?query=malo&apropos=0&sektion=0&manpath=OpenBSD+Current&arch=i386&format=html
>
>
> Shall I commit to tree the source for malo@pcmcia?
> If 'yes' then I will try to verify next week end.  :-)

+static int
+malo_pcmcia_match(device_t parent, cfdata_t match, void *aux)
+{
+       struct pcmcia_attach_args *pa = aux;
+
+/* XXX */
+#undef PCMCIA_VENDOR_AMBICOM
+#define PCMCIA_VENDOR_AMBICOM  0x02df
+#define PCMCIA_PRODUCT_AMBICOM_WL54CF  0x8103
+/* I-O DATA WN-G54/CF has same vendor/product id as AmbiCom WL54-CF */
+
+       if (pa->manufacturer == PCMCIA_VENDOR_AMBICOM &&
+           pa->product == PCMCIA_PRODUCT_AMBICOM_WL54CF)
+               return 1;
+
+       return 0;
+}

this part should be cleaned.

PCMCIA_VENDOR_AMBICOM is already defined as "-1". I'm not sure it can be 
changed w/o side effect. please check carefully.

--
FUKAUMI Naoki