[illumos-gate merge]

commit 647f62b3ed7123887134000e51e941611b5445ac
    5037 sdcard manual pages need catching up with PSARC 2009/648

Manifests:
	usr/src/pkg/manifests/driver-storage-sdcard.mf (torch sdcard.7d)

4 files changed, 4 insertions, 175 deletions

diff --git a/usr/src/man/man7d/Makefile b/usr/src/man/man7d/Makefile
index 4c864ace4d..fb796a8a50 100644
--- a/usr/src/man/man7d/Makefile
+++ b/usr/src/man/man7d/Makefile
@@ -229,7 +229,6 @@ i386_MANFILES=	ahci.7d		\
 		rwd.7d		\
 		rwn.7d		\
 		sda.7d		\
-		sdcard.7d	\
 		sdhost.7d	\
 		si3124.7d	\
 		smbios.7d	\
diff --git a/usr/src/man/man7d/sda.7d b/usr/src/man/man7d/sda.7d
index 265385f965..35d7e5d4b0 100644
--- a/usr/src/man/man7d/sda.7d
+++ b/usr/src/man/man7d/sda.7d
@@ -30,15 +30,6 @@ MultiMediaCard (MMC) slot and card device drivers.
 64-bit ELF kernel module (x86).
 .RE
 
-.sp
-.ne 2
-.na
-\fB\fB/kernel/misc/sparcv9/sda\fR\fR
-.ad
-.RS 28n
-64-bit ELF kernel module (SPARC).
-.RE
-
 .SH ATTRIBUTES
 .sp
 .LP
@@ -52,20 +43,13 @@ c | c
 l | l .
 ATTRIBUTE TYPE	ATTRIBUTE VALUE
 _
-Architecture	SPARC, x86
+Architecture	x86
 .TE
 
 .SH SEE ALSO
 .sp
 .LP
-\fBcfgadm_sdcard\fR(1M), \fBattributes\fR(5), \fBblk2scsa\fR(7D), \fBsd\fR(7D),
-\fBsdcard\fR(7D), \fBsdhost\fR(7D), \fBscsa2usb\fR(7D), \fBwbsd\fR(7D)
-.sp
-.LP
-\fISystem Administration Guide, Volume I\fR
-.sp
-.LP
-\fISystem Administration Guide: Basic Administration\fR
+\fBattributes\fR(5), \fBsdhost\fR(7D)
 .SH NOTES
 .sp
 .LP
