Date: Tue, 8 Dec 2009 21:42:04 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r200275 - head/sys/arm/mv Message-ID: <200912082142.nB8Lg4A5000843@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Tue Dec 8 21:42:04 2009 New Revision: 200275 URL: http://svn.freebsd.org/changeset/base/200275 Log: Fix the build. Modified: head/sys/arm/mv/mv_sata.c Modified: head/sys/arm/mv/mv_sata.c ============================================================================== --- head/sys/arm/mv/mv_sata.c Tue Dec 8 20:48:06 2009 (r200274) +++ head/sys/arm/mv/mv_sata.c Tue Dec 8 21:42:04 2009 (r200275) @@ -137,6 +137,7 @@ static int sata_channel_begin_transactio static int sata_channel_end_transaction(struct ata_request *request); static int sata_channel_status(device_t dev); static int sata_channel_setmode(device_t dev, int target, int mode); +static int sata_channel_getrev(device_t dev, int target); static void sata_channel_reset(device_t dev); static void sata_channel_dmasetprd(void *xsc, bus_dma_segment_t *segs, int nsegs, int error); @@ -423,7 +424,7 @@ sata_channel_attach(device_t dev) ch->dev = dev; ch->unit = device_get_unit(dev); - ch->flags |= ATA_USE_16BIT | ATA_NO_SLAVE; + ch->flags |= ATA_USE_16BIT | ATA_NO_SLAVE | ATA_SATA; /* Set legacy ATA resources. */ for (i = ATA_DATA; i <= ATA_COMMAND; i++) { @@ -754,7 +755,16 @@ sata_channel_setmode(device_t parent, in /* Disable EDMA before using legacy registers */ sata_edma_ctrl(parent, 0); - return (ata_sata_setmode(dev, mode)); + return (ata_sata_setmode(parent, target, mode)); +} + +static int +sata_channel_getrev(device_t parent, int target) +{ + + /* Disable EDMA before using legacy registers */ + sata_edma_ctrl(parent, 0); + return (ata_sata_getrev(parent, target)); } static void @@ -843,6 +853,7 @@ static device_method_t sata_channel_meth /* ATA channel interface */ DEVMETHOD(ata_reset, sata_channel_reset), DEVMETHOD(ata_setmode, sata_channel_setmode), + DEVMETHOD(ata_getrev, sata_channel_getrev), { 0, 0 } };
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912082142.nB8Lg4A5000843>