Add function for VDAT processing.

host/lib/crossystem.c

 /* Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <stdio.h>
 #include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <ctype.h>
 
 #include "host_common.h"
 
 #include "crossystem.h"
 #include "utility.h"
 #include "vboot_common.h"
 #include "vboot_nvstorage.h"
 
 /* ACPI constants from Chrome OS Main Processor Firmware Spec */
 /* GPIO signal types */
@@ skipping 43 matching lines @@
 
 /* Base name for ACPI files */
 #define ACPI_BASE_PATH "/sys/devices/platform/chromeos_acpi"
 /* Paths for frequently used ACPI files */
 #define ACPI_BINF_PATH ACPI_BASE_PATH "/BINF"
 #define ACPI_CHNV_PATH ACPI_BASE_PATH "/CHNV"
 #define ACPI_CHSW_PATH ACPI_BASE_PATH "/CHSW"
 #define ACPI_FMAP_PATH ACPI_BASE_PATH "/FMAP"
 #define ACPI_GPIO_PATH ACPI_BASE_PATH "/GPIO"
 #define ACPI_VBNV_PATH ACPI_BASE_PATH "/VBNV"
+#define ACPI_VDAT_PATH ACPI_BASE_PATH "/VDAT"
 
 /* Base name for GPIO files */
 #define GPIO_BASE_PATH "/sys/class/gpio"
 #define GPIO_EXPORT_PATH GPIO_BASE_PATH "/export"
 
 /* Filename for NVRAM file */
 #define NVRAM_PATH "/dev/nvram"
 
 /* Filename for kernel command line */
 #define KERNEL_CMDLINE_PATH "/proc/cmdline"
 
+/* A structure to contain buffer data retrieved from the ACPI. */
+typedef struct {
+  int buffer_size;
+  void* buffer;
+} AcpiBuffer;
+
 
 /* Copy up to dest_size-1 characters from src to dest, ensuring null
    termination (which strncpy() doesn't do).  Returns the destination
    string. */
 char* StrCopy(char* dest, const char* src, int dest_size) {
   strncpy(dest, src, dest_size);
   dest[dest_size - 1] = '\0';
   return dest;
 }
 
@@ skipping 185 matching lines @@
   if (0 != fseek(f, chnv, SEEK_SET) || EOF == (fputc(nvbyte, f))) {
     fclose(f);
     return -1;
   }
 
   /* Success */
   fclose(f);
   return 0;
 }
 
