--- a/usr/src/cmd/fwflash/common/fwflash.c	Tue May 27 18:30:15 2008 -0700
+++ b/usr/src/cmd/fwflash/common/fwflash.c	Tue May 27 18:50:55 2008 -0700
@@ -48,6 +48,7 @@
 #include <libintl.h> /* for gettext(3c) */
 #include <libdevinfo.h>
 #include <note.h>
+
 #include <fwflash/fwflash.h>
 
 
@@ -144,7 +145,7 @@
 	}
 
 
-	while ((ch = getopt(argc, argv, "hvylc:f:r:Qd:M")) != EOF) {
+	while ((ch = getopt(argc, argv, "hvylc:f:r:Qd:")) != EOF) {
 		switch (ch) {
 		case 'h':
 			fwflash_arg_list |= FWFLASH_HELP_FLAG;
@@ -190,15 +191,8 @@
 			/* NOT in the manpage */
 			fwflash_debug = 1;
 			break;
-		case 'M':
-			/* NOT in the manpage */
-#if defined(MANUFACTURING_MODE)
-			manufacturing_mode = 1;
-			logmsg(MSG_WARN, "Enabling Manufactuing Mode "
-			    "operations. This can be destructive!\n");
-			break;
-#endif
-		/* illegal options */
+
+	/* illegal options */
 		default:
 			fwflash_usage(optarg);
 			return (FWFLASH_FAILURE);
@@ -427,20 +421,7 @@
 		    != NULL) {
 			/* max length of drivername */
 			tmpplug->drvname = calloc(1, 17);
-
-			/* are we doing double-time? */
-			if (strncmp((char *)sym, plugdir->d_name, 17) != 0) {
-				char *tempnm = calloc(1, 17);
-
-				memcpy(tempnm, plugdir->d_name, 17);
-				(void) strlcpy(tmpplug->drvname,
-				    strtok(tempnm, "."),
-				    strlen(plugdir->d_name) + 1);
-				free(tempnm);
-			} else {
-				(void) strlcpy(tmpplug->drvname,
-				    (char *)sym, strlen(sym) + 1);
-			}
+			(void) strlcpy(tmpplug->drvname, (char *)sym, 17);
 		} else {
 			CLOSEFREE();
 			continue;
@@ -495,7 +476,7 @@
 			    gettext("Unable to allocate %d bytes for "
 				"filename %s\n"),
 			    strlen(tmpplug->filename) + 1,
-			    tmpplug->filename);
+			    tmpplug->drvname);
 			return (FWFLASH_FAILURE);
 		}
 
@@ -541,6 +522,7 @@
 	int imgfd;
 	char *fwvrfydirpath, *tempdirpath, *filename;
 	char *clean; /* for the space-removed vid */
+
 	struct stat fwstat;
 	struct vrfyplugin *vrfy;
 	void *vrfysym;
@@ -1144,9 +1126,12 @@
 			free(thisdev->access_devname);
 			free(thisdev->drvname);
 			free(thisdev->classname);
-			if (thisdev->ident != NULL)
+			if (thisdev->ident != NULL) {
+				free(thisdev->ident->vid);
+				free(thisdev->ident->pid);
+				free(thisdev->ident->revid);
 				free(thisdev->ident);
-
+			}
 			thisdev->ident = NULL;
 			thisdev->plugin = NULL; /* we free this elsewhere */
 			/* CONSTCOND */

--- a/usr/src/cmd/fwflash/common/fwflash.h	Tue May 27 18:30:15 2008 -0700
+++ b/usr/src/cmd/fwflash/common/fwflash.h	Tue May 27 18:50:55 2008 -0700
@@ -355,8 +355,6 @@
 struct fw_plugin *self;
 
 
-int manufacturing_mode;
-
 /*
  * utility defines and macros, since the firmware image we get
  * from LSI is ARM-format and that means byte- and short-swapping

--- a/usr/src/cmd/fwflash/i386/Makefile	Tue May 27 18:30:15 2008 -0700
+++ b/usr/src/cmd/fwflash/i386/Makefile	Tue May 27 18:50:55 2008 -0700
@@ -49,8 +49,7 @@
 POFILES= $(SRCS:%.c=%.po)
 POFILE= fwflash_msg.po
 
-
-CFLAGS	+= -g -D_POSIX_PTHREAD_SEMANTICS -D MANUFACTURING_MODE=0
+CFLAGS	+= -g -D_POSIX_PTHREAD_SEMANTICS
 LDLIBS += -ldevinfo -lumem
 
 #

--- a/usr/src/cmd/fwflash/plugins/transport/common/ses.c	Tue May 27 18:30:15 2008 -0700
+++ b/usr/src/cmd/fwflash/plugins/transport/common/ses.c	Tue May 27 18:50:55 2008 -0700
@@ -42,11 +42,13 @@
 #include <fcntl.h>
 #include <string.h>
 #include <strings.h>
-#include <scsi/libscsi.h>
+
 #include <scsi/libses.h>
 #include <sys/scsi/generic/commands.h>
 #include <sys/scsi/impl/uscsi.h>
+
 #include <libintl.h> /* for gettext(3c) */
+
 #include <fwflash/fwflash.h>
 
 
