Changeset 6062 for branches/eam_rel9_p0/psModules/src/astrom/pmConcepts.c

Timestamp:

Jan 19, 2006, 4:38:28 PM (21 years ago)

Author:

Paul Price

Message:

Getting a working ppImage

File:

• branches/eam_rel9_p0/psModules/src/astrom/pmConcepts.c (modified) (16 diffs)

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

@@ -99 +99 @@
 
 // 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
                          )
 {
     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))) {
@@ -117 +117 @@
 
 // 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
@@ -126 +126 @@
 {
     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))) {
@@ -147 +147 @@
 
 // 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
@@ -160 +160 @@
     while ((item = psMetadataGetAndIncrement(iter))) {
         const char *name = item->name;  // Name of the concept
-        psMetadataItem *specItem = psMetadataLookup(specs, name); // Specification for the concept
+        psMetadataItem *specItem = psMetadataLookup(*specs, name); // Specification for the concept
         if (specItem) {
             pmConceptSpec *spec = specItem->data.V; // The specification
@@ -182 +182 @@
                        )
 {
-    return conceptsBlank(conceptsFPA, fpa->concepts);
+    psTrace("psModule.concepts", 5, "Blanking FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
+    return conceptsBlank(&conceptsFPA, fpa->concepts);
 }
 
@@ -190 +191 @@
                       )
 {
-    return conceptsRead(conceptsFPA, fpa, NULL, NULL, db, fpa->concepts);
+    psTrace("psModule.concepts", 5, "Reading FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
+    return conceptsRead(&conceptsFPA, fpa, NULL, NULL, db, fpa->concepts);
 }
 
@@ -198 +200 @@
                        )
 {
-    return conceptsWrite(conceptsFPA, fpa, NULL, NULL, db, fpa->concepts);
+    psTrace("psModule.concepts", 5, "Writing FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
+    return conceptsWrite(&conceptsFPA, fpa, NULL, NULL, db, fpa->concepts);
 }
 
@@ -205 +208 @@
                         )
 {
-    return conceptsBlank(conceptsChip, chip->concepts);
+    psTrace("psModule.concepts", 5, "Blanking chip concepts: %x %x\n", conceptsChip, chip->concepts);
+    return conceptsBlank(&conceptsChip, chip->concepts);
 }
 
@@ -213 +217 @@
                        )
 {
+    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, db, chip->concepts);
+    return conceptsRead(&conceptsChip, fpa, chip, NULL, db, chip->concepts);
 }
 
@@ -222 +227 @@
                         )
 {
+    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, db, chip->concepts);
+    return conceptsWrite(&conceptsChip, fpa, chip, NULL, db, chip->concepts);
 }
 
@@ -230 +236 @@
                         )
 {
-    return conceptsBlank(conceptsCell, cell->concepts);
+    psTrace("psModule.concepts", 5, "Blanking cell concepts: %x %x\n", conceptsCell, cell->concepts);
+    return conceptsBlank(&conceptsCell, cell->concepts);
 }
 
@@ -238 +245 @@
                        )
 {
+    psTrace("psModule.concepts", 5, "Writing cell concepts: %x %x\n", conceptsCell, cell->concepts);
     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, db, cell->concepts);
+    return conceptsRead(&conceptsCell, fpa, chip, cell, db, cell->concepts);
 }
 
@@ -248 +256 @@
                         )
 {
+    psTrace("psModule.concepts", 5, "Writing cell concepts: %x %x\n", conceptsCell, cell->concepts);
     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, db, cell->concepts);
+    return conceptsWrite(&conceptsCell, fpa, chip, cell, db, cell->concepts);
 }
 
@@ -297 +306 @@
         conceptsChip = psMetadataAlloc();
         init = true;
-        // XXX Insert here the native Chip concepts
+        // There are no standard concepts at the chip level to be installed
     }
     if (! conceptsCell) {
@@ -397 +406 @@
         }
 
+        // CELL.X0
+        pmConceptRegister(psMetadataItemAllocS32("CELL.X0", "Position of (0,0) on the chip", 0),
+                          (pmConceptReadFunc)pmConceptRead_CELL_X0,
+                          (pmConceptWriteFunc)pmConceptWrite_CELL_X0, PM_CONCEPT_LEVEL_CELL);
+
+        // CELL.Y0
+        pmConceptRegister(psMetadataItemAllocS32("CELL.Y0", "Position of (0,0) on the chip", 0),
+                          (pmConceptReadFunc)pmConceptRead_CELL_Y0,
+                          (pmConceptWriteFunc)pmConceptWrite_CELL_Y0, PM_CONCEPT_LEVEL_CELL);
+
     }