Changeset 6580 for branches/rel10_ifa/psModules/src/astrom/pmConcepts.c

Timestamp:

Mar 13, 2006, 6:40:37 PM (20 years ago)

Author:

Paul Price

Message:

Compiled, but concept ingest not yet working, so can't read FPA

File:

• branches/rel10_ifa/psModules/src/astrom/pmConcepts.c (modified) (15 diffs)

branches/rel10_ifa/psModules/src/astrom/pmConcepts.c

@@ -76 +76 @@
 
 // Set all registered concepts to blank value for the specified level
-static bool conceptsBlank(psMetadata *specs,  // One of the concepts specifications
+static bool conceptsBlank(psMetadata **specs,  // One of the concepts specifications
                           psMetadata *target // Place to install the concepts
                          )
@@ -83 +83 @@
         pmConceptsInit();
     }
-    psMetadataIterator *specsIter = psMetadataIteratorAlloc(specs, PS_LIST_HEAD, NULL); // Iterator on specs
+    psMetadataIterator *specsIter = psMetadataIteratorAlloc(*specs, PS_LIST_HEAD, NULL); // Iterator on specs
     psMetadataItem *specItem = NULL;    // Item from the specs metadata
     while ((specItem = psMetadataGetAndIncrement(specsIter))) {
@@ -99 +99 @@
 
 // Read all registered concepts for the specified level
-static bool conceptsRead(psMetadata *specs, // One of the concepts specifications
+static bool conceptsRead(psMetadata **specs, // One of the concepts specifications
                          pmFPA *fpa,    // The FPA
                          pmChip *chip,  // The chip
@@ -113 +113 @@
 
     if (source & PM_CONCEPT_SOURCE_CAMERA || source == PM_CONCEPT_SOURCE_ALL) {
-        pmConceptsReadFromCamera(specs, cell, target);
+        pmConceptsReadFromCamera(*specs, cell, target);
     }
     if (source & PM_CONCEPT_SOURCE_DEFAULTS || source == PM_CONCEPT_SOURCE_ALL) {
-        pmConceptsReadFromDefaults(specs, fpa, chip, cell, target);
+        pmConceptsReadFromDefaults(*specs, fpa, chip, cell, target);
     }
     if (source & PM_CONCEPT_SOURCE_HEADER || source == PM_CONCEPT_SOURCE_ALL) {
-        pmConceptsReadFromHeader(specs, fpa, chip, cell, target);
+        pmConceptsReadFromHeader(*specs, fpa, chip, cell, target);
     }
     if (source & PM_CONCEPT_SOURCE_DATABASE || source == PM_CONCEPT_SOURCE_ALL) {
-        pmConceptsReadFromDatabase(specs, fpa, chip, cell, db, target);
+        pmConceptsReadFromDatabase(*specs, fpa, chip, cell, db, target);
     }
 
@@ -129 +129 @@
 
 // Write all registered concepts for the specified level
-static bool conceptsWrite(psMetadata *specs, // One of the concepts specifications
+static bool conceptsWrite(psMetadata **specs, // One of the concepts specifications
                           pmFPA *fpa,   // The FPA
                           pmChip *chip, // The chip
@@ -143 +143 @@
 
     if (source & PM_CONCEPT_SOURCE_CAMERA || source == PM_CONCEPT_SOURCE_ALL) {
-        pmConceptsWriteToCamera(specs, cell, concepts);
+        pmConceptsWriteToCamera(*specs, cell, concepts);
     }
     if (source & PM_CONCEPT_SOURCE_DEFAULTS || source == PM_CONCEPT_SOURCE_ALL) {
-        pmConceptsWriteToDefaults(specs, fpa, chip, cell, concepts);
+        pmConceptsWriteToDefaults(*specs, fpa, chip, cell, concepts);
     }
     if (source & PM_CONCEPT_SOURCE_HEADER || source == PM_CONCEPT_SOURCE_ALL) {
-        pmConceptsWriteToHeader(specs, fpa, chip, cell, concepts);
+        pmConceptsWriteToHeader(*specs, fpa, chip, cell, concepts);
     }
     if (source & PM_CONCEPT_SOURCE_DATABASE || source == PM_CONCEPT_SOURCE_ALL) {
-        pmConceptsWriteToDatabase(specs, fpa, chip, cell, db, concepts);
+        pmConceptsWriteToDatabase(*specs, fpa, chip, cell, db, concepts);
     }
 
@@ -164 +164 @@
 {
     psTrace("psModule.concepts", 5, "Blanking FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
-    return conceptsBlank(conceptsFPA, fpa->concepts);
+    return conceptsBlank(&conceptsFPA, fpa->concepts);
 }
 
@@ -174 +174 @@
 {
     psTrace("psModule.concepts", 5, "Reading FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
-    return conceptsRead(conceptsFPA, fpa, NULL, NULL, source, db, fpa->concepts);
+    return conceptsRead(&conceptsFPA, fpa, NULL, NULL, source, db, fpa->concepts);
 }
 
@@ -184 +184 @@
 {
     psTrace("psModule.concepts", 5, "Writing FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
-    return conceptsWrite(conceptsFPA, fpa, NULL, NULL, source, db, fpa->concepts);
+    return conceptsWrite(&conceptsFPA, fpa, NULL, NULL, source, db, fpa->concepts);
 }
 
@@ -192 +192 @@
 {
     psTrace("psModule.concepts", 5, "Blanking chip concepts: %x %x\n", conceptsChip, chip->concepts);
-    return conceptsBlank(conceptsChip, chip->concepts);
+    return conceptsBlank(&conceptsChip, chip->concepts);
 }
 
@@ -203 +203 @@
     psTrace("psModule.concepts", 5, "Reading chip concepts: %x %x\n", conceptsChip, chip->concepts);
     pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
-    return conceptsRead(conceptsChip, fpa, chip, NULL, source, db, chip->concepts);
+    return conceptsRead(&conceptsChip, fpa, chip, NULL, source, db, chip->concepts);
 }
 
@@ -214 +214 @@
     psTrace("psModule.concepts", 5, "Writing chip concepts: %x %x\n", conceptsChip, chip->concepts);
     pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
-    return conceptsWrite(conceptsChip, fpa, chip, NULL, source, db, chip->concepts);
+    return conceptsWrite(&conceptsChip, fpa, chip, NULL, source, db, chip->concepts);
 }
 
@@ -222 +222 @@
 {
     psTrace("psModule.concepts", 5, "Blanking cell concepts: %x %x\n", conceptsCell, cell->concepts);
-    return conceptsBlank(conceptsCell, cell->concepts);
+    return conceptsBlank(&conceptsCell, cell->concepts);
 }
 
@@ -234 +234 @@
     pmChip *chip = cell->parent;        // Chip to which the cell belongs
     pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
-    return conceptsRead(conceptsCell, fpa, chip, cell, source, db, cell->concepts);
+    return conceptsRead(&conceptsCell, fpa, chip, cell, source, db, cell->concepts);
 }
 
@@ -246 +246 @@
     pmChip *chip = cell->parent;        // Chip to which the cell belongs
     pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
-    return conceptsWrite(conceptsCell, fpa, chip, cell, source, db, cell->concepts);
+    return conceptsWrite(&conceptsCell, fpa, chip, cell, source, db, cell->concepts);
 }