From owner-p4-projects@FreeBSD.ORG  Thu Apr 27 06:29:50 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 79A2216A409; Thu, 27 Apr 2006 06:29:50 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5449016A406
	for <perforce@freebsd.org>; Thu, 27 Apr 2006 06:29:50 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id F2E0443D49
	for <perforce@freebsd.org>; Thu, 27 Apr 2006 06:29:49 +0000 (GMT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3R6Tn2v070397
	for <perforce@freebsd.org>; Thu, 27 Apr 2006 06:29:49 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3R6TnqI070391
	for perforce@freebsd.org; Thu, 27 Apr 2006 06:29:49 GMT
	(envelope-from marcel@freebsd.org)
Date: Thu, 27 Apr 2006 06:29:49 GMT
Message-Id: <200604270629.k3R6TnqI070391@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 96198 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, 27 Apr 2006 06:29:50 -0000

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

Change 96198 by marcel@marcel_nfs on 2006/04/27 06:29:42

	Fixup entries that had masks different from ~0:
	o  Expand the Lava entries. The masks were shortcuts. Expand
	   and give each entry the right description.
	o  Don't expand the Avlab entry. There's no evidence that it
	   is a shortcut. In fact, the PCI id in question is not even
	   present in the database. 

Affected files ...

.. //depot/projects/uart/dev/puc/pucdata.c#37 edit

Differences ...

==== //depot/projects/uart/dev/puc/pucdata.c#37 (text+ko) ====

@@ -508,20 +508,44 @@
 	    .config_function = puc_config_cronyx
 	},
 
-	{   0x1407, 0x0100, 0xffff, 0,	/* MASK */
-	    "Lava Computers dual serial port",
+	{   0x1407, 0x0100, 0xffff, 0,
+	    "Lava Computers Dual Serial",
+	    DEFAULT_RCLK,
+	    PUC_PORT_2S, 0x10, 4, 0,
+	},
+
+	{   0x1407, 0x0101, 0xffff, 0,
+	    "Lava Computers Quatro A",
+	    DEFAULT_RCLK,
+	    PUC_PORT_2S, 0x10, 4, 0,
+	},
+
+	{   0x1407, 0x0102, 0xffff, 0,
+	    "Lava Computers Quatro B",
+	    DEFAULT_RCLK,
+	    PUC_PORT_2S, 0x10, 4, 0,
+	},
+
+	{   0x1407, 0x0120, 0xffff, 0,
+	    "Lava Computers Quattro-PCI A",
 	    DEFAULT_RCLK,
 	    PUC_PORT_2S, 0x10, 4, 0,
 	},
 
-	{   0x1407, 0x0120, 0xffff, 0,	/* MASK */
-	    "Lava Computers Quattro-PCI serial port",
+	{   0x1407, 0x0121, 0xffff, 0,
+	    "Lava Computers Quattro-PCI B",
 	    DEFAULT_RCLK,
 	    PUC_PORT_2S, 0x10, 4, 0,
 	},
 
-	{   0x1407, 0x0180, 0xffff, 0,	/* MASK */
-	    "Lava Computers Octopus-550 8-port serial",
+	{   0x1407, 0x0180, 0xffff, 0,
+	    "Lava Computers Octo A",
+	    DEFAULT_RCLK,
+	    PUC_PORT_4S, 0x10, 4, 0,
+	},
+
+	{   0x1407, 0x0181, 0xffff, 0,
+	    "Lava Computers Octo B",
 	    DEFAULT_RCLK,
 	    PUC_PORT_4S, 0x10, 4, 0,
 	},
@@ -620,7 +644,7 @@
 	    PUC_PORT_2S, 0x10, 4, 0,
 	},
 
-	{   0x14db, 0x2130, 0xffff, 0,	/* MASK */
+	{   0x14db, 0x2130, 0xffff, 0,
 	    "Avlab Technology, PCI IO 2S",
 	    DEFAULT_RCLK,
 	    PUC_PORT_2S, 0x10, 4, 0,