Changeset 2321

Timestamp:

02/28/04 17:57:34 (9 years ago)

Author:

khali

Message:

Add support for Shuttle eeproms.

Location:

lm-sensors/trunk

Files:

• lib/chips.c (modified) (1 diff)
• lib/chips.h (modified) (1 diff)
• prog/sensors/chips.c (modified) (2 diffs)

lm-sensors/trunk/lib/chips.c

@@ -2976 +2976 @@
                          NOMAP, NOMAP,
                          R, EEPROM_SYSCTL1, VALUE(1), 0 },
+/* for Shuttle EEPROMS */
+    { SENSORS_EEPROM_SHUTTLE, "Ethernet Address",
+                         NOMAP, NOMAP,
+                         R, EEPROM_SYSCTL1, VALUE(1), 0 },
+    { SENSORS_EEPROM_SHUTTLE, "shuttle2",
+                         NOMAP, NOMAP,
+                         R, EEPROM_SYSCTL1, VALUE(2), 0 },
+    { SENSORS_EEPROM_SHUTTLE, "shuttle3",
+                         NOMAP, NOMAP,
+                         R, EEPROM_SYSCTL1, VALUE(3), 0 },
+    { SENSORS_EEPROM_SHUTTLE, "shuttle4",
+                         NOMAP, NOMAP,
+                         R, EEPROM_SYSCTL1, VALUE(4), 0 },
+    { SENSORS_EEPROM_SHUTTLE, "shuttle5",
+                         NOMAP, NOMAP,
+                         R, EEPROM_SYSCTL1, VALUE(5), 0 },
+    { SENSORS_EEPROM_SHUTTLE, "shuttle6",
+                         NOMAP, NOMAP,
+                         R, EEPROM_SYSCTL1, VALUE(6), 0 },
     { 0 }
   };

lm-sensors/trunk/lib/chips.h

@@ -1211 +1211 @@
 /* 33 to 39: reserved, do not use! */
 
+#define SENSORS_EEPROM_SHUTTLE 40
+/* 41 to 45: reserved, do not use! */
+
 /* Analog Devices LM87 chips */
 

lm-sensors/trunk/prog/sensors/chips.c

@@ -2840 +2840 @@
  * to the top. This should prevent such EEPROMs from being accidentally
  * detected as valid memory modules.
+ * (Khali, 2004-02-23) Add support for Shuttle EEPROMs, which contain
+ * MAC ethernet addresses.
  */
 void print_eeprom(const sensors_chip_name *name)
@@ -2886 +2888 @@
                 } else
                         printf("ERROR: data Vaio 2\n");
+                free_the_label(&label);
+        }
+
+        /* then Shuttle EEPROMs */
+        if (name->addr == 0x53) {
+                unsigned char buffer[6];
+
+                /* first make sure it is a Shuttle EEPROM */
+                if (!sensors_get_label_and_valid(*name, SENSORS_EEPROM_SHUTTLE, &label, &valid)
+                 && valid) {
+                        for (i = 0; i < 3; i++)
+                    if (!sensors_get_feature(*name, SENSORS_EEPROM_SHUTTLE+i, &a))
+                                        buffer[i] = (unsigned char) a;
+                        if (buffer[0] == 0x00
+                         && buffer[1] == 0x30
+                         && buffer[2] == 0x1b)
+                        {
+                                /* must be a real Shuttle EEPROM */
+                                for (i = 4; i < 6; i++)
+                        if (!sensors_get_feature(*name, SENSORS_EEPROM_SHUTTLE+i, &a))
+                                                buffer[i] = (unsigned char) a;
+
+                                print_label(label, 24);
+                                printf("%02X:%02X:%02X:%02X:%02X:%02X\n", buffer[0],
+                                        buffer[1], buffer[2], buffer[3], buffer[4], buffer[5]);
+                                free_the_label(&label);
+                                
+                                return;
+                        }
+                } else
+                        printf("ERROR: data Shuttle\n");
                 free_the_label(&label);
         }