Index: trunk/psModules/src/concepts/pmConceptsRead.c
===================================================================
--- trunk/psModules/src/concepts/pmConceptsRead.c	(revision 9539)
+++ trunk/psModules/src/concepts/pmConceptsRead.c	(revision 9570)
@@ -22,5 +22,5 @@
 // since the type is already known.
 static psMetadataItem *parsePlain(psMetadataItem *concept, // The concept to parse
-                                  psMetadataItem *pattern // The concept pattern
+                                  const psMetadataItem *pattern // The concept pattern
                                  )
 {
@@ -55,7 +55,7 @@
                          psMetadata *cameraFormat, // The camera format
                          psMetadata *target, // The target
-                         pmFPA *fpa,    // The FPA
-                         pmChip *chip,  // The chip
-                         pmCell *cell   // The cell
+                         const pmFPA *fpa, // The FPA
+                         const pmChip *chip, // The chip
+                         const pmCell *cell // The cell
                         )
 {
@@ -111,8 +111,5 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-bool pmConceptsReadFromCamera(psMetadata *specs, // The concept specifications
-                              pmCell *cell,  // The cell
-                              psMetadata *target // Place into which to read the concepts
-                             )
+bool p_pmConceptsReadFromCells(psMetadata *target, const psMetadata *specs, const pmCell *cell)
 {
     PS_ASSERT_PTR_NON_NULL(specs, false);
@@ -172,10 +169,6 @@
 
 
-bool pmConceptsReadFromDefaults(psMetadata *specs, // The concept specifications
-                                pmFPA *fpa, // The FPA
-                                pmChip *chip, // The chip
-                                pmCell *cell, // The cell
-                                psMetadata *target // Place into which to read the concepts
-                               )
+bool p_pmConceptsReadFromDefaults(psMetadata *target, const psMetadata *specs,
+                                  const pmFPA *fpa, const pmChip *chip, const pmCell *cell)
 {
     PS_ASSERT_PTR_NON_NULL(specs, false);
@@ -256,10 +249,6 @@
 
 
-bool pmConceptsReadFromHeader(psMetadata *specs, // The concept specifications
-                              pmFPA *fpa, // The FPA
-                              pmChip *chip, // The chip
-                              pmCell *cell,  // The cell
-                              psMetadata *target // Place into which to read the concepts
-                             )
+bool p_pmConceptsReadFromHeader(psMetadata *target, const psMetadata *specs,
+                                const pmFPA *fpa, const pmChip *chip, const pmCell *cell)
 {
     PS_ASSERT_PTR_NON_NULL(specs, false);
@@ -358,11 +347,6 @@
 
 // XXX --- the below code has NOT been tested!
-bool pmConceptsReadFromDatabase(psMetadata *specs, // The concept specifications
-                                pmFPA *fpa, // The FPA
-                                pmChip *chip, // The chip
-                                pmCell *cell,  // The cell
-                                psDB *db, // The database handle
-                                psMetadata *target // Place into which to read the concepts
-                               )
+bool p_pmConceptsReadFromDatabase(psMetadata *target, const psMetadata *specs,
+                                  const pmFPA *fpa, const pmChip *chip, const pmCell *cell, psDB *db)
 {
     PS_ASSERT_PTR_NON_NULL(specs, false);