+/*
+ * Get buffer data from ACPI.
+ *
+ * Buffer data is expected to be represented by a file which is a text dump of
+ * the buffer, representing each byte by two hex numbers, space and newline
+ * separated.
+ *
+ * Input - ACPI file name to get data from.
+ *
+ * Output: a pointer to AcpiBuffer structure containing the binary
+ *         representation of the data. The caller is responsible for
+ *         deallocating the pointer, this will take care of both the structure
+ *         and the buffer. Null in case of error.
+ */
+
+AcpiBuffer* VbGetBuffer(const char* filename)
+{
+  FILE *f = NULL;

[Randall Spangler, 2011/03/15 05:32:16]

Shouldn't these be 'FILE* f'?

[vb, 2011/03/15 16:31:30]

changed to match the file style.

+  char *file_buffer = NULL;
+  AcpiBuffer *acpi_buffer = NULL;
+  AcpiBuffer *return_value = NULL;
+
+  do {
+    struct stat fs;
+    unsigned char *output_ptr;
+    int rv, i, real_size;
+
+    rv = stat(filename, &fs);
+    if (rv || !S_ISREG(fs.st_mode))
+      break;
+
+    f = fopen(filename, "r");
+    if (!f)
+      break;
+
+    file_buffer = Malloc(fs.st_size + 1);
+    if (!file_buffer)
+      break;
+
+
+    real_size = fread(file_buffer, 1, fs.st_size, f);
+    if (!real_size)
+      break;
+
+    /* each byte in the output will replace two characters and a space in the
+     *  input, so the output size does not exceed input side/3 (a little less
+     *  if account for newline characters).
+     */
+    acpi_buffer = Malloc(sizeof(AcpiBuffer) + real_size/3);
+
+    if (!acpi_buffer)
+      break;
+
+    file_buffer[real_size] = '\0';
+
+    acpi_buffer->buffer = acpi_buffer + 1;
+    acpi_buffer->buffer_size = 0;
+    output_ptr = acpi_buffer->buffer;
+
+    /* process the file contents */
+    for (i = 0; i < real_size; i++) {
+      char *base, *end;
+
+      base = file_buffer + i;
+
+      if (!isxdigit(*base))
+          continue;
+
+      output_ptr[acpi_buffer->buffer_size++] = strtol(base, &end, 16) & 0xff;
+
+      if ((end - base) != 2)
+        /* Input file format error */
+        break;
+
+      i += 2; /* skip the second character and the following space */
+    }
+
+    if (i == real_size) {
+      /* all is well */
+      return_value = acpi_buffer;
+      acpi_buffer = NULL; /* prevent it from deallocating */
+    }
+  } while(0);
+
+  /* wrap up */
+  if (f)
+    fclose(f);
+
+  if (file_buffer)
+    Free(file_buffer);
+
+  if (acpi_buffer)
+    Free(acpi_buffer);
+
+  return return_value;
+}
 
 /* Read an integer property from VbNvStorage.
  *
  * Returns the parameter value, or -1 if error. */
 int VbGetNvStorage(VbNvParam param) {
   FILE* f;
   VbNvContext vnc;
   int offs;
   uint32_t value;
   int retval;
@@ skipping 261 matching lines @@
     return VbGetRecoveryReason();
   } else if (!strcasecmp(name,"fmap_base")) {
     value = ReadFileInt(ACPI_FMAP_PATH);
   } else if (!strcasecmp(name,"cros_debug")) {
     value = VbGetCrosDebug();
   }
 
   return value;
 }
 
+/* This function is just an example illustrating the use of VbGetBuffer(). It
+ *  converts the binary contents of the buffer into a space delimetered hex
+ *  string. It is expected to be replaced with afunction which has knowledge

[Randall Spangler, 2011/03/15 05:32:16]

a function

[vb, 2011/03/15 16:31:30]

Done.

+ *  of the buffer data structure.
+ */
+char* GetVdatBuffer(void)
+{
+  char* buffer, *src, *p;
+  int i;
+
+  AcpiBuffer* ab = VbGetBuffer(ACPI_VDAT_PATH);
+  if (!ab)
+    return NULL;
+
+  buffer = Malloc(ab->buffer_size * 3 + 2);
+  p = buffer;
+  src = ab->buffer;
+  for (i = 0; i < ab->buffer_size; i++) {
+    snprintf(p, 4, " %2.2x", *src++);
+    p += 3;
+  }
+  *p = '\0';
+  Free(ab);
+  return buffer;
+}
 
 /* Read a system property string into a destination buffer of the specified
  * size.
  *
  * Returns the passed buffer, or NULL if error. */
 const char* VbGetSystemPropertyString(const char* name, char* dest, int size) {
 
   if (!strcasecmp(name,"hwid")) {
     return ReadFileString(dest, size, ACPI_BASE_PATH "/HWID");
   } else if (!strcasecmp(name,"fwid")) {
@@ skipping 24 matching lines @@
     }
   } else if (!strcasecmp(name,"kernkey_vfy")) {
     switch(VbGetNvStorage(VBNV_FW_VERIFIED_KERNEL_KEY)) {
       case 0:
         return "hash";
       case 1:
         return "sig";
       default:
         return NULL;
     }
+  } else if (!strcasecmp(name, "vdat")) {
+    return GetVdatBuffer();
   } else
     return NULL;
 }
 
 
 /* Set a system property integer.
  *
  * Returns 0 if success, -1 if error. */
 int VbSetSystemPropertyInt(const char* name, int value) {
 
@@ skipping 25 matching lines @@
 
 
 /* Set a system property string.
  *
  * Returns 0 if success, -1 if error. */
 int VbSetSystemPropertyString(const char* name, const char* value) {
 
   /* TODO: support setting */
   return -1;
 }