@@ -121,13 +123,10 @@
 
 char drivername[] = "ses\0";
 static char *devprefix = "/devices";
-static char *sessuffix = ":0";
-static char *sgensuffix = ":ses";
+static char *devsuffix = ":0";
+static ses_target_t *ses_target;
 
 
-static ses_target_t *ses_target;
-static int internalstatus;
-
 extern di_node_t rootnode;
 extern int errno;
 extern struct fw_plugin *self;
@@ -143,10 +142,12 @@
 
 
 /* helper functions */
+static struct vpr *inquiry(char *path);
+static int ses_dl_ucode_check(struct devicelist *flashdev);
 static ses_walk_action_t  print_updated_status(ses_node_t *np, void *arg);
 static int get_status(nvlist_t *props, ucode_status_t *sp);
 static ses_walk_action_t sendimg(ses_node_t *np, void *data);
-static void tidyup(struct devicelist *thisdev);
+
 
 
 /*
@@ -157,14 +158,15 @@
 int
 fw_readfw(struct devicelist *flashdev, char *filename)
 {
+	int rv = FWFLASH_SUCCESS;
 
 	logmsg(MSG_INFO,
-	    "%s: not writing firmware for device %s to file %s\n",
-	    flashdev->drvname, flashdev->access_devname, filename);
-	logmsg(MSG_ERROR, gettext("\n\nReading of firmware images from "
-	    "your device is not currently supported\n\n"));
+	    "ses: not writing firmware for device %s to file %s\n",
+	    flashdev->access_devname, filename);
+	logmsg(MSG_ERROR, gettext("\n\nSES2 does not support retrieval "
+	    "of firmware images\n\n"));
 
-	return (FWFLASH_SUCCESS);
+	return (rv);
 }
 
 
@@ -192,11 +194,8 @@
 	if (nvlist_alloc(&nvl, NV_UNIQUE_NAME, 0) != 0 ||
 	    nvlist_add_uint64(nvl, SES_CTL_PROP_UCODE_MODE,
 	    SES_DLUCODE_M_WITH_OFFS) != 0) {
-		logmsg(MSG_ERROR,
-		    gettext("%s: Unable to allocate "
-		    "space for device prop list\n"),
-		    flashdev->drvname);
-		tidyup(flashdev);
+		logmsg(MSG_ERROR, gettext("ses: Unable to allocate "
+		    "space for device prop list\n"));
 		return (FWFLASH_FAILURE);
 	}
 
@@ -204,11 +203,8 @@
 	if ((verifier == NULL) || (verifier->imgsize == 0) ||
 	    (verifier->fwimage == NULL)) {
 		/* should _not_ happen */
-		logmsg(MSG_ERROR,
-		    gettext("%s: Firmware image has not "
-		    "been verified.\n"),
-		    flashdev->drvname);
-		tidyup(flashdev);
+		logmsg(MSG_ERROR, gettext("ses: Firmware image has not "
+		    "been verified.\n"));
 		return (FWFLASH_FAILURE);
 	}
 
@@ -216,10 +212,8 @@
 
 	if (nvlist_add_uint64(nvl, SES_CTL_PROP_UCODE_BUFID,
 	    verifier->flashbuf) != 0) {
-		logmsg(MSG_ERROR,
-		    gettext("%s: Unable to add buffer id "
-		    "property, hence unable to flash device\n"),
-		    flashdev->drvname);
+		logmsg(MSG_ERROR, gettext("ses: Unable to add buffer id "
+		    "property\n"));
 		goto cancel;
 	}
 
@@ -227,15 +221,15 @@
 	    (uint8_t *)verifier->fwimage, verifier->imgsize) != 0) {
 		logmsg(MSG_ERROR,
 		    "%s: Out of memory for property addition\n",
-		    flashdev->drvname);
+		    drivername);
 		goto cancel;
 	}
 
 	if ((ses_target =
 	    ses_open(LIBSES_VERSION, flashdev->access_devname)) == NULL) {
 		logmsg(MSG_ERROR,
-		    gettext("%s: Unable to open flashable device\n%s\n"),
-		    flashdev->drvname, flashdev->access_devname);
+		    gettext("ses: Unable to open flashable device\n%s\n"),
+		    flashdev->access_devname);
 		goto cancel;
 	}
 	snapshot = ses_snap_hold(ses_target);
@@ -245,25 +239,22 @@
 	 * to do it this way when using libses.
 	 */
 
-	internalstatus = FWFLASH_SUCCESS;
 	(void) ses_walk(snapshot, sendimg, nvl);
 
-	if (internalstatus == FWFLASH_SUCCESS) {
-		logmsg(MSG_ERROR,
-		    gettext("%s: Done. New image will be active "
-		    "after the system is rebooted.\n"),
-		    flashdev->drvname);
-		fprintf(stdout, "\n");
-	}
+
+	logmsg(MSG_ERROR,
+	    gettext("ses: Done. New image will be active "
+	    "after the system is rebooted.\n"));
+
+	fprintf(stdout, "\n");
 
 	ses_snap_rele(snapshot);
 	ses_close(ses_target);
 
 cancel:
 	nvlist_free(nvl);
-	tidyup(flashdev);
 
-	return (internalstatus);
+	return (FWFLASH_SUCCESS);
 }
 
 
