From owner-p4-projects  Tue Dec 24 16:22:46 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D81B737B401; Tue, 24 Dec 2002 16:22:43 -0800 (PST)
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 7091837B407
	for <perforce@freebsd.org>; Tue, 24 Dec 2002 16:22:43 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2BB1043ED4
	for <perforce@freebsd.org>; Tue, 24 Dec 2002 16:22:42 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBP0Mgfh047369
	for <perforce@freebsd.org>; Tue, 24 Dec 2002 16:22:42 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBP0MfaV047366
	for perforce@freebsd.org; Tue, 24 Dec 2002 16:22:41 -0800 (PST)
Date: Tue, 24 Dec 2002 16:22:41 -0800 (PST)
Message-Id: <200212250022.gBP0MfaV047366@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
Subject: PERFORCE change 22730 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

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

Change 22730 by marcel@marcel_nfs on 2002/12/24 16:22:09

	De-weird-ify the siodescribe prototype. Only pass the softc.
	We have the device in there.

Affected files ...

.. //depot/projects/ia64/sys/dev/sio/sio.c#28 edit

Differences ...

==== //depot/projects/ia64/sys/dev/sio/sio.c#28 (text+ko) ====

@@ -304,7 +304,7 @@
 }
 
 static void
-siodescribe(device_t dev, struct com_s *sc)
+siodescribe(struct com_s *sc)
 {
 	int has_spr;
 	u_char spr;
@@ -321,25 +321,26 @@
 			 * XXX Should we try to see if we have a broken
 			 * 16550 or a fixed 16550A?
 			 */
-			device_set_desc(dev, "16550 or compatible");
+			device_set_desc(com->dev, "16550 or compatible");
 			break;
 		case 32:
 			/*
 			 * XXX Should we check that features like automatic
 			 * flow control exist?
 			 */
-			device_set_desc(dev, "16650 or compatible");
+			device_set_desc(com->dev, "16650 or compatible");
 			break;
 		case 64:
 			/*
 			 * XXX Should we check that features like automatic
 			 * flow control exist?
 			 */
-			device_set_desc(dev, "16750 or compatible");
+			device_set_desc(com->dev, "16750 or compatible");
 			break;
 		default:
 			/* XXX Probably not right. */
-			device_set_desc(dev, "16550 with non-standard FIFO");
+			device_set_desc(com->dev,
+			    "16550 with non-standard FIFO");
 			break;
 		}
 	} else {
@@ -355,9 +356,9 @@
 		sio_setreg(sc, com_scr, spr);
 		/* XXX barrier */
 		if (!has_spr)
-			device_set_desc(dev, "8250 or compatible");
+			device_set_desc(com->dev, "8250 or compatible");
 		else
-			device_set_desc(dev, "16450 or compatible");
+			device_set_desc(com->dev, "16450 or compatible");
 	}
 }
 
@@ -518,7 +519,7 @@
 	sioinitfifo(com);
 
 	if (device_get_desc(dev) == NULL)
-		siodescribe(dev, com);
+		siodescribe(com);
 
 	flags = device_get_flags(dev);
 

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message