Add lots of debugging to TPM library.

Temporarily disable TPM in developer mode.

Review URL: http://codereview.chromium.org/3041005

8 files changed, 13 insertions, 13 deletions

diff --git a/tests/tpm_lite/clear.c b/tests/tpm_lite/clear.c
index f9caab5a..3bb30c8a 100644
--- a/tests/tpm_lite/clear.c
+++ b/tests/tpm_lite/clear.c
@@ -15,7 +15,7 @@ int main(int argc, char** argv) {
 
   TlclLibInit();
   TlclStartup();
-  TlclSelftestfull();
+  TlclSelfTestFull();
   TlclAssertPhysicalPresence();
 
   owned = TlclIsOwned();
diff --git a/tests/tpm_lite/enable.c b/tests/tpm_lite/enable.c
index 15099849..a9172ba9 100644
--- a/tests/tpm_lite/enable.c
+++ b/tests/tpm_lite/enable.c
@@ -12,7 +12,7 @@ int main(int argc, char** argv) {
 
   TlclLibInit();
   TlclStartup();
-  TlclSelftestfull();
+  TlclSelfTestFull();
 
   TlclAssertPhysicalPresence();
   TlclSetEnable();
diff --git a/tests/tpm_lite/fastenable.c b/tests/tpm_lite/fastenable.c
index e9f58938..5b11e2e0 100644
--- a/tests/tpm_lite/fastenable.c
+++ b/tests/tpm_lite/fastenable.c
@@ -28,12 +28,12 @@ int main(int argc, char** argv) {
 
   TlclLibInit();
   CHECK(TlclStartup());
-  CHECK(TlclSelftestfull());
+  CHECK(TlclSelfTestFull());
 
   CHECK(TlclAssertPhysicalPresence());
   printf("PP asserted\n");
 
-  CHECK(TlclGetFlags(&disable, &deactivated));
+  CHECK(TlclGetFlags(&disable, &deactivated, NULL));
   printf("disable is %d, deactivated is %d\n", disable, deactivated);
 
   for (i = 0; i < 2; i++) {
@@ -41,19 +41,19 @@ int main(int argc, char** argv) {
     CHECK(TlclForceClear());
     printf("tpm is cleared\n");
 
-    CHECK(TlclGetFlags(&disable, &deactivated));
+    CHECK(TlclGetFlags(&disable, &deactivated, NULL));
     printf("disable is %d, deactivated is %d\n", disable, deactivated);
 
     CHECK(TlclSetEnable());
     printf("disable flag is cleared\n");
 
-    CHECK(TlclGetFlags(&disable, &deactivated));
+    CHECK(TlclGetFlags(&disable, &deactivated, NULL));
     printf("disable is %d, deactivated is %d\n", disable, deactivated);
 
     CHECK(TlclSetDeactivated(0));
     printf("deactivated flag is cleared\n");
 
-    CHECK(TlclGetFlags(&disable, &deactivated));
+    CHECK(TlclGetFlags(&disable, &deactivated, NULL));
     printf("disable is %d, deactivated is %d\n", disable, deactivated);
   }
 
diff --git a/tests/tpm_lite/globallock.c b/tests/tpm_lite/globallock.c
index ab287a44..0fd455a2 100644
--- a/tests/tpm_lite/globallock.c
+++ b/tests/tpm_lite/globallock.c
@@ -26,7 +26,7 @@ int main(int argc, char** argv) {
   TlclLibInit();
 
   TlclStartup();
-  TlclSelftestfull();
+  TlclSelfTestFull();
 
   TlclAssertPhysicalPresence();
 
diff --git a/tests/tpm_lite/lock.c b/tests/tpm_lite/lock.c
index c3ed0af1..2fd21b7e 100644
--- a/tests/tpm_lite/lock.c
+++ b/tests/tpm_lite/lock.c
@@ -18,7 +18,7 @@ int main(int argc, char** argv) {
   TlclLibInit();
 
   TlclStartup();
-  TlclSelftestfull();
+  TlclSelfTestFull();
 
   TlclAssertPhysicalPresence();
 
diff --git a/tests/tpm_lite/readonly.c b/tests/tpm_lite/readonly.c
index 9c49ec1d..454a75e3 100644
--- a/tests/tpm_lite/readonly.c
+++ b/tests/tpm_lite/readonly.c
@@ -69,7 +69,7 @@ int main(int argc, char** argv) {
   TlclLibInit();
 
   TlclStartup();
-  TlclSelftestfull();
+  TlclSelfTestFull();
 
   TlclAssertPhysicalPresence();
 
diff --git a/tests/tpm_lite/redefine.c b/tests/tpm_lite/redefine.c
index 030abb67..eafded16 100644
--- a/tests/tpm_lite/redefine.c
+++ b/tests/tpm_lite/redefine.c
@@ -28,7 +28,7 @@ int main(int argc, char** argv) {
 
   TlclLibInit();
   TlclStartup();
-  TlclSelftestfull();
+  TlclSelfTestFull();
   TlclAssertPhysicalPresence();
 
   result = TlclRead(INDEX0, (uint8_t*) &x, sizeof(x));
diff --git a/tests/tpm_lite/writelimit.c b/tests/tpm_lite/writelimit.c
index 5daef76b..552cbd66 100644
--- a/tests/tpm_lite/writelimit.c
+++ b/tests/tpm_lite/writelimit.c
@@ -25,11 +25,11 @@ int main(int argc, char** argv) {
   TlclLibInit();
 
   TlclStartup();
-  TlclSelftestfull();
+  TlclSelfTestFull();
 
   TlclAssertPhysicalPresence();
 
-  result = TlclGetFlags(&disable, &deactivated);
+  result = TlclGetFlags(&disable, &deactivated, NULL);
   printf("disable is %d, deactivated is %d\n", disable, deactivated);
 
   if (disable || deactivated) {