PERFORCE change 171048 for review
Alexander Motin
mav at FreeBSD.org
Thu Nov 26 09:44:27 UTC 2009
http://p4web.freebsd.org/chv.cgi?CH=171048
Change 171048 by mav at mav_mavbook on 2009/11/26 09:44:11
IFC
Affected files ...
.. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.8#11 integrate
.. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#34 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#27 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#36 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#88 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#32 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#10 integrate
Differences ...
==== //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.8#11 (text+ko) ====
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.47 2009/11/09 11:39:51 mav Exp $
+.\" $FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.48 2009/11/26 08:49:46 mav Exp $
.\"
.Dd November 9, 2009
.Dt CAMCONTROL 8
==== //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#34 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.70 2009/11/24 12:47:58 mav Exp $");
+__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.71 2009/11/26 08:49:46 mav Exp $");
#include <sys/ioctl.h>
#include <sys/stdint.h>
@@ -3283,7 +3283,7 @@
}
if (spi && offset != -1) {
if ((cpi.hba_inquiry & PI_SDTR_ABLE) == 0) {
- warnx("HBA is not cable of changing offset");
+ warnx("HBA is not capable of changing offset");
retval = 1;
goto ratecontrol_bailout;
}
@@ -3296,7 +3296,7 @@
u_int freq;
if ((cpi.hba_inquiry & PI_SDTR_ABLE) == 0) {
- warnx("HBA is not cable of changing "
+ warnx("HBA is not capable of changing "
"transfer rates");
retval = 1;
goto ratecontrol_bailout;
@@ -3323,7 +3323,7 @@
}
if (sata && syncrate != -1) {
if ((cpi.hba_inquiry & PI_SDTR_ABLE) == 0) {
- warnx("HBA is not cable of changing "
+ warnx("HBA is not capable of changing "
"transfer rates");
retval = 1;
goto ratecontrol_bailout;
==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#27 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.8 2009/11/24 12:47:58 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.9 2009/11/26 08:49:46 mav Exp $");
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#27 (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/cam/ata/ata_all.h,v 1.7 2009/11/24 12:47:58 mav Exp $
+ * $FreeBSD: src/sys/cam/ata/ata_all.h,v 1.8 2009/11/26 08:49:46 mav Exp $
*/
#ifndef CAM_ATA_ALL_H
==== //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#36 (text+ko) ====
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.41 2009/11/24 12:47:58 mav Exp $
+ * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.42 2009/11/26 08:49:46 mav Exp $
*/
#ifndef _CAM_CAM_CCB_H
==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#88 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.17 2009/11/24 12:47:58 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.18 2009/11/26 08:49:46 mav Exp $");
#include <sys/param.h>
#include <sys/module.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#32 (text+ko) ====
@@ -24,7 +24,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/ahci/ahci.h,v 1.6 2009/11/24 12:47:58 mav Exp $
+ * $FreeBSD: src/sys/dev/ahci/ahci.h,v 1.7 2009/11/26 08:49:46 mav Exp $
*/
/* ATA register defines */
==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#26 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/siis/siis.c,v 1.12 2009/11/24 12:47:58 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/siis/siis.c,v 1.13 2009/11/26 08:49:46 mav Exp $");
#include <sys/param.h>
#include <sys/module.h>
==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#10 (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/siis/siis.h,v 1.4 2009/11/24 12:47:58 mav Exp $
+ * $FreeBSD: src/sys/dev/siis/siis.h,v 1.5 2009/11/26 08:49:46 mav Exp $
*/
/* ATA register defines */
More information about the p4-projects
mailing list