From owner-p4-projects  Wed Dec 25 15:45:13 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1289137B405; Wed, 25 Dec 2002 15:45:11 -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 9D06337B401
	for <perforce@freebsd.org>; Wed, 25 Dec 2002 15:45:10 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 558AE43EA9
	for <perforce@freebsd.org>; Wed, 25 Dec 2002 15:45:10 -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 gBPNjAfh043303
	for <perforce@freebsd.org>; Wed, 25 Dec 2002 15:45:10 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBPNj9AY043300
	for perforce@freebsd.org; Wed, 25 Dec 2002 15:45:09 -0800 (PST)
Date: Wed, 25 Dec 2002 15:45:09 -0800 (PST)
Message-Id: <200212252345.gBPNj9AY043300@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 22744 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=22744

Change 22744 by marcel@marcel_nfs on 2002/12/25 15:44:30

	Remove the hackery that made the Diva multi-port board probe and
	attach. Assume I/O ports again until we have an UART that's
	memory mapped.

Affected files ...

.. //depot/projects/ia64/sys/dev/sio/sio_pci.c#13 edit

Differences ...

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

@@ -79,7 +79,6 @@
 	{ 0x0000151f, "SmartLink 5634PCV SurfRider", 0x10 },
 	{ 0x0103115d, "Xircom Cardbus modem", 0x10 },
 	{ 0x98459710, "Netmos Nm9845 PCI Bridge with Dual UART", 0x10 },
-	{ 0x1048103c, "Diva Serial [GSP] Multiport UART", -0x10 },
 	{ 0x00000000, NULL, 0 }
 };
 
@@ -112,8 +111,8 @@
 	if (id->desc)
 		device_set_desc(dev, id->desc);
 	com = device_get_softc(dev);
-	com->addr_rid = (id->rid >= 0) ? id->rid : -id->rid;
-	com->addr_type = (id->rid >= 0) ? SYS_RES_IOPORT : SYS_RES_MEMORY;
+	com->addr_rid = id->rid;
+	com->addr_type = SYS_RES_IOPORT;
 	com->addr_res = bus_alloc_resource(dev, com->addr_type, &com->addr_rid,
 	    0, ~0, 8, RF_ACTIVE);
 	if (com->addr_res == NULL)

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