 @@ -1,14 +1,14 @@
-/*	$NetBSD: pcmcia.c,v 1.93 2009/05/12 14:42:19 cegger Exp $	*/
+/*	$NetBSD: pcmcia.c,v 1.94 2011/07/26 22:24:36 dyoung Exp $	*/
 /*
  * Copyright (c) 2004 Charles M. Hannum.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -38,27 +38,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcmcia.c,v 1.93 2009/05/12 14:42:19 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcmcia.c,v 1.94 2011/07/26 22:24:36 dyoung Exp $");
 #include "opt_pcmciaverbose.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <net/if.h>
 #include <dev/pcmcia/pcmciareg.h>
 #include <dev/pcmcia/pcmciachip.h>
 #include <dev/pcmcia/pcmciavar.h>
 #ifdef IT8368E_LEGACY_MODE /* XXX -uch */
 @@ -123,28 +123,26 @@ pcmcia_match(device_t parent, cfdata_t m
 void
 pcmcia_attach(device_t parent, device_t self, void *aux)
+{
 	struct pcmciabus_attach_args *paa = aux;
 	struct pcmcia_softc *sc = device_private(self);
 	aprint_naive("\n");
 	aprint_normal("\n");
 	sc->dev = self;
 	sc->pct = paa->pct;
 	sc->pch = paa->pch;
 	sc->iobase = paa->iobase;
 	sc->iosize = paa->iosize;
 	sc->ih = NULL;
 	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "couldn't establish power handler\n");
+}
 int
 pcmcia_detach(device_t self, int flags)
+{
 	int rc;
 	if ((rc = config_detach_children(self, flags)) != 0)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pcmciachip.h,v 1.16 2009/05/12 14:42:19 cegger Exp $	*/
+/*	$NetBSD: pcmciachip.h,v 1.17 2011/07/26 22:24:36 dyoung Exp $	*/
 /*
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -133,24 +133,22 @@ struct pcmcia_chip_functions {
 /* Socket functions. */
 #define	pcmcia_chip_socket_enable(tag, handle)				\
 	((*(tag)->socket_enable)((handle)))
 #define	pcmcia_chip_socket_disable(tag, handle)				\
 	((*(tag)->socket_disable)((handle)))
 #define	pcmcia_chip_socket_settype(tag, handle, type)			\
 	((*(tag)->socket_settype)((handle), (type)))
 struct pcmciabus_attach_args {
 	const char *paa_busname;	/* Bus name */
 	pcmcia_chipset_tag_t pct;
 	pcmcia_chipset_handle_t pch;
 	bus_addr_t iobase;		/* start i/o space allocation here */
 	bus_size_t iosize;		/* size of the i/o space range */
 };
 /* interfaces for the chipset to call pcmcia */
 int	pcmcia_card_attach(device_t);
 void	pcmcia_card_detach(device_t, int);
 void	pcmcia_card_deactivate(device_t);
 #endif /* _PCMCIA_PCMCIACHIP_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pcmciavar.h,v 1.34 2009/05/12 14:42:19 cegger Exp $	*/
+/*	$NetBSD: pcmciavar.h,v 1.35 2011/07/26 22:24:36 dyoung Exp $	*/
 /*
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -187,34 +187,26 @@ struct pcmcia_card {
 struct pcmcia_softc {
 	device_t	dev;
 	/* this stuff is for the socket */
 	pcmcia_chipset_tag_t pct;
 	pcmcia_chipset_handle_t pch;
 	/* this stuff is for the card */
 	struct pcmcia_card card;
 	void		*ih;
 	int		sc_enabled_count;	/* how many functions are
 						   enabled */
 	/*
 	 * These are passed down from the PCMCIA chip, and exist only
 	 * so that cards with Very Special address allocation needs
 	 * know what range they should be dealing with.
 	 */
 	bus_addr_t iobase;		/* start i/o space allocation here */
 	bus_size_t iosize;		/* size of the i/o space range */
 };
 struct pcmcia_cis_quirk {
 	int32_t manufacturer;
 	int32_t product;
 	const char *cis1_info[4];
 	const struct pcmcia_function *pf;
 	const struct pcmcia_config_entry *cfe;
 };
 struct pcmcia_attach_args {
 	int32_t manufacturer;
 	int32_t product;