summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorUwe Hermann <uwe@hermann-uwe.de>2007-09-16 20:59:01 +0000
committerUwe Hermann <uwe@hermann-uwe.de>2007-09-16 20:59:01 +0000
commit519419b476a5e5eaa364151ca33da8055a6f7f80 (patch)
treec03010b3c074c2ca7140c25546b8d20b2c43fea5 /util
parent4cb7e717327add9165e30cca537225044bdc0fdd (diff)
Split out a dump_superio() function from ite.c, and make it slightly more
generic, so that we can use it for other Super I/Os, too. Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de> Acked-by: Uwe Hermann <uwe@hermann-uwe.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2779 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util')
-rw-r--r--util/superiotool/ite.c49
-rw-r--r--util/superiotool/superiotool.c60
-rw-r--r--util/superiotool/superiotool.h2
3 files changed, 65 insertions, 46 deletions
diff --git a/util/superiotool/ite.c b/util/superiotool/ite.c
index 314b8df16e..41f2a9bb3d 100644
--- a/util/superiotool/ite.c
+++ b/util/superiotool/ite.c
@@ -21,7 +21,7 @@
#include "superiotool.h"
-const static struct superio_registers ite_reg_table[] = {
+const static struct superio_registers reg_table[] = {
{0x8702, "IT8702", {
{EOT}}},
{0x8705, "IT8705 or IT8700", {
@@ -189,10 +189,7 @@ const static struct superio_registers ite_reg_table[] = {
void dump_ite(unsigned short port, unsigned short id)
{
- int i, j, k;
- signed short *idx;
-
- printf("ITE ");
+ int i;
/* TODO: Get datasheets for IT8711 and IT8712. */
switch (id) {
@@ -204,47 +201,7 @@ void dump_ite(unsigned short port, unsigned short id)
case 0x8716:
/* Note: IT8726F has ID 0x8726 (datasheet wrongly says 0x8716). */
case 0x8718:
- for (i = 0;; i++) {
- if (ite_reg_table[i].superio_id == EOT)
- break;
- if ((unsigned short)ite_reg_table[i].superio_id != id)
- continue;
- printf("%s\n", ite_reg_table[i].name);
- for (j = 0;; j++) {
- if (ite_reg_table[i].ldn[j].ldn == EOT)
- break;
- if (ite_reg_table[i].ldn[j].ldn != NOLDN) {
- printf("Switching to LDN 0x%01x\n",
- ite_reg_table[i].ldn[j].ldn);
- regwrite(port, 0x07,
- ite_reg_table[i].ldn[j].ldn);
- }
- idx = ite_reg_table[i].ldn[j].idx;
- printf("idx ");
- for (k = 0;; k++) {
- if (idx[k] == EOT)
- break;
- printf("%02x ", idx[k]);
- }
- printf("\nval ");
- for (k = 0;; k++) {
- if (idx[k] == EOT)
- break;
- printf("%02x ", regval(port, idx[k]));
- }
- printf("\ndef ");
- idx = ite_reg_table[i].ldn[j].def;
- for (k = 0;; k++) {
- if (idx[k] == EOT)
- break;
- if (idx[k] == NANA)
- printf("NA ");
- else
- printf("%02x ", idx[k]);
- }
- printf("\n");
- }
- }
+ dump_superio("ITE", reg_table, port, id);
break;
default:
printf("Unknown ITE chip, id=%04x\n", id);
diff --git a/util/superiotool/superiotool.c b/util/superiotool/superiotool.c
index 7c3f112904..ad3cd45c34 100644
--- a/util/superiotool/superiotool.c
+++ b/util/superiotool/superiotool.c
@@ -3,6 +3,7 @@
*
* Copyright (C) 2006 Ronald Minnich <rminnich@gmail.com>
* Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de>
+ * Copyright (C) 2007 Carl-Daniel Hailfinger
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -33,6 +34,65 @@ void regwrite(unsigned short port, unsigned char reg, unsigned char val)
outb(val, port + 1);
}
+void dump_superio(const char *name, const struct superio_registers reg_table[],
+ unsigned short port, unsigned short id)
+{
+ int i, j, k;
+ signed short *idx;
+
+ printf("%s ", name);
+
+ for (i = 0; /* Nothing */; i++) {
+ if (reg_table[i].superio_id == EOT)
+ break;
+
+ if ((unsigned short)reg_table[i].superio_id != id)
+ continue;
+
+ printf("%s\n", reg_table[i].name);
+
+ for (j = 0;; j++) {
+ if (reg_table[i].ldn[j].ldn == EOT)
+ break;
+
+ if (reg_table[i].ldn[j].ldn != NOLDN) {
+ printf("Switching to LDN 0x%01x\n",
+ reg_table[i].ldn[j].ldn);
+ regwrite(port, 0x07,
+ reg_table[i].ldn[j].ldn);
+ }
+
+ idx = reg_table[i].ldn[j].idx;
+
+ printf("idx ");
+ for (k = 0;; k++) {
+ if (idx[k] == EOT)
+ break;
+ printf("%02x ", idx[k]);
+ }
+
+ printf("\nval ");
+ for (k = 0;; k++) {
+ if (idx[k] == EOT)
+ break;
+ printf("%02x ", regval(port, idx[k]));
+ }
+
+ printf("\ndef ");
+ idx = reg_table[i].ldn[j].def;
+ for (k = 0;; k++) {
+ if (idx[k] == EOT)
+ break;
+ if (idx[k] == NANA)
+ printf("NA ");
+ else
+ printf("%02x ", idx[k]);
+ }
+ printf("\n");
+ }
+ }
+}
+
void probe_superio(unsigned short port)
{
probe_idregs_simple(port);
diff --git a/util/superiotool/superiotool.h b/util/superiotool/superiotool.h
index f7c715eb66..904007cbdf 100644
--- a/util/superiotool/superiotool.h
+++ b/util/superiotool/superiotool.h
@@ -49,6 +49,8 @@ struct superio_registers {
/* superiotool.c */
unsigned char regval(unsigned short port, unsigned char reg);
void regwrite(unsigned short port, unsigned char reg, unsigned char val);
+void dump_superio(const char *name, const struct superio_registers reg_table[],
+ unsigned short port, unsigned short id);
void probe_superio(unsigned short port);
/* fintek.c */