@@ -285,40 +276,25 @@
 	di_node_t thisnode;
 	struct devicelist *newdev;
 	char *devpath;
-	char *devsuffix;
-	char *driver;
 	int idx = start;
 	int devlength = 0;
-	nvlist_t *props;
-	ses_snap_t *snapshot;
-	ses_node_t *rootnodep, *nodep, *tnodep;
 
 
-	if (strcmp(self->drvname, "sgen") == 0) {
-		devsuffix = sgensuffix;
-		driver = self->drvname;
-
-	} else {
-		devsuffix = sessuffix;
-		driver = drivername;
-	}
-
-	thisnode = di_drv_first_node(driver, rootnode);
+	thisnode = di_drv_first_node(drivername, rootnode);
 
 	if (thisnode == DI_NODE_NIL) {
 		logmsg(MSG_INFO, gettext("No %s nodes in this system\n"),
-		    driver);
+		    drivername);
 
 		return (rv);
 	}
 
 	if ((devpath = calloc(1, MAXPATHLEN + 1)) == NULL) {
-		logmsg(MSG_ERROR,
-		    gettext("%s: Unable to allocate space "
-		    "for a device node\n"),
-		    driver);
+		logmsg(MSG_ERROR, gettext("ses: Unable to malloc space "
+		    "for a %s-attached device node\n"), drivername);
 		return (rv);
 	}
+	bzero(devpath, MAXPATHLEN);
 
 	/* we've found one, at least */
 
@@ -329,203 +305,102 @@
 		if ((newdev = calloc(1, sizeof (struct devicelist)))
 		    == NULL) {
 			logmsg(MSG_ERROR,
-			    gettext("%s: identification function unable "
-			    "to allocate space for device entry\n"),
-			    driver);
-			tidyup(newdev);
-			free(devpath);
+			    gettext("ses: identification function unable "
+			    "to allocate space for device entry\n"));
 			return (rv);
 		}
 
-		/* calloc enough for /devices + devpath + devsuffix + '\0' */
+		/* malloc enough for /devices + devpath + ":0" + '\0' */
 		devlength = strlen(devpath) + strlen(devprefix) +
 		    strlen(devsuffix) + 2;
 
 		if ((newdev->access_devname = calloc(1, devlength)) == NULL) {
-			logmsg(MSG_ERROR,
-			    gettext("%s: Unable to allocate "
-			    "space for a devfs name\n"),
-			    driver);
-			tidyup(newdev);
+			logmsg(MSG_ERROR, gettext("ses: Unable to malloc "
+			    "space for a devfs name\n"));
 			free(devpath);
-			free(newdev);
 			return (FWFLASH_FAILURE);
 		}
 		snprintf(newdev->access_devname, devlength,
 		    "%s%s%s", devprefix, devpath, devsuffix);
 
