Attachment 12972 Details for Bug 24854 – file.diff

[patch] file.diff

file.diff (text/plain), 3.42 KB, created by gabriel on 2001-02-04 22:50:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gabriel

Created: 2001-02-04 22:50:00 UTC

Size: 3.42 KB

patch

obsolete

>*** dev/an/if_an_pccard.c	Fri Oct 20 08:57:56 2000
>--- /root/newcard/if_an_pccard.c	Sun Feb  4 22:32:35 2001
>***************
>*** 64,69 ****
>--- 64,74 ----
>  #include <net/if_dl.h>
>  #include <net/if_types.h>
>  
>+ #include <dev/pccard/pccardvar.h>
>+ #include <dev/pccard/pccarddevs.h>
>+ 
>+ #include "card_if.h"
>+ 
>  #ifndef lint
>  static const char rcsid[] =
>   "$FreeBSD: src/sys/dev/an/if_an_pccard.c,v 1.6 2000/10/20 07:57:56 jhb Exp $";
>***************
>*** 75,91 ****
>  /*
>   * Support for PCMCIA cards.
>   */
>  static int  an_pccard_probe(device_t);
>  static int  an_pccard_attach(device_t);
>  static int  an_pccard_detach(device_t);
>  
>  static device_method_t an_pccard_methods[] = {
>  	/* Device interface */
>! 	DEVMETHOD(device_probe,		an_pccard_probe),
>! 	DEVMETHOD(device_attach,	an_pccard_attach),
>  	DEVMETHOD(device_detach,	an_pccard_detach),
>  	DEVMETHOD(device_shutdown,	an_shutdown),
>  
>  	{ 0, 0 }
>  };
>  
>--- 80,101 ----
>  /*
>   * Support for PCMCIA cards.
>   */
>+ static int  an_pccard_match(device_t);
>  static int  an_pccard_probe(device_t);
>  static int  an_pccard_attach(device_t);
>  static int  an_pccard_detach(device_t);
>  
>  static device_method_t an_pccard_methods[] = {
>  	/* Device interface */
>! 	DEVMETHOD(device_probe,		pccard_compat_probe),
>! 	DEVMETHOD(device_attach,	pccard_compat_attach),
>  	DEVMETHOD(device_detach,	an_pccard_detach),
>  	DEVMETHOD(device_shutdown,	an_shutdown),
>  
>+ 	/* Card interface */
>+ 	DEVMETHOD(card_compat_match, 	an_pccard_match),
>+ 	DEVMETHOD(card_compat_probe,	an_pccard_probe),
>+ 	DEVMETHOD(card_compat_attach,	an_pccard_attach),
>  	{ 0, 0 }
>  };
>  
>***************
>*** 98,103 ****
>--- 108,132 ----
>  static devclass_t an_pccard_devclass;
>  
>  DRIVER_MODULE(if_an, pccard, an_pccard_driver, an_pccard_devclass, 0, 0);
>+ 
>+ static const struct pccard_product an_pccard_products[] = {
>+ 		{ PCCARD_STR_AIRONET_PC4800,	PCCARD_VENDOR_AIRONET,
>+ 		  PCCARD_PRODUCT_AIRONET_PC4800,	0, 
>+ 		  PCCARD_CIS_AIRONET_PC4800 },
>+ };
>+ 
>+ static int
>+ an_pccard_match(device_t dev)
>+ {
>+ 	const struct pccard_product *pp;
>+ 
>+ 	if ((pp = pccard_product_lookup(dev, an_pccard_products,
>+ 		sizeof(an_pccard_products[0]), NULL)) != NULL) {
>+ 			device_set_desc(dev, pp->pp_name);
>+ 			return 0;
>+ 	}
>+ 	return ENXIO;
>+ }
>  
>  static int 
>  an_pccard_detach(device_t dev)
>*** conf/files	Sun Feb  4 19:23:34 2001
>--- /root/newcard/files	Sun Feb  4 22:32:19 2001
>***************
>*** 236,242 ****
>  dev/an/if_an.c		optional an
>  dev/an/if_an_isa.c	optional an isa
>  dev/an/if_an_pccard.c	optional an card
>! #dev/an/if_an_pccard.c	optional an pccard
>  dev/an/if_an_pci.c	optional an pci
>  dev/ar/if_ar.c		optional ar
>  dev/ar/if_ar_pci.c	optional ar pci
>--- 236,242 ----
>  dev/an/if_an.c		optional an
>  dev/an/if_an_isa.c	optional an isa
>  dev/an/if_an_pccard.c	optional an card
>! dev/an/if_an_pccard.c	optional an pccard
>  dev/an/if_an_pci.c	optional an pci
>  dev/ar/if_ar.c		optional ar
>  dev/ar/if_ar_pci.c	optional ar pci
>*** modules/an/Makefile	Sat Jan  6 13:59:40 2001
>--- /root/newcard/Makefile	Sun Feb  4 22:32:50 2001
>***************
>*** 4,10 ****
>  
>  KMOD=	if_an
>  SRCS=	if_an.c if_an_pccard.c if_an_pci.c if_an_isa.c
>! SRCS+=	opt_inet.h device_if.h bus_if.h pci_if.h isa_if.h
>  
>  opt_inet.h:
>  	echo "#define INET 1" > opt_inet.h
>--- 4,10 ----
>  
>  KMOD=	if_an
>  SRCS=	if_an.c if_an_pccard.c if_an_pci.c if_an_isa.c
>! SRCS+=	opt_inet.h device_if.h bus_if.h pci_if.h isa_if.h card_if.h
>  
>  opt_inet.h:
>  	echo "#define INET 1" > opt_inet.h

Actions: View | Diff

Attachments on bug 24854: 12972