1. Changes and additions for autotest; 2. Two-level write-free locking test.

src/platform/tpm_lite/src/testsuite/clear.c

Index: src/platform/tpm_lite/src/testsuite/clear.c
diff --git a/src/platform/tpm_lite/src/testsuite/clear.c b/src/platform/tpm_lite/src/testsuite/clear.c
index 0042ed6dfcc29eaaa415a929d48e64b7f3c33e12..3eaf441a1ab21558c362a7ed63f04f79a7fd0189 100644
--- a/src/platform/tpm_lite/src/testsuite/clear.c
+++ b/src/platform/tpm_lite/src/testsuite/clear.c
@@ -3,28 +3,17 @@
  * found in the LICENSE file.
  */
 
-/* Testing: ownership testing code, ForceClear, and nvram write limit.
+/* Testing: ownership testing code and ForceClear.
  */
 
 #include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <tss/tcs.h>
 
 #include "tlcl.h"
 
-/* These index values are used to create NVRAM spaces.  They only need to be
- * unique.
- */
-#define INDEX0 0xda70
-#define INDEX1 0xda71
-#define INDEX2 0xda72
-#define INDEX3 0xda73
-
-int main(void) {
+int main(int argc, char** argv) {
   int owned;
 
-  TlclLibinit();
+  TlclLibInit();
 
 #if !USE_TPM_EMULATOR
   /* The emulator does these itself. */