Date: Tue, 8 Dec 2009 21:21:03 +0100 From: Kristof Provost <kristof@sigsegv.be> To: Alexander Motin <mav@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r200171 - in head: sbin/atacontrol sys/arm/mv sys/cam/ata sys/cam/scsi sys/conf sys/dev/ata sys/dev/ata/chipsets sys/powerpc/powermac sys/powerpc/psim Message-ID: <20091208202103.GN2753@nereid> In-Reply-To: <200912060010.nB60AD12004058@svn.freebsd.org> References: <200912060010.nB60AD12004058@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 2009-12-06 00:10:13 (+0000), Alexander Motin <mav@FreeBSD.org> wrote: > Author: mav > Date: Sun Dec 6 00:10:13 2009 > New Revision: 200171 > URL: http://svn.freebsd.org/changeset/base/200171 I think this commit broke the build for mv_sata. sys/arm/mv/mv_sata.c currently reads: @@ -751,10 +751,10 @@ static int sata_channel_setmode(device_t parent, int target, int mode) { /* Disable EDMA before using legacy registers */ sata_edma_ctrl(parent, 0); return (ata_sata_setmode(dev, mode)); } This doesn't build because 'dev' isn't defined. As far as I can tell the following patch matches what was intended, but I have no idea if it's correct. It does at least build: Index: sys/arm/mv/mv_sata.c =================================================================== --- sys/arm/mv/mv_sata.c (revision 200245) +++ sys/arm/mv/mv_sata.c (working copy) @@ -751,10 +751,10 @@ static int sata_channel_setmode(device_t parent, int target, int mode) { /* Disable EDMA before using legacy registers */ sata_edma_ctrl(parent, 0); - return (ata_sata_setmode(dev, mode)); + return (min(mode, ATA_UDMA5)); } Regards, Kristof
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20091208202103.GN2753>