svn commit: r196285 - in stable/8/usr.sbin: . arp dumpcis iostat jls makefs makefs/ffs mfiutil ntp pstat sysinstall zic

[Scott Long]

Author: scottl
Date: Mon Aug 17 07:25:12 2009
New Revision: 196285
URL: http://svn.freebsd.org/changeset/base/196285

Log:
  Merge mfiutil
  
  Approved by:	re

Added:
  stable/8/usr.sbin/mfiutil/
     - copied from r196200, head/usr.sbin/mfiutil/
  stable/8/usr.sbin/mfiutil/mfiutil.8   (contents, props changed)
     - copied, changed from r196280, head/usr.sbin/mfiutil/mfiutil.8
Modified:
  stable/8/usr.sbin/   (props changed)
  stable/8/usr.sbin/Makefile
  stable/8/usr.sbin/arp/   (props changed)
  stable/8/usr.sbin/dumpcis/cardinfo.h   (props changed)
  stable/8/usr.sbin/dumpcis/cis.h   (props changed)
  stable/8/usr.sbin/iostat/   (props changed)
  stable/8/usr.sbin/jls/   (props changed)
  stable/8/usr.sbin/makefs/ffs/ffs_bswap.c   (props changed)
  stable/8/usr.sbin/makefs/ffs/ffs_subr.c   (props changed)
  stable/8/usr.sbin/makefs/ffs/ufs_bswap.h   (props changed)
  stable/8/usr.sbin/makefs/getid.c   (props changed)
  stable/8/usr.sbin/mfiutil/Makefile
  stable/8/usr.sbin/mfiutil/README   (props changed)
  stable/8/usr.sbin/mfiutil/mfi_drive.c
  stable/8/usr.sbin/mfiutil/mfiutil.1   (props changed)
  stable/8/usr.sbin/ntp/   (props changed)
  stable/8/usr.sbin/pstat/   (props changed)
  stable/8/usr.sbin/sysinstall/   (props changed)
  stable/8/usr.sbin/zic/   (props changed)

Modified: stable/8/usr.sbin/Makefile
==============================================================================
--- stable/8/usr.sbin/Makefile	Mon Aug 17 06:21:22 2009	(r196284)
+++ stable/8/usr.sbin/Makefile	Mon Aug 17 07:25:12 2009	(r196285)
@@ -94,6 +94,7 @@ SUBDIR=	${_ac} \
 	manctl \
 	memcontrol \
 	mergemaster \
+	mfiutil \
 	mixer \
 	${_mld6query} \
 	mlxcontrol \

Modified: stable/8/usr.sbin/mfiutil/Makefile
==============================================================================
--- head/usr.sbin/mfiutil/Makefile	Thu Aug 13 23:18:45 2009	(r196200)
+++ stable/8/usr.sbin/mfiutil/Makefile	Mon Aug 17 07:25:12 2009	(r196285)
@@ -3,6 +3,7 @@ PROG=	mfiutil
 
 SRCS=	mfiutil.c mfi_cmd.c mfi_config.c mfi_drive.c mfi_evt.c mfi_flash.c \
 	mfi_patrol.c mfi_show.c mfi_volume.c
+MAN8=	mfiutil.8
 
 CFLAGS+= -fno-builtin-strftime
 WARNS?=3

Modified: stable/8/usr.sbin/mfiutil/mfi_drive.c
==============================================================================
--- head/usr.sbin/mfiutil/mfi_drive.c	Thu Aug 13 23:18:45 2009	(r196200)
+++ stable/8/usr.sbin/mfiutil/mfi_drive.c	Mon Aug 17 07:25:12 2009	(r196285)
@@ -75,8 +75,9 @@ int
 mfi_lookup_drive(int fd, char *drive, uint16_t *device_id)
 {
 	struct mfi_pd_list *list;
-	long val;
 	uint8_t encl, slot;
+	long val;
+	u_int i;
 	char *cp;
 
 	/* Look for a raw device id first. */
@@ -117,15 +118,15 @@ mfi_lookup_drive(int fd, char *drive, ui
 			return (errno);
 		}
 
-		for (val = 0; val < list->count; val++) {
-			if (list->addr[val].scsi_dev_type != 0)
+		for (i = 0; i < list->count; i++) {
+			if (list->addr[i].scsi_dev_type != 0)
 				continue;
 
 			if (((encl == 0xff &&
-			    list->addr[val].encl_device_id == 0xffff) ||
-			    list->addr[val].encl_index == encl) &&
-			    list->addr[val].slot_number == slot) {
-				*device_id = list->addr[val].device_id;
+			    list->addr[i].encl_device_id == 0xffff) ||
+			    list->addr[i].encl_index == encl) &&
+			    list->addr[i].slot_number == slot) {
+				*device_id = list->addr[i].device_id;
 				free(list);
 				return (0);
 			}

Copied and modified: stable/8/usr.sbin/mfiutil/mfiutil.8 (from r196280, head/usr.sbin/mfiutil/mfiutil.8)
==============================================================================
--- head/usr.sbin/mfiutil/mfiutil.8	Mon Aug 17 06:05:55 2009	(r196280, copy source)
+++ stable/8/usr.sbin/mfiutil/mfiutil.8	Mon Aug 17 07:25:12 2009	(r196285)
@@ -27,8 +27,8 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 17, 2008
-.Dt MFIUTIL 1
+.Dd August 16, 2009
+.Dt MFIUTIL 8
 .Os
 .Sh NAME
 .Nm mfiutil
@@ -161,9 +161,6 @@ on the volume may be specified by the co
 device,
 such as
 .Em mfid0 .
-Note that this second method only works on OS versions
-.Dv 6.2-YAHOO-20070510
-and later.
 .Pp
 Drives may be specified in two forms.
 First,
@@ -562,13 +559,8 @@ patrol read starting in 5 minutes:
 .Pp
 .Sh SEE ALSO
 .Xr mfi 4
-.Sh BUGS
-On 64-bit OS versions
-.Dv 6.2-YAHOO-20070514
-and earlier,
-the 
-.Xr mfi 4
-driver does not properly report firmware errors to 32-bit versions of
-.Nm .
-As a result,
-some commands may fail even though they do not report any errors.
+.Sh HISTORY
+The
+.Nm
+utility first appeared in
+.Fx 8.0 .