[LinuxBIOS] r2778 - trunk/util/superiotool

[svn at openbios.org]

Author: uwe
Date: 2007-09-16 20:17:44 +0200 (Sun, 16 Sep 2007)
New Revision: 2778

Modified:
   trunk/util/superiotool/ite.c
   trunk/util/superiotool/superiotool.h
Log:
Make 'struct superio_registers' globally available, pretty much
all Super I/Os can (and should!) use this (trivial).

Signed-off-by: Uwe Hermann <uwe at hermann-uwe.de>
Acked-by: Uwe Hermann <uwe at hermann-uwe.de>



Modified: trunk/util/superiotool/ite.c
===================================================================
--- trunk/util/superiotool/ite.c	2007-09-16 18:11:03 UTC (rev 2777)
+++ trunk/util/superiotool/ite.c	2007-09-16 18:17:44 UTC (rev 2778)
@@ -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", {

Modified: trunk/util/superiotool/superiotool.h
===================================================================
--- trunk/util/superiotool/superiotool.h	2007-09-16 18:11:03 UTC (rev 2777)
+++ trunk/util/superiotool/superiotool.h	2007-09-16 18:17:44 UTC (rev 2778)
@@ -1,6 +1,7 @@
 /*
  * This file is part of the LinuxBIOS project.
  *
+ * Copyright (C) 2007 Carl-Daniel Hailfinger
  * Copyright (C) 2007 Uwe Hermann <uwe at 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);