-		if ((newdev->drvname = calloc(1, strlen(driver) + 1))
+		if ((newdev->drvname = calloc(1, strlen(drivername) + 1))
 		    == NULL) {
-			logmsg(MSG_ERROR,
-			    gettext("%s: Unable to allocate "
-			    "space to store a driver name\n"),
-			    driver);
-			tidyup(newdev);
+			logmsg(MSG_ERROR, gettext("ses: Unable to malloc "
+			    "space for a driver name\n"));
 			free(newdev->access_devname);
 			free(newdev);
-			free(devpath);
 			return (FWFLASH_FAILURE);
 		}
-		(void) strlcpy(newdev->drvname, driver,
-		    strlen(driver) + 1);
+		(void) strlcpy(newdev->drvname, drivername,
+		    strlen(drivername) + 1);
 
-		if ((newdev->classname = calloc(1, strlen(driver) + 1))
+		if ((newdev->classname = calloc(1, strlen(drivername) + 1))
 		    == NULL) {
-			logmsg(MSG_ERROR,
-			    gettext("%s: Unable to malloc "
-			    "space for a class name\n"),
-			    drivername);
-			tidyup(newdev);
+			logmsg(MSG_ERROR, gettext("ses: Unable to malloc "
+			    "space for a class name\n"));
 			free(newdev->access_devname);
 			free(newdev->drvname);
 			free(newdev);
-			free(devpath);
 			return (FWFLASH_FAILURE);
 		}
-		(void) strlcpy(newdev->classname, driver,
-		    strlen(driver) + 1);
-
-		/*
-		 * Only alloc as much as we truly need, and DON'T forget
-		 * that libnvpair manages the memory for property lookups!
-		 * That means we need to call tidyup() after fw_writefw()
-		 * and fw_devinfo().
-		 */
-		newdev->ident = calloc(1, VIDLEN + PIDLEN + REVLEN + 3);
-		if (newdev->ident == NULL) {
-			logmsg(MSG_ERROR,
-			    gettext("%s: Unable to malloc %d bytes "
-			    "for SCSI INQUIRY data\n"),
-			    driver, sizeof (struct vpr));
-			tidyup(newdev);
-			free(newdev->classname);
-			free(newdev->drvname);
-			free(newdev->access_devname);
-			free(newdev);
-			free(devpath);
-			return (FWFLASH_FAILURE);
-		}
+		(void) strlcpy(newdev->classname, drivername,
+		    strlen(drivername) + 1);
 
 
-		if ((ses_target =
-		    ses_open(LIBSES_VERSION, newdev->access_devname))
-		    == NULL) {
+		/*
+		 * Check for friendly vendor names, and whether this device
+		 * supports the Download Microcode Control page.
+		 */
+
+		newdev->ident = inquiry(newdev->access_devname);
+		rv = ses_dl_ucode_check(newdev);
+		if ((rv == FWFLASH_FAILURE) || (newdev->ident == NULL))
+			continue;
+
+
+		if (newdev->ident == NULL) {
 			logmsg(MSG_INFO,
-			    gettext("%s: Unable to open device\n%s\n"),
-			    driver,
+			    "ses: unable to inquire on potentially "
+			    "flashable device\n%s\n",
 			    newdev->access_devname);
-			tidyup(newdev);
-			free(newdev->ident);
-			free(newdev->classname);
 			free(newdev->access_devname);
 			free(newdev->drvname);
+			free(newdev->classname);
 			free(newdev);
-			free(devpath);
-			continue;
-		}
-		snapshot = ses_snap_hold(ses_target);
-		rootnodep = ses_root_node(snapshot);
-
-		/*
-		 * The root node of the snapshot is likely to be of
-		 * type SES_NODE_TARGET, so use Shank's Pony to get
-		 * where we need to go
-		 */
-		nodep = ses_node_child(rootnodep);
-		tnodep = nodep;
-
-		if ((props = ses_node_props(rootnodep)) == NULL) {
-			tidyup(newdev);
-			free(newdev->ident);
-			ses_snap_rele(snapshot);
-			ses_close(ses_target);
-			free(newdev->classname);
-			free(newdev->access_devname);
-			free(newdev->drvname);
-			free(newdev);
-			free(devpath);
 			continue;
 		}
 
 		/*
-		 * If these properties don't exist, this device does
-		 * not comply with SES2 so we won't touch it.
+		 * Look for the target-port property. We use addresses[1]
+		 * because addresses[0] is already assigned by the inquiry
+		 * function
 		 */
-		if ((nvlist_lookup_string(props, SCSI_PROP_VENDOR,
-		    &newdev->ident->vid) != 0) ||
-		    (nvlist_lookup_string(props, SCSI_PROP_PRODUCT,
-		    &newdev->ident->pid) != 0) ||
-		    (nvlist_lookup_string(props, SCSI_PROP_REVISION,
-		    &newdev->ident->revid) != 0)) {
-			tidyup(newdev);
-			free(newdev->ident);
-			ses_snap_rele(snapshot);
-			ses_close(ses_target);
-			free(newdev->classname);
-			free(newdev->access_devname);
-			free(newdev->drvname);
-			free(newdev);
-			free(devpath);
-			continue;
-		}
-
-
-		while (ses_node_type(tnodep) != SES_NODE_ENCLOSURE) {
-			tnodep = ses_node_child(nodep);
-			nodep = tnodep;
-		}
-
-		if ((nodep == NULL) ||
-		    (props = ses_node_props(nodep)) == NULL) {
-			tidyup(newdev);
-			free(newdev->ident);
-			ses_snap_rele(snapshot);
-			ses_close(ses_target);
-			free(newdev->classname);
+		if ((newdev->addresses[1] = calloc(1, SASADDRLEN + 1))
+		    == NULL) {
+			logmsg(MSG_ERROR,
+			    gettext("ses: Out of memory for target-port\n"));
 			free(newdev->access_devname);
 			free(newdev->drvname);
+			free(newdev->classname);
 			free(newdev);
-			free(devpath);
 			continue;
-		}
-
-		logmsg(MSG_INFO,
-		    "\nvid: %s\npid: %s\nrevid: %s\n",
-		    newdev->ident->vid,
-		    newdev->ident->pid,
-		    newdev->ident->revid);
-
-		if (nvlist_lookup_string(props, LIBSES_EN_PROP_CSN,
-		    &newdev->addresses[0]) == 0) {
-			logmsg(MSG_INFO,
-			    "Chassis Serial Number: %s\n",
-			    newdev->addresses[0]);
 		} else {
-			(void) strlcpy(newdev->addresses[0],
-			    "(not supported)", 17);
+			if (di_prop_lookup_strings(DDI_DEV_T_ANY, thisnode,
+			    "target-port", &newdev->addresses[1]) < 0) {
+				logmsg(MSG_INFO,
+				    "ses: no target-port property for "
+				    "device %s\n",
+				    newdev->access_devname);
+				strlcpy(newdev->addresses[1],
+				    "0000000000000000", 17);
+			}
 		}
 
 
-		if (di_prop_lookup_strings(DDI_DEV_T_ANY,
-		    thisnode, "target-port",
-		    &newdev->addresses[1]) < 0) {
-			logmsg(MSG_INFO,
-			    "%s: no target-port property "
-			    "for device %s\n",
-			    driver, newdev->access_devname);
-			(void) strlcpy(newdev->addresses[1],
-			    "(not supported)", 17);
-		} else
-			logmsg(MSG_INFO,
-			    "target-port property: %s\n",
-			    newdev->addresses[1]);
-
-
 		newdev->index = idx;
 		++idx;
 		newdev->plugin = self;
 
-		ses_snap_rele(snapshot);
 		TAILQ_INSERT_TAIL(fw_devices, newdev, nextdev);
 	}
 
@@ -534,10 +409,8 @@
 		struct devicelist *tempdev;
 
 		TAILQ_FOREACH(tempdev, fw_devices, nextdev) {
-			logmsg(MSG_INFO, "%s:fw_identify:\n",
-			    driver);
-			logmsg(MSG_INFO,
-			    "\ttempdev @ 0x%lx\n"
+			logmsg(MSG_INFO, "ses:fw_writefw:\n");
+			logmsg(MSG_INFO, "\ttempdev @ 0x%lx\n"
 			    "\t\taccess_devname: %s\n"
 			    "\t\tdrvname: %s\tclassname: %s\n"
 			    "\t\tident->vid:   %s\n"
@@ -554,9 +427,11 @@
 			    tempdev->ident->pid,
 			    tempdev->ident->revid,
 			    tempdev->index,
-			    tempdev->addresses[0],
-			    tempdev->addresses[1],
-			    &tempdev->plugin);
+			    (tempdev->addresses[0] != NULL) ?
+			    (char *)tempdev->addresses[0] : "NULL",
+			    (tempdev->addresses[1] != NULL) ?
+			    (char *)tempdev->addresses[1] : "NULL",
+			    tempdev->plugin);
 		}
 	}
 
@@ -573,23 +448,24 @@
 	fprintf(stdout, gettext("Device[%d] %s\n  Class [%s]\n"),
 	    thisdev->index, thisdev->access_devname, thisdev->classname);
 
+	if (thisdev->addresses[0] != NULL) {
+		fprintf(stdout,
+		    gettext("\tChassis Serial Number  : %s\n"),
+		    thisdev->addresses[0]);
+	}
+
 	fprintf(stdout,
 	    gettext("\tVendor                 : %s\n"
 	    "\tProduct                : %s\n"
 	    "\tFirmware revision      : %s\n"
-	    "\tChassis Serial Number  : %s\n"
 	    "\tTarget-port identifier : %s\n"),
 	    thisdev->ident->vid,
 	    thisdev->ident->pid,
 	    thisdev->ident->revid,
-	    thisdev->addresses[0],
 	    thisdev->addresses[1]);
 
 	fprintf(stdout, "\n\n");
 
-	/* Don't leave any bits behind... */
-	tidyup(thisdev);
-
 	return (FWFLASH_SUCCESS);
 }
 
@@ -608,18 +484,10 @@
 		sp->us_status = -1ULL;
 		(void) snprintf(sp->us_desc, sizeof (sp->us_desc),
 		    "not supported");
-		internalstatus = FWFLASH_FAILURE;
 		return (-1);
 	}
 
