Changeset 32630 for branches/eam_branches/ipp-20110906/pstamp

Timestamp:

Nov 8, 2011, 2:44:12 PM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20110906

Files:

• . (modified) (1 prop)
• pstamp/scripts/pstamp_checkdependent.pl (modified) (1 diff)
• pstamp/src/ppstampOptions.c (modified) (1 diff)

branches/eam_branches/ipp-20110906/pstamp/scripts/pstamp_checkdependent.pl

@@ -240 +240 @@
         my $state = $chip->{state};
         my $data_state = $chip->{data_state};
+        my $fault = $chip->{fault};
         if (($state =~ /error/) or ($state =~ /purged/) or ($state =~ /scrubbed/) or ($state eq 'drop') or
-            ($data_state =~ /error/) or ($data_state =~ /purged/) or ($data_state =~ /scrubbed/) or ($data_state eq 'drop')) {
-
-            print "chipRun state is $chip->{chip_id} has state: $state data_state: $data_state cannot update\n";
+            ($data_state =~ /error/) or ($data_state =~ /purged/) or ($data_state =~ /scrubbed/) or ($data_state eq 'drop') or
+            ($fault eq $PSTAMP_GONE)) {
+
+            print "chipRun state is $chip->{chip_id} has state: $state data_state: $data_state fault: $fault cannot update\n";
             my $error_code;
             if (($state eq 'error_cleaned') or ($data_state ='error_cleaned')) {

branches/eam_branches/ipp-20110906/pstamp/src/ppstampOptions.c

@@ -28 +28 @@
     options->roip.dDEC = 0;
     options->chipName  = NULL;
+    options->cellName  = NULL;
+    options->stage  = NULL;
     options->censorMasked = true;