Fix WP polarity on Mario

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 "host_common.h"
 
@@ skipping 65 matching lines @@
  *
  * Returns 1 if the bit is set, 0 if clear, or -1 if error. */
 int ReadFileBit(const char* filename, int bitmask) {
   int value = ReadFileInt(filename);
   if (value == -1)
     return -1;
   else return (value & bitmask ? 1 : 0);
 }
 
 
+/* Returns non-zero if the FWID starts with the specified string. */

[Bill Richardson, 2011/02/17 19:05:49]

s/non-zero/true/ ?

+static int FwidStartsWith(const char *start) {
+  char fwid[128];
+  if (!VbGetSystemPropertyString("fwid", fwid, sizeof(fwid)))
+    return 0;
+
+  return 0 == strncmp(fwid, start, strlen(start));
+}
+
+
 /* Read a GPIO of the specified signal type (see ACPI GPIO SignalType).
  *
  * Returns 1 if the signal is asserted, 0 if not asserted, or -1 if error. */
 int ReadGpio(int signal_type) {
   char name[128];
   int index = 0;
   int gpio_type;
   int active_high;
   int controller_offset;
   char controller_name[128];
@@ skipping 52 matching lines @@
 
   /* Compare the GPIO value with the active value and return 1 if match. */
   return (value == active_high ? 1 : 0);
 }
 
 
 /* Read a system property integer.
  *
  * Returns the property value, or -1 if error. */
 int VbGetSystemPropertyInt(const char* name) {
+  int value = -1;
 
   if (!strcasecmp(name,"devsw_cur")) {
-    return ReadGpio(GPIO_SIGNAL_TYPE_DEV);
+    value = ReadGpio(GPIO_SIGNAL_TYPE_DEV);
   } else if (!strcasecmp(name,"devsw_boot")) {
-    return ReadFileBit(ACPI_CHSW_PATH, CHSW_DEV_BOOT);
+    value = ReadFileBit(ACPI_CHSW_PATH, CHSW_DEV_BOOT);
   } else if (!strcasecmp(name,"recoverysw_cur")) {
-    return ReadGpio(GPIO_SIGNAL_TYPE_RECOVERY);
+    value = ReadGpio(GPIO_SIGNAL_TYPE_RECOVERY);
   } else if (!strcasecmp(name,"recoverysw_boot")) {
-    return ReadFileBit(ACPI_CHSW_PATH, CHSW_RECOVERY_BOOT);
+    value = ReadFileBit(ACPI_CHSW_PATH, CHSW_RECOVERY_BOOT);
   } else if (!strcasecmp(name,"recoverysw_ec_boot")) {
-    return ReadFileBit(ACPI_CHSW_PATH, CHSW_RECOVERY_EC_BOOT);
+    value = ReadFileBit(ACPI_CHSW_PATH, CHSW_RECOVERY_EC_BOOT);
   } else if (!strcasecmp(name,"wpsw_cur")) {
-    return ReadGpio(GPIO_SIGNAL_TYPE_WP);
+    value = ReadGpio(GPIO_SIGNAL_TYPE_WP);
+    if (FwidStartsWith("Mario.") && -1 != value)

[Bill Richardson, 2011/02/17 19:05:49]

reverse the order of this expression. you don't have to compare if we can't read
the GPIO.

+      value = 1 - value;  /* Mario reports this backwards */
   } else if (!strcasecmp(name,"wpsw_boot")) {
-    return ReadFileBit(ACPI_CHSW_PATH, CHSW_WP_BOOT);
-  } else
-    return -1;
+    value = ReadFileBit(ACPI_CHSW_PATH, CHSW_WP_BOOT);
+    if (FwidStartsWith("Mario.") && -1 != value)

[Bill Richardson, 2011/02/17 19:05:49]

ditto

+      value = 1 - value;  /* Mario reports this backwards */
+  }
 
   /* TODO: remaining properties from spec */
+
+  return value;
 }
 
 
 /* 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")) {
@@ skipping 20 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;
 }