summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--util/superiotool/ali.c4
-rw-r--r--util/superiotool/fintek.c6
-rw-r--r--util/superiotool/ite.c32
-rw-r--r--util/superiotool/smsc.c80
-rw-r--r--util/superiotool/winbond.c12
5 files changed, 66 insertions, 68 deletions
diff --git a/util/superiotool/ali.c b/util/superiotool/ali.c
index 52144dde01..a23ffcc9fc 100644
--- a/util/superiotool/ali.c
+++ b/util/superiotool/ali.c
@@ -29,8 +29,8 @@ static const struct superio_registers reg_table[] = {
/* TODO: M5113 doesn't seem to have ID registers? */
{0x5315, "M1535/M1535D/M1535+/M1535D+", {
{NOLDN, NULL,
- {0x07,0x1f,0x20,0x21,0x22,0x23,0x2c,0x2d,0x2e,EOT},
- {NANA,NANA,0x53,0x15,0x00,0x00,RSVD,RSVD,RSVD,EOT}},
+ {0x1f,0x20,0x21,0x22,0x23,0x2c,0x2d,0x2e,EOT},
+ {NANA,0x53,0x15,0x00,0x00,RSVD,RSVD,RSVD,EOT}},
{0x0, "Floppy",
{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,0xf2,0xf4,EOT},
{0x00,0x03,0xf0,0x06,0x02,0x08,0x00,0xff,0x00,EOT}},
diff --git a/util/superiotool/fintek.c b/util/superiotool/fintek.c
index fc255e733b..576b7bef64 100644
--- a/util/superiotool/fintek.c
+++ b/util/superiotool/fintek.c
@@ -81,10 +81,8 @@ static const struct superio_registers reg_table[] = {
{0x0604, "F71805F/FG", {
/* We assume reserved bits are read as 0. */
{NOLDN, NULL,
- {0x07,0x20,0x21,0x23,0x24,0x25,0x26,0x27,0x28,
- 0x29,EOT},
- {NANA,0x04,0x06,0x19,0x34,0x00,0x00,0x3f,0x08,
- 0x00,EOT}},
+ {0x20,0x21,0x23,0x24,0x25,0x26,0x27,0x28,0x29,EOT},
+ {0x04,0x06,0x19,0x34,0x00,0x00,0x3f,0x08,0x00,EOT}},
{0x0, "Floppy",
{0x30,0x60,0x61,0x70,0x74,0xf0,0xf2,0xf4,EOT},
{0x01,0x03,0xf0,0x06,0x02,0x0e,0x03,0x00,EOT}},
diff --git a/util/superiotool/ite.c b/util/superiotool/ite.c
index 926b5ae056..813ea9b2a5 100644
--- a/util/superiotool/ite.c
+++ b/util/superiotool/ite.c
@@ -30,10 +30,10 @@ static const struct superio_registers reg_table[] = {
{0x8661, "IT8661F", {
/* TODO: Needs different init sequence. */
{NOLDN, NULL,
- {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x20,0x21,
- 0x22,0x23,0x24,EOT},
- {NANA,NANA,NANA,NANA,NANA,NANA,0x00,NANA,0x86,0x61,
- 0x00,0x00,0x00,EOT}},
+ {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x20,0x21,0x22,
+ 0x23,0x24,EOT},
+ {NANA,NANA,NANA,NANA,NANA,NANA,0x00,0x86,0x61,0x00,
+ 0x00,0x00,EOT}},
{0x0, "Floppy",
{0x30,0x31,0x60,0x61,0x70,0x71,0x74,0xf0,EOT},
{0x00,0x00,0x03,0xf0,0x06,0x02,0x02,0x00,EOT}},
@@ -65,8 +65,8 @@ static const struct superio_registers reg_table[] = {
{EOT}}},
{0x8705, "IT8705F/AF / IT8700F", {
{NOLDN, NULL,
- {0x07,0x20,0x21,0x22,0x23,0x24,EOT},
- {NANA,0x87,0x05,0x00,0x00,NANA,EOT}},
+ {0x20,0x21,0x22,0x23,0x24,EOT},
+ {0x87,0x05,0x00,0x00,NANA,EOT}},
{0x0, "Floppy",
{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT},
{0x00,0x03,0xf0,0x06,0x02,0x00,0x00,EOT}},
@@ -116,10 +116,10 @@ static const struct superio_registers reg_table[] = {
{EOT}}},
{0x8708, "IT8708F", {
{NOLDN, NULL,
- {0x07,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,
- 0x29,0x2a,0x2e,0x2f,EOT},
- {NANA,0x87,0x08,0x00,0x00,NANA,0x3f,0x00,0xff,0xff,
- 0xff,0xff,0x00,0x00,EOT}},
+ {0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,
+ 0x2a,0x2e,0x2f,EOT},
+ {0x87,0x08,0x00,0x00,NANA,0x3f,0x00,0xff,0xff,0xff,
+ 0xff,0x00,0x00,EOT}},
{0x0, "Floppy",
{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT},
{0x00,0x03,0xf0,0x06,0x02,0x00,0x00,EOT}},
@@ -173,8 +173,8 @@ static const struct superio_registers reg_table[] = {
{EOT}}},
{0x8712, "IT8712F", {
{NOLDN, NULL,
- {0x07,0x20,0x21,0x22,0x23,0x24,0x2b,EOT},
- {NANA,0x87,0x12,0x08,0x00,0x00,0x00,EOT}},
+ {0x20,0x21,0x22,0x23,0x24,0x2b,EOT},
+ {0x87,0x12,0x08,0x00,0x00,0x00,EOT}},
{0x0, "Floppy",
{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT},
{0x00,0x03,0xf0,0x06,0x02,0x00,0x00,EOT}},
@@ -224,8 +224,8 @@ static const struct superio_registers reg_table[] = {
{EOT}}},
{0x8716, "IT8716F", {
{NOLDN, NULL,
- {0x07,0x20,0x21,0x22,0x23,0x24,0x2b,EOT},
- {NANA,0x87,0x16,0x01,0x00,0x00,0x00,EOT}},
+ {0x20,0x21,0x22,0x23,0x24,0x2b,EOT},
+ {0x87,0x16,0x01,0x00,0x00,0x00,EOT}},
{0x0, "Floppy",
{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT},
{0x00,0x03,0xf0,0x06,0x02,0x00,0x00,EOT}},
@@ -274,8 +274,8 @@ static const struct superio_registers reg_table[] = {
{EOT}}},
{0x8718, "IT8718F", {
{NOLDN, NULL,
- {0x07,0x20,0x21,0x22,0x23,0x24,0x2b,EOT},
- {NANA,0x87,0x18,0x01,0x00,0x00,0x00,EOT}},
+ {0x20,0x21,0x22,0x23,0x24,0x2b,EOT},
+ {0x87,0x18,0x01,0x00,0x00,0x00,EOT}},
{0x0, "Floppy",
{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT},
{0x00,0x03,0xf0,0x06,0x02,0x00,0x00,EOT}},
diff --git a/util/superiotool/smsc.c b/util/superiotool/smsc.c
index 1d6e925c63..a45ee45a99 100644
--- a/util/superiotool/smsc.c
+++ b/util/superiotool/smsc.c
@@ -34,10 +34,10 @@ static const struct superio_registers reg_table[] = {
{EOT}}},
{0x0a, "FDC37N971", {
{NOLDN, NULL,
- {0x02,0x07,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
- 0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,EOT},
- {0x00,0x00,0x0a,0x00,0x00,0x00,0x04,0x04,NANA,NANA,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,EOT}},
+ {0x02,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,
+ 0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,EOT},
+ {0x00,0x0a,0x00,0x00,0x00,0x04,0x04,NANA,NANA,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,EOT}},
{0x0, "Floppy",
{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,0xf2,0xf3,0xf4,
0xf5,EOT},
@@ -72,10 +72,10 @@ static const struct superio_registers reg_table[] = {
{EOT}}},
{0x0b, "FDC37N972", {
{NOLDN, NULL,
- {0x02,0x07,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
- 0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,EOT},
- {0x00,0x00,0x0b,0x00,0x00,0x00,0x04,0x04,NANA,NANA,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,EOT}},
+ {0x02,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,
+ 0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,EOT},
+ {0x00,0x0b,0x00,0x00,0x00,0x04,0x04,NANA,NANA,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,EOT}},
{0x0, "Floppy",
{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,0xf2,0xf3,0xf4,
0xf5,EOT},
@@ -151,10 +151,10 @@ static const struct superio_registers reg_table[] = {
{EOT}}},
{0x09, "FDC37N958FR", { /* Found in e.g. Dell Latitude CPi A366XT. */
{NOLDN, NULL,
- {0x03,0x07,0x20,0x21,0x22,0x23,0x24,0x26,0x27,0x28,
- 0x2b,0x2c,0x2d,0x2e,0x2f,EOT},
- {0x03,NANA,0x44,0x00,0x00,0x00,0x04,MISC,MISC,0x00,
- NANA,NANA,NANA,NANA,NANA,EOT}},
+ {0x03,0x20,0x21,0x22,0x23,0x24,0x26,0x27,0x28,0x2b,
+ 0x2c,0x2d,0x2e,0x2f,EOT},
+ {0x03,0x44,0x00,0x00,0x00,0x04,MISC,MISC,0x00,NANA,
+ NANA,NANA,NANA,NANA,EOT}},
{0x0, "Floppy",
{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,0xf2,0xf4,0xf5,
EOT},
@@ -196,10 +196,10 @@ static const struct superio_registers reg_table[] = {
{EOT}}},
{0x44, "FDC37B78x", {
{NOLDN, NULL,
- {0x03,0x07,0x20,0x21,0x22,0x23,0x24,0x26,0x27,0x28,
- 0x2b,0x2c,0x2d,0x2e,0x2f,EOT},
- {0x03,NANA,0x44,0x00,0x00,0x00,0x04,MISC,MISC,0x00,
- NANA,NANA,NANA,NANA,NANA,EOT}},
+ {0x03,0x20,0x21,0x22,0x23,0x24,0x26,0x27,0x28,0x2b,
+ 0x2c,0x2d,0x2e,0x2f,EOT},
+ {0x03,0x44,0x00,0x00,0x00,0x04,MISC,MISC,0x00,NANA,
+ NANA,NANA,NANA,NANA,EOT}},
{0x0, "Floppy",
{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,0xf2,0xf4,0xf5,
EOT},
@@ -241,10 +241,10 @@ static const struct superio_registers reg_table[] = {
{EOT}}},
{0x4c, "FDC37B72x", {
{NOLDN, NULL,
- {0x03,0x07,0x20,0x21,0x22,0x23,0x24,0x26,0x27,0x28,
- 0x2b,0x2c,0x2d,0x2e,0x2f,EOT},
- {0x03,NANA,0x4c,0x00,0x00,0x00,0x04,MISC,MISC,0x00,
- NANA,NANA,NANA,NANA,NANA,EOT}},
+ {0x03,0x20,0x21,0x22,0x23,0x24,0x26,0x27,0x28,0x2b,
+ 0x2c,0x2d,0x2e,0x2f,EOT},
+ {0x03,0x4c,0x00,0x00,0x00,0x04,MISC,MISC,0x00,NANA,
+ NANA,NANA,NANA,NANA,EOT}},
{0x0, "Floppy",
{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,0xf2,0xf4,0xf5,
EOT},
@@ -279,10 +279,10 @@ static const struct superio_registers reg_table[] = {
{EOT}}},
{0x4d, "FDC37M81x", {
{NOLDN, NULL,
- {0x03,0x07,0x20,0x21,0x22,0x23,0x24,0x26,0x27,0x2b,
- 0x2c,0x2d,0x2e,0x2f,EOT},
- {0x03,0x00,0x4d,NANA,0x00,0x00,0x04,MISC,MISC,NANA,
- NANA,NANA,NANA,NANA,EOT}},
+ {0x03,0x20,0x21,0x22,0x23,0x24,0x26,0x27,0x2b,0x2c,
+ 0x2d,0x2e,0x2f,EOT},
+ {0x03,0x4d,NANA,0x00,0x00,0x04,MISC,MISC,NANA,NANA,
+ NANA,NANA,NANA,EOT}},
{0x0, "Floppy",
{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,0xf2,0xf4,
0xf5,EOT},
@@ -354,10 +354,10 @@ static const struct superio_registers reg_table[] = {
{EOT}}},
{0x59, "LPC47M10x/112/13x", {
{NOLDN, NULL,
- {0x03,0x07,0x20,0x21,0x22,0x23,0x24,0x26,0x27,0x28,
- 0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,EOT},
- {RSVD,0x00,0x59,NANA,0x00,0x00,0x44,MISC,MISC,RSVD,
- NANA,NANA,NANA,NANA,NANA,NANA,EOT}},
+ {0x03,0x20,0x21,0x22,0x23,0x24,0x26,0x27,0x28,0x2a,
+ 0x2b,0x2c,0x2d,0x2e,0x2f,EOT},
+ {RSVD,0x59,NANA,0x00,0x00,0x44,MISC,MISC,RSVD,NANA,
+ NANA,NANA,NANA,NANA,NANA,EOT}},
{0x0, "Floppy",
{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,0xf2,0xf4,
0xf5,EOT},
@@ -393,10 +393,10 @@ static const struct superio_registers reg_table[] = {
{EOT}}},
{0x60, "LPC47M15x/192/997", {
{NOLDN, NULL,
- {0x03,0x07,0x20,0x21,0x22,0x23,0x24,0x26,0x27,0x28,
- 0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,EOT},
- {RSVD,0x00,0x60,NANA,0x00,0x00,0x44,MISC,MISC,RSVD,
- NANA,NANA,NANA,NANA,NANA,NANA,EOT}},
+ {0x03,0x20,0x21,0x22,0x23,0x24,0x26,0x27,0x28,0x2a,
+ 0x2b,0x2c,0x2d,0x2e,0x2f,EOT},
+ {RSVD,0x60,NANA,0x00,0x00,0x44,MISC,MISC,RSVD,NANA,
+ NANA,NANA,NANA,NANA,NANA,EOT}},
{0x0, "Floppy",
{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,0xf2,0xf4,0xf5,
EOT},
@@ -443,10 +443,10 @@ static const struct superio_registers reg_table[] = {
{EOT}}},
{0x77, "A8000", { /* ASUS A8000, a rebranded DME1737(?) */
{NOLDN, NULL,
- {0x03,0x07,0x20,0x21,0x22,0x23,0x24,0x26,0x27,0x28,
- 0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,EOT},
- {RSVD,0x00,0x77,NANA,0x00,RSVD,0x44,MISC,MISC,RSVD,
- NANA,NANA,NANA,NANA,NANA,NANA,EOT}},
+ {0x03,0x20,0x21,0x22,0x23,0x24,0x26,0x27,0x28,0x2a,
+ 0x2b,0x2c,0x2d,0x2e,0x2f,EOT},
+ {RSVD,0x77,NANA,0x00,RSVD,0x44,MISC,MISC,RSVD,NANA,
+ NANA,NANA,NANA,NANA,NANA,EOT}},
{0x0, "Floppy",
{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,0xf2,0xf4,
0xf5,EOT},
@@ -470,10 +470,10 @@ static const struct superio_registers reg_table[] = {
{EOT}}},
{0x78, "DME1737", {
{NOLDN, NULL,
- {0x03,0x07,0x20,0x21,0x22,0x23,0x24,0x26,0x27,0x28,
- 0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,EOT},
- {RSVD,0x00,0x77,NANA,0x00,RSVD,0x44,MISC,MISC,RSVD,
- NANA,NANA,NANA,NANA,NANA,NANA,EOT}},
+ {0x03,0x20,0x21,0x22,0x23,0x24,0x26,0x27,0x28,0x2a,
+ 0x2b,0x2c,0x2d,0x2e,0x2f,EOT},
+ {RSVD,0x77,NANA,0x00,RSVD,0x44,MISC,MISC,RSVD,NANA,
+ NANA,NANA,NANA,NANA,NANA,EOT}},
{0x0, "Floppy",
{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,0xf2,0xf4,
0xf5,EOT},
diff --git a/util/superiotool/winbond.c b/util/superiotool/winbond.c
index 1b67e9c1a4..ededd49cd6 100644
--- a/util/superiotool/winbond.c
+++ b/util/superiotool/winbond.c
@@ -45,9 +45,9 @@ static const struct superio_registers reg_table[] = {
{EOT}}},
{0x601, "W83697HF/F/HG", { /* No G version? */
{NOLDN, NULL,
- {0x07,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x28,0x29,
+ {0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x28,0x29,
0x2a,EOT},
- {NANA,0x60,NANA,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
+ {0x60,NANA,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
MISC,EOT}},
/* Some register defaults depend on the value of PNPCSV. */
{0x0, "Floppy",
@@ -259,10 +259,10 @@ static const struct superio_registers reg_table[] = {
/* ID only */
{0x52, "W83627HF/F/HG/G", {
{NOLDN, NULL,
- {0x02,0x07,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x28,
- 0x29,0x2a,0x2b,0x2c,0x2e,0x2f,EOT},
- {0x00,NANA,0x52,NANA,0xff,0x00,MISC,0x00,0x00,0x00,
- 0x00,0x7c,0xc0,0x00,0x00,0x00,EOT}},
+ {0x02,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x28,0x29,
+ 0x2a,0x2b,0x2c,0x2e,0x2f,EOT},
+ {0x00,0x52,NANA,0xff,0x00,MISC,0x00,0x00,0x00,0x00,
+ 0x7c,0xc0,0x00,0x00,0x00,EOT}},
{0x0, "Floppy",
{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,0xf2,0xf4,
0xf5,EOT},