[Scst-svn] SF.net SVN: scst:[2407] trunk/scstadmin/scstadmin.sysfs/scstadmin

[<mga...@us...>]

Revision: 2407
          http://scst.svn.sourceforge.net/scst/?rev=2407&view=rev
Author:   mgandalf
Date:     2010-10-14 14:39:12 +0000 (Thu, 14 Oct 2010)

Log Message:
-----------
- Differentiate between hardware and virtual targets within the config file when using mixed type drivers.

Modified Paths:
--------------
    trunk/scstadmin/scstadmin.sysfs/scstadmin

Modified: trunk/scstadmin/scstadmin.sysfs/scstadmin
===================================================================
--- trunk/scstadmin/scstadmin.sysfs/scstadmin	2010-10-14 14:32:00 UTC (rev 2406)
+++ trunk/scstadmin/scstadmin.sysfs/scstadmin	2010-10-14 14:39:12 UTC (rev 2407)
@@ -1198,6 +1198,12 @@
 
 			my $attribute_buff;
 			my $attribute_buff_nk;
+
+			if (defined($$attributes{'hw_target'}) &&
+			  ($$attributes{'hw_target'}->{'value'} == TRUE)) {
+				$attribute_buff = "\t\tHW_TARGET\n\n";
+			}
+
 			foreach my $attr (keys %{$attributes}) {
 				next if ($$attributes{$attr}->{'static'} &&
 					 !defined($$tgt_attrs{$attr}));
@@ -1210,7 +1216,7 @@
 						$attribute_buff .= "\t\t$attr $value\n"
 						  if (defined($value));
 					}
-				} elsif (($attr eq 'enabled') || $nonkey) {
+				} elsif (($attr eq 'hw_target') || ($attr eq 'enabled') || $nonkey) {
 					my $value = $$attributes{$attr}->{'value'};
 					$value = "\"$value\"" if ($value =~ /\s/);
 					if ($attr eq 'enabled') {
@@ -2030,6 +2036,11 @@
 				}
 
 				my $attributes = configToAttr(\%_attributes);
+
+				if (defined($$attributes{'HW_TARGET'})) {
+					immediateExit("Hardware target '$target' for driver '$driver' does not exist.");
+				}
+
 				filterCreateAttributes($possible, $attributes, FALSE);
 
 				my $rc = addVirtualTarget($driver, $target, $attributes);
@@ -3468,6 +3479,7 @@
 	# add/change
 	foreach my $attribute (keys %toset) {
 		foreach my $value (keys %{$toset{$attribute}}) {
+			next if ($attribute eq 'HW_TARGET');
 			if (!defined($$existing{$attribute}) &&
 			    $driverCap && !$SCST->checkTargetDynamicAttributes($driver, $attribute)) {
 				addTargetDynamicAttribute($driver, $target, $attribute, $value);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.