From owner-svn-src-projects@FreeBSD.ORG Mon Jul 9 19:27:49 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8B4D1106566C; Mon, 9 Jul 2012 19:27:49 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 76B8F8FC19; Mon, 9 Jul 2012 19:27:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q69JRntj035849; Mon, 9 Jul 2012 19:27:49 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q69JRnSZ035847; Mon, 9 Jul 2012 19:27:49 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201207091927.q69JRnSZ035847@svn.freebsd.org> From: Marcel Moolenaar Date: Mon, 9 Jul 2012 19:27:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r238307 - projects/altix2/sys/dev/ata X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jul 2012 19:27:49 -0000 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)); }