aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--util/superiotool/ite.c20
-rw-r--r--util/superiotool/superiotool.h22
2 files changed, 23 insertions, 19 deletions
diff --git a/util/superiotool/ite.c b/util/superiotool/ite.c
index ca956be95d..314b8df16e 100644
--- a/util/superiotool/ite.c
+++ b/util/superiotool/ite.c
@@ -21,25 +21,7 @@
#include "superiotool.h"
-#define EOT -1 /* End Of Table */
-#define NOLDN -2 /* NO LDN needed */
-#define NANA -3 /* Not Available */
-#define MAXNAMELEN 20 /* Maximum Name Length */
-#define MAXLDN 0xa /* Biggest LDN */
-#define LDNSIZE (MAXLDN + 3) /* Biggest LDN + 0 + NOLDN + EOT */
-#define MAXNUMIDX 70 /* Maximum number of indexes */
-#define IDXSIZE (MAXNUMIDX + 1)
-
-const static struct ite_registers {
- /* Yes, superio_id should be unsigned, but EOT has to be negative. */
- signed short superio_id;
- const char name[MAXNAMELEN];
- struct ite_ldnidx {
- signed short ldn;
- signed short idx[IDXSIZE];
- signed short def[IDXSIZE];
- } ldn[LDNSIZE];
-} ite_reg_table[] = {
+const static struct superio_registers ite_reg_table[] = {
{0x8702, "IT8702", {
{EOT}}},
{0x8705, "IT8705 or IT8700", {
diff --git a/util/superiotool/superiotool.h b/util/superiotool/superiotool.h
index c973b9e118..f7c715eb66 100644
--- a/util/superiotool/superiotool.h
+++ b/util/superiotool/superiotool.h
@@ -1,6 +1,7 @@
/*
* This file is part of the LinuxBIOS project.
*
+ * Copyright (C) 2007 Carl-Daniel Hailfinger
* Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de>
*
* This program is free software; you can redistribute it and/or modify
@@ -25,6 +26,27 @@
#include <stdlib.h>
#include <sys/io.h>
+#define EOT -1 /* End Of Table */
+#define NOLDN -2 /* NO LDN needed */
+#define NANA -3 /* Not Available */
+#define MAXNAMELEN 20 /* Maximum Name Length */
+#define MAXLDN 0xa /* Biggest LDN */
+#define LDNSIZE (MAXLDN + 3) /* Biggest LDN + 0 + NOLDN + EOT */
+#define MAXNUMIDX 70 /* Maximum number of indexes */
+#define IDXSIZE (MAXNUMIDX + 1)
+
+struct superio_registers {
+ /* Yes, superio_id should be unsigned, but EOT has to be negative. */
+ signed short superio_id;
+ const char name[MAXNAMELEN];
+ struct ite_ldnidx {
+ signed short ldn;
+ signed short idx[IDXSIZE];
+ signed short def[IDXSIZE];
+ } ldn[LDNSIZE];
+};
+
+/* superiotool.c */
unsigned char regval(unsigned short port, unsigned char reg);
void regwrite(unsigned short port, unsigned char reg, unsigned char val);
void probe_superio(unsigned short port);