From owner-svn-src-head@FreeBSD.ORG  Fri Nov 21 03:03:57 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AB05E106564A;
	Fri, 21 Nov 2008 03:03:57 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 93E048FC18;
	Fri, 21 Nov 2008 03:03:57 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAL33vDA071621;
	Fri, 21 Nov 2008 03:03:57 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAL33vZD071619;
	Fri, 21 Nov 2008 03:03:57 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200811210303.mAL33vZD071619@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 21 Nov 2008 03:03:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185140 - head/sys/dev/cardbus
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Nov 2008 03:03:57 -0000

Author: imp
Date: Fri Nov 21 03:03:57 2008
New Revision: 185140
URL: http://svn.freebsd.org/changeset/base/185140

Log:
  Create a /dev/cardbus%d.cis, to be compatible with older versions of
  the software.  This is a trivial amount of code to keep wireless
  monitoring software working...  I plan on removing it in 9.0.

Modified:
  head/sys/dev/cardbus/cardbus_device.c
  head/sys/dev/cardbus/cardbusvar.h

Modified: head/sys/dev/cardbus/cardbus_device.c
==============================================================================
--- head/sys/dev/cardbus/cardbus_device.c	Fri Nov 21 02:23:14 2008	(r185139)
+++ head/sys/dev/cardbus/cardbus_device.c	Fri Nov 21 03:03:57 2008	(r185140)
@@ -118,7 +118,9 @@ cardbus_device_create(struct cardbus_sof
 	devi->sc_cisdev = make_dev(&cardbus_cdevsw, minor, 0, 0, 0666,
 	    "cardbus%d.%d.cis", device_get_unit(sc->sc_dev),
 	    devi->pci.cfg.func);
-	/* XXX need cardbus%d.cis compat layer here ? */
+	if (devi->pci.cfg.func == 0)
+		devi->sc_cisdev_compat = make_dev_alias(devi->sc_cisdev,
+		    "cardbus%d.cis", device_get_unit(sc->sc_dev));
 	devi->sc_cisdev->si_drv1 = devi;
 	return (0);
 }
@@ -128,6 +130,8 @@ cardbus_device_destroy(struct cardbus_de
 {
 	if (devi->sc_cisdev)
 		destroy_dev(devi->sc_cisdev);
+	if (devi->sc_cisdev_compat)
+		destroy_dev(devi->sc_cisdev_compat);
 	return (0);
 }
 

Modified: head/sys/dev/cardbus/cardbusvar.h
==============================================================================
--- head/sys/dev/cardbus/cardbusvar.h	Fri Nov 21 02:23:14 2008	(r185139)
+++ head/sys/dev/cardbus/cardbusvar.h	Fri Nov 21 03:03:57 2008	(r185140)
@@ -60,6 +60,7 @@ struct cardbus_devinfo
 	} funce;
 	uint32_t	fepresent;	/* bit mask of funce values present */
 	struct cdev 	*sc_cisdev;
+	struct cdev 	*sc_cisdev_compat;
 	struct cis_buffer sc_cis;
 };