From a2054cecc135b0cb2caffc53ef1ee4ab18a84be6 Mon Sep 17 00:00:00 2001
From: Wen Xiong <wenxiong@linux.vnet.ibm.com>
Date: Sun, 16 Sep 2012 19:19:48 -0500
Subject: [PATCH] iprutils: Add the support for optical devices.

This patch adds the support for optical devices and also fix some format
issues for 32 bit adapter GUI interfaces.

signed-off-by: wenxiong@linux.vnet.ibm.com
---
 iprconfig.c | 63 +++++++++++++++++++++++++++++++++++++----------------
 iprlib.c    |  2 ++
 2 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/iprconfig.c b/iprconfig.c
index da78590..71a6e7b 100644
--- a/iprconfig.c
+++ b/iprconfig.c
@@ -2501,7 +2501,7 @@ int get_drive_phy_loc_with_ses_phy_loc(struct ipr_dev *ses, struct drive_elem_de
 	char unit_phy_loc[PHYSICAL_LOCATION_LENGTH+1];
 
 	ipr_strncpy_0(buffer, (char *)drive_data->dev_elem[slot_id].disk_physical_loc, DISK_PHY_LOC_LENGTH);
-	if (strlen(ses->physical_location))
+	if (strlen(ses->physical_location) && !strlen(buffer))
 		if (!conc_maint)
 			sprintf(buf, "%s-%s", ses->physical_location, buffer);
 		else {
@@ -2516,6 +2516,8 @@ int get_drive_phy_loc_with_ses_phy_loc(struct ipr_dev *ses, struct drive_elem_de
 		*first_hyphen = '\0';
 		sprintf(buf, "%s-%s", unit_phy_loc, buffer);
 	}
+	else 
+		sprintf(buf, "%s", "\0");
 
 	return 0;
 }
@@ -7567,6 +7569,10 @@ static struct ipr_dev *alloc_empty_slot_64bit(struct ipr_dev *ses, int slot, int
  **/
 static int can_perform_conc_action(struct ipr_dev *dev, int action)
 {
+
+	if (dev->scsi_dev_data->type == TYPE_ROM || dev->scsi_dev_data->type==TYPE_TAPE)
+		return 0;
+
 	if (action == IPR_CONC_REMOVE) {
 		if (format_in_prog(dev))
 			return 0;
@@ -12648,10 +12654,8 @@ char *__print_device(struct ipr_dev *dev, char *body, char *option,
 				}
 			} else {
 				if (conc_main) {
-					for (i = 0; i < 26-loc_len; i++)
-						body[len+i] = ' ';
-
-					len += 26-loc_len;
+					loc_len = sprintf(body + len, "%d/%d:", ioa->host_num,ioa->host_num);
+					len += loc_len;
 				} else {
 					for (i = 0; i < 39-loc_len; i++)
 						body[len+i] = ' ';
@@ -12723,10 +12727,10 @@ char *__print_device(struct ipr_dev *dev, char *body, char *option,
 			}
 		else { 
 			if (!res_path || !ioa->sis64) {
-				for (i = 0; i < 26-loc_len; i++)
+				for (i = 0; i < 27-loc_len; i++)
 					body[len+i] = ' ';
 
-				len += 26-loc_len;
+				len += 27-loc_len;
 			}
 
 			if (!vpd) {
@@ -12746,17 +12750,25 @@ char *__print_device(struct ipr_dev *dev, char *body, char *option,
 		}
 	} else if (scsi_dev_data && scsi_dev_data->type == IPR_TYPE_EMPTY_SLOT) {
 		if (!res_path || !ioa->sis64) {
-			tab_stop = sprintf(body + len,"%d:%d: ",
-					   dev->res_addr[ra].bus,
-					   dev->res_addr[ra].target);
+			if (hw_loc) {
+				for (i = 0; i < 27-loc_len; i++)
+					body[len+i] = ' ';
 
-			loc_len += tab_stop;
-			len += tab_stop;
-			
-			for (i = 0; i < 27-loc_len; i++)
-				body[len+i] = ' ';
+				len += 27-loc_len;
+			}
+			else {
+				tab_stop = sprintf(body + len,"%d:%d: ",
+						   dev->res_addr[ra].bus,
+						   dev->res_addr[ra].target);
 
-			len += 27-loc_len;
+				loc_len += tab_stop;
+				len += tab_stop;
+				
+				for (i = 0; i < 29-loc_len; i++)
+					body[len+i] = ' ';
+
+				len += 29-loc_len;
+			}
 		}
 		len += sprintf(body + len, "%-8s %-16s ", " ", " ");
 	} else {
@@ -12784,10 +12796,17 @@ char *__print_device(struct ipr_dev *dev, char *body, char *option,
 				loc_len += tab_stop;
 				len += tab_stop;
 
-				for (i = 0; i < 26-loc_len; i++)
-					body[len+i] = ' ';
+				if (conc_main && (hw_loc != 1)) {
+					for (i = 0; i < 29-loc_len; i++)
+						body[len+i] = ' ';
 
-				len += 26-loc_len;
+					len += 29-loc_len;
+				} else {
+					for (i = 0; i < 27-loc_len; i++)
+						body[len+i] = ' ';
+
+					len += 27-loc_len;
+				}
 			}
 		}
 
@@ -12857,6 +12876,12 @@ char *__print_device(struct ipr_dev *dev, char *body, char *option,
 		
 			} else if (scsi_dev_data && scsi_dev_data->type == TYPE_PROCESSOR)
 				len += sprintf(body + len, "%-25s ", "Processor");
+			else if (scsi_dev_data && scsi_dev_data->type == TYPE_ROM)
+				len += sprintf(body + len, "%-25s ", "CD/DVD");
+
+			else if (scsi_dev_data && scsi_dev_data->type == TYPE_TAPE)
+				len += sprintf(body + len, "%-25s ", "Tape");
+
 			else if (ioa->ioa_dead)
 				len += sprintf(body + len, "%-25s ", "Unavailable Device");
 			else
diff --git a/iprlib.c b/iprlib.c
index ed33b8f..b981e2a 100644
--- a/iprlib.c
+++ b/iprlib.c
@@ -6081,6 +6081,8 @@ void check_current_config(bool allow_rebuild_refresh)
 			    scsi_dev_data->type == IPR_TYPE_AF_DISK ||
 			    scsi_dev_data->type == IPR_TYPE_ADAPTER ||
 			    scsi_dev_data->type == TYPE_ENCLOSURE ||
+			    scsi_dev_data->type == TYPE_ROM ||
+			    scsi_dev_data->type == TYPE_TAPE ||
 			    scsi_dev_data->type == TYPE_PROCESSOR) {
 				ioa->dev[device_count].ioa = ioa;
 				ioa->dev[device_count].scsi_dev_data = scsi_dev_data;