Changeset 11735 for trunk/ippTools/src/chiptool.c

Timestamp:

Feb 9, 2007, 12:14:24 PM (19 years ago)

Author:

jhoblitt

Message:

p2/p3 version reorg

File:

• trunk/ippTools/src/chiptool.c (modified) (3 diffs)

trunk/ippTools/src/chiptool.c

@@ -859 +859 @@
     return p2ProcessedImfileRowAlloc(
         imfile->exp_tag,
+        imfile->p2_version,
+        imfile->p1_version,
         imfile->class_id,
+        recipe,
         uri,
-        recipe,
         bg,
         bg_stdev,
@@ -867 +869 @@
         b1_uri,
         b2_uri,
-        imfile->p1_version,
-        imfile->p2_version,
         code
     );
@@ -880 +880 @@
     return p2ProcessedExpRowAlloc(
         pendingExp->exp_tag,
+        pendingExp->p2_version,
         pendingExp->p1_version,
+        pendingExp->label
+    );
+}
+
+
+static p3PendingExpRow *p2PendingToP3PendingExp(pxConfig *config, p2PendingExpRow *pendingExp)
+{
+    PS_ASSERT_PTR_NON_NULL(pendingExp, NULL);
+
+    return p3PendingExpRowAlloc(
+        pendingExp->exp_tag,
+        0x0,        // p3 version
         pendingExp->p2_version,
         pendingExp->label
     );
 }
-
-
-static p3PendingExpRow *p2PendingToP3PendingExp(pxConfig *config, p2PendingExpRow *pendingExp)
-{
-    PS_ASSERT_PTR_NON_NULL(pendingExp, NULL);
-
-    return p3PendingExpRowAlloc(
-        pendingExp->exp_tag,
-        pendingExp->p1_version,
-        pendingExp->p2_version,
-        pendingExp->label
-    );
-}