PERFORCE change 169996 for review
Alexander Motin
mav at FreeBSD.org
Sat Oct 31 13:33:37 UTC 2009
http://p4web.freebsd.org/chv.cgi?CH=169996
Change 169996 by mav at mav_mavbook on 2009/10/31 13:33:35
IFC
Affected files ...
.. //depot/projects/scottl-camlock/src/sbin/mknod/mknod.8#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/mv_sata.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#33 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#22 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-dma.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-lowlevel.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-sata.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ahci.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-intel.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-promise.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-serverworks.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-siliconimage.c#9 integrate
Differences ...
==== //depot/projects/scottl-camlock/src/sbin/mknod/mknod.8#2 (text+ko) ====
@@ -26,9 +26,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)mknod.8 8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: src/sbin/mknod/mknod.8,v 1.31 2005/02/10 09:19:30 ru Exp $
+.\" $FreeBSD: src/sbin/mknod/mknod.8,v 1.32 2009/10/31 12:22:23 brueffer Exp $
.\"
-.Dd December 15, 2004
+.Dd October 31, 2009
.Dt MKNOD 8
.Os
.Sh NAME
@@ -74,9 +74,7 @@
.It Ar major
The major device number is an integer number which tells the kernel
which device driver entry point to use.
-To learn what
-major device number to use for a particular device, check
-.Pa /usr/src/sys/conf/majors .
+This is a compatibility shim and should be left zero.
.It Ar minor
The minor device number tells the kernel which subunit
the node corresponds to on the device; for example,
==== //depot/projects/scottl-camlock/src/sys/arm/mv/mv_sata.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/mv/mv_sata.c,v 1.1 2009/06/24 15:41:18 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/mv/mv_sata.c,v 1.2 2009/10/31 13:24:14 mav Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -548,14 +548,16 @@
uint32_t req_in;
int error, slot;
- sc = device_get_softc(GRANDPARENT(request->dev));
+ sc = device_get_softc(device_get_parent(request->parent));
ch = device_get_softc(request->parent);
mtx_assert(&ch->state_mtx, MA_OWNED);
/* Only DMA R/W goes through the EDMA machine. */
if (request->u.ata.command != ATA_READ_DMA &&
- request->u.ata.command != ATA_WRITE_DMA) {
+ request->u.ata.command != ATA_WRITE_DMA &&
+ request->u.ata.command != ATA_READ_DMA48 &&
+ request->u.ata.command != ATA_WRITE_DMA48) {
/* Disable EDMA before accessing legacy registers */
if (sata_edma_is_running(request->parent)) {
@@ -569,12 +571,9 @@
return (ata_begin_transaction(request));
}
- /* Check for 48 bit access and convert if needed */
- ata_modify_if_48bit(request);
-
/* Prepare data for DMA */
if ((error = ch->dma.load(request, NULL, NULL))) {
- device_printf(request->dev, "setting up DMA failed!\n");
+ device_printf(request->parent, "setting up DMA failed!\n");
request->result = error;
return ATA_OP_FINISHED;
}
@@ -633,7 +632,7 @@
uint32_t res_in, res_out, icr;
int slot;
- sc = device_get_softc(GRANDPARENT(request->dev));
+ sc = device_get_softc(device_get_parent(request->parent));
ch = device_get_softc(request->parent);
mtx_assert(&ch->state_mtx, MA_OWNED);
==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#33 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.309 2009/08/20 19:17:53 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.310 2009/10/31 13:24:14 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#22 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.147 2009/10/29 13:27:14 nwhitehorn Exp $
+ * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.148 2009/10/31 13:24:14 mav Exp $
*/
#if 0
==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-dma.c#15 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.161 2009/09/06 14:23:26 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.162 2009/10/31 13:24:14 mav Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-lowlevel.c#15 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.84 2008/05/08 17:55:44 grehan Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.85 2009/10/31 13:24:14 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.c#14 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.144 2009/04/29 21:17:18 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.145 2009/10/31 13:24:14 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#23 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.87 2009/10/26 11:20:14 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.88 2009/10/31 13:24:14 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-sata.c#8 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-sata.c,v 1.6 2009/06/24 15:38:17 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-sata.c,v 1.7 2009/10/31 13:24:14 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ahci.c#9 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-ahci.c,v 1.26 2009/07/08 06:00:21 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-ahci.c,v 1.27 2009/10/31 13:24:14 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-intel.c#9 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-intel.c,v 1.7 2009/06/24 19:49:18 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-intel.c,v 1.8 2009/10/31 13:24:14 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#12 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-marvell.c,v 1.13 2009/10/30 20:28:49 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-marvell.c,v 1.14 2009/10/31 13:24:14 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-promise.c#7 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-promise.c,v 1.11 2009/06/24 19:49:18 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-promise.c,v 1.12 2009/10/31 13:24:14 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-serverworks.c#8 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-serverworks.c,v 1.7 2009/10/29 13:28:37 nwhitehorn Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-serverworks.c,v 1.8 2009/10/31 13:24:14 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-siliconimage.c#9 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-siliconimage.c,v 1.8 2009/06/24 19:49:18 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-siliconimage.c,v 1.9 2009/10/31 13:24:14 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
More information about the p4-projects
mailing list