From owner-p4-projects@FreeBSD.ORG  Thu Apr 17 23:10:50 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 20AC91065671; Thu, 17 Apr 2008 23:10:50 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D698C106566C
	for <perforce@freebsd.org>; Thu, 17 Apr 2008 23:10:49 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C07FD8FC19
	for <perforce@freebsd.org>; Thu, 17 Apr 2008 23:10:49 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3HNAnqI012929
	for <perforce@freebsd.org>; Thu, 17 Apr 2008 23:10:49 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3HNAnrT012927
	for perforce@freebsd.org; Thu, 17 Apr 2008 23:10:49 GMT
	(envelope-from sam@freebsd.org)
Date: Thu, 17 Apr 2008 23:10:49 GMT
Message-Id: <200804172310.m3HNAnrT012927@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 140186 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Apr 2008 23:10:50 -0000

http://perforce.freebsd.org/chv.cgi?CH=140186

Change 140186 by sam@sam_ebb on 2008/04/17 23:09:58

	cleanup

Affected files ...

.. //depot/projects/vap/sys/dev/mwl/if_mwl_pci.c#2 edit

Differences ...

==== //depot/projects/vap/sys/dev/mwl/if_mwl_pci.c#2 (text+ko) ====

@@ -78,17 +78,43 @@
 #define	BS_BAR0	0x10
 #define	BS_BAR1	0x14
 
+struct mwl_pci_ident {
+	uint16_t	vendor;
+	uint16_t	device;
+	const char	*name;
+};
+
+static const struct mwl_pci_ident mwl_pci_ids[] = {
+	{ 0x11ab, 0x2a02, "Marvell 88W8363" },
+	{ 0x11ab, 0x2a03, "Marvell 88W8363" },
+	{ 0x11ab, 0x2a0a, "Marvell 88W8363" },
+	{ 0x11ab, 0x2a0b, "Marvell 88W8363" },
+	{ 0x11ab, 0x2a0c, "Marvell 88W8363" },
+	{ 0x11ab, 0x2a21, "Marvell 88W8363" },
+	{ 0x11ab, 0x2a24, "Marvell 88W8363" },
+
+	{ 0, 0, NULL }
+};
+
+const static struct mwl_pci_ident *
+mwl_pci_lookup(int vendor, int device)
+{
+	const struct mwl_pci_ident *ident;
+
+	for (ident = mwl_pci_ids; ident->name != NULL; ident++)
+		if (vendor == ident->vendor && device == ident->device)
+			return ident;
+	return NULL;
+}
+
 static int
 mwl_pci_probe(device_t dev)
 {
-	if (pci_get_vendor(dev) == 0x11ab &&
-	      (pci_get_device(dev) == 0x2a02
-	    || pci_get_device(dev) == 0x2a03
-	    || pci_get_device(dev) == 0x2a0b
-	    || pci_get_device(dev) == 0x2a0c
-	    || pci_get_device(dev) == 0x2a21
-	    || pci_get_device(dev) == 0x2a24)) {
-		device_set_desc(dev, "Marvell 88W8363");
+	const struct mwl_pci_ident *ident;
+
+	ident = mwl_pci_lookup(pci_get_vendor(dev), pci_get_device(dev));
+	if (ident != NULL) {
+		device_set_desc(dev, ident->name);
 		return BUS_PROBE_DEFAULT;
 	}
 	return ENXIO;