Date: Mon, 9 Jul 2012 19:27:49 +0000 (UTC) From: Marcel Moolenaar <marcel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r238307 - projects/altix2/sys/dev/ata Message-ID: <201207091927.q69JRnSZ035847@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcel Date: Mon Jul 9 19:27:48 2012 New Revision: 238307 URL: http://svn.freebsd.org/changeset/base/238307 Log: o Remove needless bus_if method definitions. o Initialize r_io[ATA_IDX_ADDR], just in case. o Set ATA_USE_16BIT & ATA_NO_ATAPI_DMA. The former is needed, the latter is to eliminate a dependency on busdma/mi for now. Modified: projects/altix2/sys/dev/ata/ata-ioc4.c Modified: projects/altix2/sys/dev/ata/ata-ioc4.c ============================================================================== --- projects/altix2/sys/dev/ata/ata-ioc4.c Mon Jul 9 18:34:21 2012 (r238306) +++ projects/altix2/sys/dev/ata/ata-ioc4.c Mon Jul 9 19:27:48 2012 (r238307) @@ -59,11 +59,6 @@ static device_method_t ata_ioc4_methods[ DEVMETHOD(device_probe, ata_ioc4_probe), DEVMETHOD(device_attach, ata_ioc4_attach), DEVMETHOD(device_detach, ata_ioc4_detach), - - DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource), - DEVMETHOD(bus_release_resource, bus_generic_release_resource), - DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), - DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), DEVMETHOD_END }; @@ -114,9 +109,11 @@ ata_ioc4_attach(device_t dev) } ch->r_io[ATA_CONTROL].res = mres; ch->r_io[ATA_CONTROL].offset = 32; + ch->r_io[ATA_IDX_ADDR].res = mres; ata_default_registers(dev); ch->unit = 0; + ch->flags |= ATA_USE_16BIT | ATA_NO_ATAPI_DMA; ata_generic_hw(dev); return (ata_attach(dev)); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207091927.q69JRnSZ035847>