-	if (nvlist_lookup_uint64(props, SES_EN_PROP_UCODE_A,
-	    &astatus) != 0) {
-		logmsg(MSG_ERROR,
-		    gettext("\nError: Unable to retrieve current status\n"));
-		internalstatus = FWFLASH_FAILURE;
-		return (-1);
-	}
-
+	verify(nvlist_lookup_uint64(props, SES_EN_PROP_UCODE_A, &astatus) == 0);
 
 	for (i = 0; i < NUCODE_STATUS; i++) {
 		if (ucode_statdesc_table[i].us_value == status)
@@ -632,7 +500,6 @@
 		(void) snprintf(sp->us_desc, sizeof (sp->us_desc),
 		    "unknown (0x%02x)", (int)status);
 		sp->us_iserr = sp->us_pending = B_FALSE;
-		internalstatus = FWFLASH_FAILURE;
 	} else {
 		/* LINTED */
 		(void) snprintf(sp->us_desc, sizeof (sp->us_desc),
@@ -671,12 +538,10 @@
 	uwp->uw_prevstatus = status.us_status;
 	uwp->uw_pending = status.us_pending;
 
-	if (status.us_iserr) {
+	if (status.us_iserr)
 		logmsg(MSG_INFO,
-		    "libses: status.us_iserr: 0x%0x\n",
+		    "ses: status.us_iserr: 0x%0x\n",
 		    status.us_iserr);
-		internalstatus = FWFLASH_FAILURE;
-	}
 
 	return (SES_WALK_ACTION_CONTINUE);
 }
@@ -694,7 +559,7 @@
 	ucode_status_t statdesc;
 	ucode_wait_t wait;
 	uint8_t *imagedata;
-	uint_t len;
+	size_t len;
 
 	if (ses_node_type(np) != SES_NODE_ENCLOSURE)
 		return (SES_WALK_ACTION_CONTINUE);
@@ -714,7 +579,6 @@
 	ret = get_status(props, &statdesc);
 	(void) printf("%30s: %s\n", "current status", statdesc.us_desc);
 	if (ret != 0) {
-		/* internalstatus is already set */
 		if (arg != NULL)
 			return (SES_WALK_ACTION_TERMINATE);
 		else
@@ -728,7 +592,6 @@
 	if (ses_node_ctl(np, SES_CTL_OP_DL_UCODE, arg) != 0) {
 		(void) printf("failed!\n");
 		(void) printf("%s\n", ses_errmsg());
-		internalstatus = FWFLASH_FAILURE;
 	} else {
 		(void) printf("ok\n");
 	}
@@ -749,17 +612,240 @@
 	return (SES_WALK_ACTION_CONTINUE);
 }
 
-static void
-tidyup(struct devicelist *thisdev)
+/*
+ * Simple function to sent a standard SCSI INQUIRY(6) cdb out
+ * to thisnode and blat the response back into a struct vpr*
+ */
+static struct vpr *
+inquiry(char *path) {
+
+	struct uscsi_cmd *inqcmd;
+	uchar_t inqbuf[INQBUFLEN];	/* inquiry response */
+	uchar_t rqbuf[RQBUFLEN];	/* request sense data */
+	struct vpr *inqvpr;
+	int fd, rval;
+
+
+	inqvpr = NULL;
+	if ((inqcmd = calloc(1, sizeof (struct uscsi_cmd))) == NULL) {
+		logmsg(MSG_ERROR,
+		    gettext("ses: Unable to malloc %d bytes "
+		    "for a SCSI INQUIRY(6) command\n"),
+		    sizeof (struct uscsi_cmd));
+		return (NULL);
+	}
+
+	if ((inqvpr = calloc(1, sizeof (struct vpr))) == NULL) {
+		logmsg(MSG_ERROR,
+		    gettext("ses: Unable to malloc %d bytes "
+		    "for SCSI INQUIRY(6) response\n"),
+		    sizeof (struct vpr));
+		free(inqcmd);
+		return (NULL);
+	}
+
+	if ((inqcmd->uscsi_cdb = calloc(1, CDB_GROUP0 * sizeof (caddr_t)))
+	    == NULL) {
+		logmsg(MSG_ERROR,
+		    gettext("ses: Unable to malloc %d bytes "
+		    "for SCSI INQUIRY(6)\n"),
+		    CDB_GROUP0 * sizeof (caddr_t));
+		free(inqcmd);
+		free(inqvpr);
+		return (NULL);
+	}
+
+	logmsg(MSG_INFO, "ses:inquiry:opening device %s\n",
+	    path);
+
+	if ((fd = open(path, O_RDONLY|O_SYNC)) < 0) {
+		logmsg(MSG_INFO,
+		    "ses: Unable to open device %s: %s\n",
+		    path, strerror(errno));
+		free(inqcmd->uscsi_cdb);
+		free(inqcmd);
+		free(inqvpr);
+		return (NULL);
+	}
+
+	if (((inqvpr->vid = calloc(1, VIDLEN + 1))
+	    == NULL) ||
+	    ((inqvpr->pid = calloc(1, PIDLEN + 1))
+		== NULL) ||
+	    ((inqvpr->revid = calloc(1, REVLEN + 1))
+		== NULL)) {
+		logmsg(MSG_ERROR,
+		    gettext("ses: Unable to malloc %d bytes "
+		    "for %s identification function.\n"),
+		    VIDLEN+PIDLEN+REVLEN, drivername);
+		free(inqcmd->uscsi_cdb);
+		free(inqcmd);
+		free(inqvpr->vid);
+		free(inqvpr->pid);
+		free(inqvpr->revid);
+		return (NULL);
+	}
+
+	/* just make sure these buffers are clean */
+	bzero(inqbuf, INQBUFLEN);
+	bzero(rqbuf, RQBUFLEN);
+	bzero(inqcmd->uscsi_cdb, CDB_GROUP0);
+	inqcmd->uscsi_flags = USCSI_READ;
+	inqcmd->uscsi_timeout = 0;
+	inqcmd->uscsi_bufaddr = (caddr_t)inqbuf;
+	inqcmd->uscsi_buflen = INQBUFLEN;
+	inqcmd->uscsi_cdblen = CDB_GROUP0; /* a GROUP 0 command */
+	inqcmd->uscsi_cdb[0] = SCMD_INQUIRY;
+	inqcmd->uscsi_cdb[1] = 0x00; /* EVPD = Enable Vital Product Data */
+	inqcmd->uscsi_cdb[2] = 0x00; /* which pagecode to query? */
+	inqcmd->uscsi_cdb[3] = 0x00; /* allocation length, msb */
+	inqcmd->uscsi_cdb[4] = INQBUFLEN; /* allocation length, lsb */
+	inqcmd->uscsi_cdb[5] = 0x0; /* control byte */
+	inqcmd->uscsi_rqbuf = (caddr_t)&rqbuf;
+	inqcmd->uscsi_rqlen = RQBUFLEN;
+
+
+	rval = ioctl(fd, USCSICMD, inqcmd);
+
+	if (rval < 0) {
+		/* ioctl failed */
+		logmsg(MSG_INFO,
+		    gettext("ses: Unable to retrieve SCSI INQUIRY(6) data "
+			"from device %s: %s\n"),
+		    path, strerror(errno));
+		free(inqcmd->uscsi_cdb);
+		free(inqcmd);
+		free(inqvpr->vid);
+		free(inqvpr->pid);
+		free(inqvpr->revid);
+		return (NULL);
+	}
+
+
+
+	bcopy(&inqbuf[8], inqvpr->vid, VIDLEN);
+	bcopy(&inqbuf[16], inqvpr->pid, PIDLEN);
+	bcopy(&inqbuf[32], inqvpr->revid, REVLEN);
+
+	(void) close(fd);
+
+	logmsg(MSG_INFO,
+	    "ses inquiry: vid %s ; pid %s ; revid %s\n",
+	    inqvpr->vid, inqvpr->pid, inqvpr->revid);
+
+	if ((strncmp(inqvpr->vid, "SUN", 3) != 0) &&
+	    (strncmp(inqvpr->vid, "LSI", 3) != 0) &&
+	    (strncmp(inqvpr->vid, "Quanta", 6) != 0) &&
+	    (strncmp(inqvpr->vid, "QUANTA", 6) != 0)) {
+		free(inqvpr->vid);
+		free(inqvpr->pid);
+		free(inqvpr->revid);
+		inqvpr->vid = NULL;
+		inqvpr->pid = NULL;
+		inqvpr->revid = NULL;
+		logmsg(MSG_INFO,
+		    "ses inquiry: unrecognised device\n");
+		return (NULL);
+	}
+
+	free(inqcmd->uscsi_cdb);
+	free(inqcmd);
+
+	return (inqvpr);
+}
+
+
+/*
+ * ses_dl_ucode_check() lets us check whether SES2's Download
+ * Microcode Control diagnostic and status pages are supported
+ * by flashdev.
+ */
+int
+ses_dl_ucode_check(struct devicelist *flashdev)
 {
-	/*
-	 * Since we didn't allocate the space for the ident->* and
-	 * addresses[*], set them to NULL and let the libraries
-	 * (libnvpair and libdevinfo) handle them.
-	 */
-	thisdev->ident->vid = NULL;
-	thisdev->ident->pid = NULL;
-	thisdev->ident->revid = NULL;
-	thisdev->addresses[0] = NULL;
-	thisdev->addresses[1] = NULL;
+	int rv;
+	int limit;
+	int i = 0;
+	int fd;
+	struct uscsi_cmd *usc;
+	uchar_t sensebuf[RQBUFLEN]; /* for the request sense data */
+	uchar_t pagesup[PCBUFLEN]; /* should be less than 64 pages */
+
+
+	if ((fd = open(flashdev->access_devname,
+	    O_RDONLY|O_NDELAY)) < 0) {
+		logmsg(MSG_INFO,
+		    gettext("ses:ses_dl_ucode_check: Unable to open %s\n"),
+		    flashdev->access_devname);
+		return (FWFLASH_FAILURE);
+	}
+
+	if ((usc = calloc(1, sizeof (struct uscsi_cmd))) == NULL) {
+		logmsg(MSG_ERROR,
+		    gettext("ses: Unable to alloc %d bytes for "
+		    "microcode download query: %s\n"),
+		    sizeof (struct uscsi_cmd), strerror(errno));
+		(void) close(fd);
+		return (FWFLASH_FAILURE);
+	}
+
+	if ((usc->uscsi_cdb = calloc(1, CDB_GROUP0 * sizeof (caddr_t)))
+	    == NULL) {
+		logmsg(MSG_ERROR,
+		    gettext("ses: Unable to alloc %d bytes for "
+		    "microcode download query: %s\n"),
+		    CDB_GROUP0 * sizeof (caddr_t), strerror(errno));
+		(void) close(fd);
+		free(usc);
+		return (FWFLASH_FAILURE);
+	}
+
+
+	bzero(sensebuf, RQBUFLEN);
+
+	usc->uscsi_flags = USCSI_READ | USCSI_RQENABLE;
+	usc->uscsi_timeout = 0;
+	usc->uscsi_cdblen = CDB_GROUP0;
+	usc->uscsi_rqbuf = (caddr_t)&sensebuf;
+	usc->uscsi_rqlen = RQBUFLEN;
+
+
+	bzero(pagesup, PCBUFLEN);
+	usc->uscsi_bufaddr = (caddr_t)&pagesup;
+	usc->uscsi_buflen = PCBUFLEN;
+
+	usc->uscsi_cdb[0] = SCMD_GDIAG; /* "Get" or receive */
+	usc->uscsi_cdb[1] = 1; /* PCV = Page Code Valid */
+	usc->uscsi_cdb[2] = 0x00; /* list all Supported diag pages */
+	usc->uscsi_cdb[3] = 0x00;
+	usc->uscsi_cdb[4] = PCBUFLEN;
+	usc->uscsi_cdb[5] = 0; /* control byte, reserved */
+
+	rv = ioctl(fd, USCSICMD, usc);
+	if (rv < 0) {
+		logmsg(MSG_INFO,
+		    "ses: DL uCode checker ioctl error (%d): %s\n",
+		    errno, strerror(errno));
+		return (FWFLASH_FAILURE);
+	}
+
+	rv = FWFLASH_FAILURE;
+	/* in SPC4, this is an "n-3" field */
+	limit = (pagesup[2] << 8) + pagesup[3] + 4;
+	while (i < limit) {
+		if (pagesup[4 + i] == 0x0E) {
+			i = limit;
+			logmsg(MSG_INFO, "ses: device %s "
+			    "supports the Download Microcode "
+			    "diagnostic control page\n",
+			    flashdev->access_devname);
+			rv = FWFLASH_SUCCESS;
+		}
+		++i;
+	}
+	(void) close(fd);
+	free(usc->uscsi_cdb);
+	free(usc);
+
+	return (rv);
 }

--- a/usr/src/cmd/fwflash/plugins/transport/i386/Makefile	Tue May 27 18:30:15 2008 -0700
+++ b/usr/src/cmd/fwflash/plugins/transport/i386/Makefile	Tue May 27 18:50:55 2008 -0700
@@ -34,10 +34,10 @@
 POFILES=	ses.po
 IDENTPOFILE= 	fwflash_transport_identify_ses.po
 LINTFILE=	ses.ln
-SLINKS=		sgen.so
 
 CLEANFILES=	$(OBJECTS)
-CLOBBERFILES=	$(PLUGINS) $(POFILES) $(IDENTPOFILE) $(LINTFILE) $(SLINKS)
+CLOBBERFILES=	$(PLUGINS) $(POFILES) $(IDENTPOFILE) $(LINTFILE)
+
 
 
 all:		$(PLUGINS)
@@ -57,15 +57,8 @@
 $(PLUGINS) :=	FILEMODE = 0555
 
 
-$(ROOTLIBFWFLASHPLUGINS)/$(SLINKS) : $(ROOTLIBFWFLASHPLUGINS)/ses.so
-	@$(RM) $@
-	$(SYMLINK) $(PLUGINS) $@
-
-
-
 install: $(ROOTLIBFWFLASHPLUGINS) \
-	$(ROOTLIBFWFLASHPLUGINS)/ses.so \
-	$(ROOTLIBFWFLASHPLUGINS)/$(SLINKS)
+	$(ROOTLIBFWFLASHPLUGINS)/ses.so
 
 clobber clean:
 	$(RM) $(CLEANFILES) $(CLOBBERFILES)

--- a/usr/src/cmd/fwflash/plugins/transport/sparc/Makefile	Tue May 27 18:30:15 2008 -0700
+++ b/usr/src/cmd/fwflash/plugins/transport/sparc/Makefile	Tue May 27 18:50:55 2008 -0700
@@ -34,10 +34,9 @@
 POFILES=	ses.po
 IDENTPOFILE= 	fwflash_transport_identify_ses.po
 LINTFILE=	ses.ln
-SLINKS=		sgen.so
 
 CLEANFILES=	$(OBJECTS)
-CLOBBERFILES=	$(PLUGINS) $(POFILES) $(IDENTPOFILE) $(LINTFILE) $(SLINKS)
+CLOBBERFILES=	$(PLUGINS) $(POFILES) $(IDENTPOFILE) $(LINTFILE)
 
 
 
@@ -58,13 +57,8 @@
 $(PLUGINS) :=	FILEMODE = 0555
 
 
-$(ROOTLIBFWFLASHPLUGINS)/$(SLINKS) : $(ROOTLIBFWFLASHPLUGINS)/ses.so
-	@$(RM) $@
-	$(SYMLINK) $(PLUGINS) $@
-
 install: $(ROOTLIBFWFLASHPLUGINS) \
-	$(ROOTLIBFWFLASHPLUGINS)/ses.so \
-	$(ROOTLIBFWFLASHPLUGINS)/$(SLINKS)
+	$(ROOTLIBFWFLASHPLUGINS)/ses.so
 
 clobber clean:
 	$(RM) $(CLEANFILES) $(CLOBBERFILES)

--- a/usr/src/cmd/fwflash/sparc/Makefile	Tue May 27 18:30:15 2008 -0700
+++ b/usr/src/cmd/fwflash/sparc/Makefile	Tue May 27 18:50:55 2008 -0700
@@ -49,7 +49,7 @@
 POFILES= $(SRCS:%.c=%.po)
 POFILE= fwflash_msg.po
 
-CFLAGS	+= -g -D_POSIX_PTHREAD_SEMANTICS -D MANUFACTURING_MODE=0
+CFLAGS	+= -g -D_POSIX_PTHREAD_SEMANTICS
 LDLIBS += -ldevinfo -lumem
 
 #

--- a/usr/src/pkgdefs/SUNWfwflash/prototype_com	Tue May 27 18:30:15 2008 -0700
+++ b/usr/src/pkgdefs/SUNWfwflash/prototype_com	Tue May 27 18:50:55 2008 -0700
@@ -21,7 +21,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -48,12 +48,9 @@
 d none usr/lib/fwflash/identify 0755 root bin
 d none usr/lib/fwflash/verify 0755 root bin
 f none usr/lib/fwflash/verify/ses-SUN.so 0644 root bin
-s none usr/lib/fwflash/verify/ses-LSILOGIC.so=ses-SUN.so
-s none usr/lib/fwflash/verify/sgen-SUN.so=ses-SUN.so
-s none usr/lib/fwflash/verify/sgen-LSILOGIC.so=ses-SUN.so
+s none usr/lib/fwflash/verify/ses-LSILOGIC.so=./ses-SUN.so
 f none usr/lib/fwflash/verify/tavor-MELLANOX.so 644 root bin
 f none usr/lib/fwflash/identify/ses.so 0644 root bin
-s none usr/lib/fwflash/identify/sgen.so=ses.so 644 root bin
 f none usr/lib/fwflash/identify/tavor.so 0644 root bin
 d none usr/include 0755 root bin
 d none usr/include/fwflash 0755 root bin