diff --git a/usr/src/man/man7d/sdcard.7d b/usr/src/man/man7d/sdcard.7d
deleted file mode 100644
index 7bb667df03..0000000000
--- a/usr/src/man/man7d/sdcard.7d
+++ /dev/null
@@ -1,125 +0,0 @@
-'\" te
-.\" Copyright (c) 2008, Sun Microsystems, Inc.  All Rights Reserved
-.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
-.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
-.\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SDCARD 7D "Feb 28, 2008"
-.SH NAME
-sdcard \- SD/MMC memory card driver
-.SH DESCRIPTION
-.sp
-.LP
-The \fBsdcard\fR memory card driver supports MultiMediaCard (MMC), Secure
-Digital (SD), and Secure Digital High Capacity (SDHC) memory cards. It uses the
-\fBblk2scsa\fR(7D) service to present these cards to the system as SCSI disks
-on a virtual SCSI bus, creating a child device to be serviced with
-\fBsd\fR(7D). Each card appears as its own SCSI LUN. Cards are hot-pluggable
-and removable.
-.SH DEVICE SPECIAL FILES
-.sp
-.LP
-Disk block special file names are located in \fB/dev/dsk\fR. Raw file names are
-located in \fB/dev/rdsk\fR.  See \fBsd\fR(7D).
-.SH IOCTLS
-.sp
-.LP
-See \fBdkio\fR(7I)
-.SH ERRORS
-.sp
-.LP
-See \fBsd\fR(7D) and \fBblk2scsa\fR(7D). Additionally, \fBsdcard\fR may issue
-the following warnings, which indicate a failure to identify the card as a
-supported type:
-.sp
-.in +2
-.nf
-"Unknown SD CSD version (%d)"
-"Unknown MMC CSD version (%d)"
-"Unknown MMCA version (%d)"
-"Card type unknown"
-.fi
-.in -2
-
-.SH FILES
-.sp
-.LP
-Device special files for the storage device are created in the same way as
-those for a SCSI disk. See \fBsd\fR(7D) for more information.
-.sp
-.ne 2
-.na
-\fB/dev/dsk/c\fIn\fRt\fIn\fRd\fIn\fRs\fIn\fR\fR
-.ad
-.RS 30n
-Block files for disks.
-.RE
-
-.sp
-.ne 2
-.na
-\fB/dev/rdsk/c\fIn\fRt\fIn\fRd\fIn\fRs\fIn\fR\fR
-.ad
-.RS 30n
-Raw files for disks.
-.RE
-
-.sp
-.ne 2
-.na
-\fB/kernel/drv/sdcard\fR
-.ad
-.RS 30n
-32-bit ELF kernel module (x86).
-.RE
-
-.sp
-.ne 2
-.na
-\fB/kernel/misc/amd64/sdcard\fR
-.ad
-.RS 30n
-64-bit ELF kernel module (x86).
-.RE
-
-.sp
-.ne 2
-.na
-\fB/kernel/drv/sparcv9/sdcard\fR
-.ad
-.RS 30n
-64-bit ELF kernel module (SPARC).
-.RE
-
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(5) for a description of the following attributes:
-.sp
-
-.sp
-.TS
-box;
-c | c
-l | l .
-ATTRIBUTE TYPE	ATTRIBUTE VALUE
-_
-Architecture	SPARC, x86
-.TE
-
-.SH SEE ALSO
-.sp
-.LP
-\fBrmformat\fR(1), \fBrmmount\fR(1), \fBcfgadm_scsi\fR(1M),
-\fBcfgadm_sdcard\fR(1M), \fBfdisk\fR(1M), \fBmount\fR(1M), \fBumount\fR(1M),
-\fBscsi\fR(4), \fBvfstab\fR(4), \fBattributes\fR(5), \fBblk2scsa\fR(7D),
-\fBsd\fR(7D), \fBsda\fR(7D), \fBdkio\fR(7I), \fBpcfs\fR(7FS)
-.sp
-.LP
-\fISystem Administration Guide, Volume I\fR
-.sp
-.LP
-\fISystem Administration Guide: Basic Administration\fR
-.SH DIAGNOSTICS
-.sp
-.LP
-See \fBsd\fR(7D).
diff --git a/usr/src/man/man7d/sdhost.7d b/usr/src/man/man7d/sdhost.7d
index 158ce41cc1..c1cc7aaf0b 100644
--- a/usr/src/man/man7d/sdhost.7d
+++ b/usr/src/man/man7d/sdhost.7d
@@ -20,20 +20,6 @@ The \fBsdhost\fR driver supports Secure Digital (SD) standard media slots
 commonly found on mobile computers.
 .SH FILES
 .sp
-.LP
-Memory card device files are created by the \fBsdcard\fR(7D) driver. An
-attachment point device file is created for each physical slot on the system:
-.sp
-.ne 2
-.na
-\fB\fB/dev/sdcardx/y\fR\fR
-.ad
-.RS 30n
-Attachment point for slot \fIy\fR on controller \fIx\fR. Typically this is
-named \fB/dev/sdcard0/0\fR.
-.RE
-
-.sp
 .ne 2
 .na
 \fB\fB/kernel/drv/sdhost\fR\fR
@@ -51,15 +37,6 @@ named \fB/dev/sdcard0/0\fR.
 64-bit ELF kernel module (x86).
 .RE
 
-.sp
-.ne 2
-.na
-\fB\fB/kernel/drv/sparcv9/sdhost\fR\fR
-.ad
-.RS 30n
-64-bit ELF kernel module (SPARC).
-.RE
-
 .SH ATTRIBUTES
 .sp
 .LP
@@ -73,16 +50,10 @@ c | c
 l | l .
 ATTRIBUTE TYPE	ATTRIBUTE VALUE
 _
-Architecture	SPARC, x86
+Architecture	x86
 .TE
 
 .SH SEE ALSO
 .sp
 .LP
-\fBcfgadm_sdcard\fR(1M), \fBattributes\fR(5), \fBsda\fR(7D), \fBsdcard\fR(7D)
-.sp
-.LP
-\fISystem Administration Guide, Volume I\fR
-.sp
-.LP
-\fISystem Administration Guide: Basic Administration\fR
+\fBattributes\fR(5), \fBsda\fR(7D)