From owner-svn-src-stable@FreeBSD.ORG Mon Dec 21 21:08:12 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4F1AA106566C; Mon, 21 Dec 2009 21:08:12 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Received: from mail-bw0-f213.google.com (mail-bw0-f213.google.com [209.85.218.213]) by mx1.freebsd.org (Postfix) with ESMTP id 31AB18FC14; Mon, 21 Dec 2009 21:08:10 +0000 (UTC) Received: by bwz5 with SMTP id 5so3760674bwz.3 for ; Mon, 21 Dec 2009 13:08:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type; bh=b5mlTSZfMT7+yAIpzWKzi+T9h2k1f8cHCJMnx/blbeE=; b=JL6SIIjXJcOeoofwZXpCP/+u5u0e1BPha2j4aMhsdt6UiVM/pwKSl8PpfSKTDcwN6i dq3eovK7f/FcQSlzmFe5/xZq3DxAvaDq22+EE6prRDn5CyLPKVHlNFvQYldfEbEFi7na 0qyrttAMSMfq3YzHEQtzIcZ8uwVsR0suWzNbw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=BiZKs8VGVEwByNAqbZbEhkHjEl+iOR54q0GNmvAD3YLPUrVxmVP4+IsyqmKY2G16Sf tNL/dknDI7XXIqMovLwsBIGuC/GIsZjdkH2l/4EkJueaL7vnAoaOPNon4iqlKoYd8D6r cwZUl76gLR2IILSH0ZgJZp4tOUjf9hEB6HUcw= MIME-Version: 1.0 Received: by 10.204.35.139 with SMTP id p11mr5095003bkd.178.1261429689323; Mon, 21 Dec 2009 13:08:09 -0800 (PST) In-Reply-To: <200912212017.nBLKHZQo039636@svn.freebsd.org> References: <200912212017.nBLKHZQo039636@svn.freebsd.org> Date: Mon, 21 Dec 2009 22:08:08 +0100 Message-ID: <6101e8c40912211308r38c95d6w2d63402cc5c06ef6@mail.gmail.com> From: Oliver Pinter To: Marius Strobl Content-Type: text/plain; charset=ISO-8859-1 Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-8@freebsd.org Subject: Re: svn commit: r200807 - stable/8/sys/dev/ata/chipsets X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Dec 2009 21:08:12 -0000 typo in this line: * American Micro Devices (AMD) chipset support functions 's/American/Advanced/g' http://en.wikipedia.org/wiki/Advanced_Micro_Devices On 12/21/09, Marius Strobl wrote: > Author: marius > Date: Mon Dec 21 20:17:34 2009 > New Revision: 200807 > URL: http://svn.freebsd.org/changeset/base/200807 > > Log: > MFC: r200544 > > Set ATA_CHECKS_CABLE when appropriate. > > Reviewed by: mav > > Modified: > stable/8/sys/dev/ata/chipsets/ata-amd.c > Directory Properties: > stable/8/sys/ (props changed) > stable/8/sys/amd64/include/xen/ (props changed) > stable/8/sys/cddl/contrib/opensolaris/ (props changed) > stable/8/sys/contrib/dev/acpica/ (props changed) > stable/8/sys/contrib/pf/ (props changed) > stable/8/sys/dev/xen/xenpci/ (props changed) > > Modified: stable/8/sys/dev/ata/chipsets/ata-amd.c > ============================================================================== > --- stable/8/sys/dev/ata/chipsets/ata-amd.c Mon Dec 21 20:12:01 > 2009 (r200806) > +++ stable/8/sys/dev/ata/chipsets/ata-amd.c Mon Dec 21 20:17:34 > 2009 (r200807) > @@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$"); > #include > > /* local prototypes */ > +static int ata_amd_ch_attach(device_t dev); > static int ata_amd_chipinit(device_t dev); > static int ata_amd_setmode(device_t dev, int target, int mode); > > @@ -59,7 +60,6 @@ static int ata_amd_setmode(device_t dev, > #define AMD_BUG 0x01 > #define AMD_CABLE 0x02 > > - > /* > * American Micro Devices (AMD) chipset support functions > */ > @@ -100,6 +100,7 @@ ata_amd_chipinit(device_t dev) > else > pci_write_config(dev, 0x41, pci_read_config(dev, 0x41, 1) | 0xf0, 1); > > + ctlr->ch_attach = ata_amd_ch_attach; > ctlr->setmode = ata_amd_setmode; > return 0; > } > @@ -137,4 +138,19 @@ ata_amd_setmode(device_t dev, int target > return (mode); > } > > +static int > +ata_amd_ch_attach(device_t dev) > +{ > + struct ata_pci_controller *ctlr; > + struct ata_channel *ch; > + int error; > + > + ctlr = device_get_softc(device_get_parent(dev)); > + ch = device_get_softc(dev); > + error = ata_pci_ch_attach(dev); > + if (ctlr->chip->cfg1 & AMD_CABLE) > + ch->flags |= ATA_CHECKS_CABLE; > + return (error); > +} > + > ATA_DECLARE_DRIVER(ata_amd); > _______________________________________________ > svn-src-stable@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-stable > To unsubscribe, send any mail to "svn-src-stable-unsubscribe@freebsd.org" >