svn commit: r204904 - head/sys/ia64/ia64
Marcel Moolenaar
marcel at FreeBSD.org
Tue Mar 9 02:05:02 UTC 2010
Author: marcel
Date: Tue Mar 9 02:05:01 2010
New Revision: 204904
URL: http://svn.freebsd.org/changeset/base/204904
Log:
Remove support for SYS_RES_DRQ.
Modified:
head/sys/ia64/ia64/nexus.c
Modified: head/sys/ia64/ia64/nexus.c
==============================================================================
--- head/sys/ia64/ia64/nexus.c Tue Mar 9 02:00:53 2010 (r204903)
+++ head/sys/ia64/ia64/nexus.c Tue Mar 9 02:05:01 2010 (r204904)
@@ -78,7 +78,7 @@ struct nexus_device {
#define DEVTONX(dev) ((struct nexus_device *)device_get_ivars(dev))
-static struct rman irq_rman, drq_rman, port_rman, mem_rman;
+static struct rman irq_rman, port_rman, mem_rman;
static int nexus_probe(device_t);
static int nexus_attach(device_t);
@@ -190,21 +190,6 @@ nexus_probe(device_t dev)
panic("nexus_probe irq_rman");
/*
- * ISA DMA on PCI systems is implemented in the ISA part of each
- * PCI->ISA bridge and the channels can be duplicated if there are
- * multiple bridges. (eg: laptops with docking stations)
- */
- drq_rman.rm_start = 0;
- drq_rman.rm_end = 7;
- drq_rman.rm_type = RMAN_ARRAY;
- drq_rman.rm_descr = "DMA request lines";
- /* XXX drq 0 not available on some machines */
- if (rman_init(&drq_rman)
- || rman_manage_region(&drq_rman,
- drq_rman.rm_start, drq_rman.rm_end))
- panic("nexus_probe drq_rman");
-
- /*
* However, IO ports and Memory truely are global at this level,
* as are APIC interrupts (however many IO APICS there turn out
* to be on large systems..)
@@ -355,10 +340,6 @@ nexus_alloc_resource(device_t bus, devic
rm = &irq_rman;
break;
- case SYS_RES_DRQ:
- rm = &drq_rman;
- break;
-
case SYS_RES_IOPORT:
rm = &port_rman;
break;
@@ -591,4 +572,3 @@ nexus_settime(device_t dev, struct times
tm.tm_mday = ct.day;
return (efi_set_time(&tm));
}
-
More information about the svn-src-head
mailing list