X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=util%2Fsuperiotool%2Fnsc.c;h=90dfe23033e7d000b8a512435a5cbeeb92e2338a;hb=a01ec147e9bd0df0f38a74938640443f7dd2cd6d;hp=c64994c40ae6b75a2ba6d49c47c2ee05d73cc6d0;hpb=abeb63df5f94e0ecb00dd31abf259326c6243db1;p=coreboot.git

diff --git a/util/superiotool/nsc.c b/util/superiotool/nsc.c
index c64994c40..90dfe2303 100644
--- a/util/superiotool/nsc.c
+++ b/util/superiotool/nsc.c
@@ -24,12 +24,188 @@
 #define CHIP_ID_REG	0x20	/* Super I/O ID (SID) / family */
 #define CHIP_REV_REG	0x27	/* Super I/O revision ID (SRID) */
 
-const static struct superio_registers reg_table[] = {
-	{0xd0, "PC87371", {	/* From sensors-detect */
+static const struct superio_registers reg_table[] = {
+	{0xcf, "PC97307", {
+		{NOLDN, NULL,
+			{0x20,0x21,0x22,0x23,0x24,0x27,EOT},
+			{0xcf,MISC,MISC,0x00,0x00,NANA,EOT}},
+		{0x0, "Keyboard",
+			{0x30,0x31,0x60,0x61,0x62,0x63,0x70,0x71,0x74,0x75,
+			 0xf0,EOT},
+			{MISC,0x00,0x00,0x60,0x00,0x64,0x01,0x02,0x04,0x04,
+			 0x40,EOT}},
+		{0x1, "Mouse",
+			{0x30,0x70,0x71,0x74,0x75,EOT},
+			{0x00,0x0c,0x02,0x04,0x04,EOT}},
+		{0x2, "Real-time clock (RTC), advanced power control (APC)",
+			{0x30,0x31,0x60,0x61,0x70,0x71,0x74,0x75,EOT},
+			{MISC,0x00,0x00,0x70,0x08,0x00,0x04,0x04,EOT}},
+		{0x3, "Floppy",
+			{0x30,0x31,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,0xf1,
+			 EOT},
+			{MISC,0x00,0x03,0xf2,0x06,0x03,0x02,0x04,0x20,0x00,
+			 EOT}},
+		{0x4, "Parallel port",
+			{0x30,0x31,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x00,0x02,0x78,0x07,0x00,0x04,0x04,0xf2,EOT}},
+		{0x5, "COM2 / IR",
+			{0x30,0x31,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x00,0x02,0xf8,0x03,0x03,0x04,0x04,0x02,EOT}},
+		{0x6, "COM1",
+			{0x30,0x31,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x00,0x03,0xf8,0x04,0x03,0x04,0x04,0x02,EOT}},
+		{0x7, "GPIO",
+			{0x30,0x31,0x60,0x61,0x74,0x75,EOT},
+			{0x00,0x00,0x00,0x00,0x04,0x04,EOT}},
+		{0x8, "Power management",
+			{0x30,0x31,0x60,0x61,0x74,0x75,EOT},
+			{0x00,0x00,0x00,0x00,0x04,0x04,EOT}},
 		{EOT}}},
-	{0xdf, "PC97371", {	/* From sensors-detect */
+	{0xd0, "PC87317", {
+		{NOLDN, NULL,
+			{0x20,0x21,0x22,0x23,0x24,0x25,EOT},
+			{0xd0,MISC,MISC,0x00,0x00,0x00,EOT}},
+		{0x0, "Keyboard",
+			{0x30,0x31,0x60,0x61,0x62,0x63,0x70,0x71,0x74,0x75,
+			 0xf0,EOT},
+			{MISC,0x00,0x00,0x60,0x00,0x64,0x01,0x02,0x04,0x04,
+			 0x40,EOT}},
+		{0x1, "Mouse",
+			{0x30,0x70,0x71,0x74,0x75,EOT},
+			{0x00,0x0c,0x02,0x04,0x04,EOT}},
+		{0x2, "Real-time clock (RTC), advanced power control (APC)",
+			{0x30,0x31,0x60,0x61,0x70,0x71,0x74,0x75,EOT},
+			{MISC,0x00,0x00,0x70,0x08,0x00,0x04,0x04,EOT}},
+		{0x3, "Floppy",
+			{0x30,0x31,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,0xf1,
+			 EOT},
+			{MISC,0x00,0x03,0xf2,0x06,0x03,0x02,0x04,0x20,0x00,
+			 EOT}},
+		{0x4, "Parallel port",
+			{0x30,0x31,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x00,0x02,0x78,0x07,0x00,0x04,0x04,0xf2,EOT}},
+		{0x5, "COM2 / IR",
+			{0x30,0x31,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x00,0x02,0xf8,0x03,0x03,0x04,0x04,0x02,EOT}},
+		{0x6, "COM1",
+			{0x30,0x31,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x00,0x03,0xf8,0x04,0x03,0x04,0x04,0x02,EOT}},
+		{0x7, "GPIO",
+			{0x30,0x31,0x60,0x61,0x74,0x75,EOT},
+			{0x00,0x00,0x00,0x00,0x04,0x04,EOT}},
+		{0x8, "Power management",
+			{0x30,0x31,0x60,0x61,0x74,0x75,EOT},
+			{0x00,0x00,0x00,0x00,0x04,0x04,EOT}},
+		{EOT}}},
+	{0xdf, "PC97317", {
+		{NOLDN, NULL,
+			{0x20,0x21,0x22,0x23,0x24,0x25,0x27,EOT},
+			{0xdf,MISC,MISC,0x00,0x00,0x00,NANA,EOT}},
+		{0x0, "Keyboard",
+			{0x30,0x31,0x60,0x61,0x62,0x63,0x70,0x71,0x74,0x75,
+			 0xf0,EOT},
+			{MISC,0x00,0x00,0x60,0x00,0x64,0x01,0x02,0x04,0x04,
+			 0x40,EOT}},
+		{0x1, "Mouse",
+			{0x30,0x70,0x71,0x74,0x75,EOT},
+			{0x00,0x0c,0x02,0x04,0x04,EOT}},
+		{0x2, "Real-time clock (RTC), advanced power control (APC)",
+			{0x30,0x31,0x60,0x61,0x70,0x71,0x74,0x75,EOT},
+			{MISC,0x00,0x00,0x70,0x08,0x00,0x04,0x04,EOT}},
+		{0x3, "Floppy",
+			{0x30,0x31,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,0xf1,
+			 EOT},
+			{MISC,0x00,0x03,0xf2,0x06,0x03,0x02,0x04,0x20,0x00,
+			 EOT}},
+		{0x4, "Parallel port",
+			{0x30,0x31,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x00,0x02,0x78,0x07,0x00,0x04,0x04,0xf2,EOT}},
+		{0x5, "COM2 / IR",
+			{0x30,0x31,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x00,0x02,0xf8,0x03,0x03,0x04,0x04,0x02,EOT}},
+		{0x6, "COM1",
+			{0x30,0x31,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x00,0x03,0xf8,0x04,0x03,0x04,0x04,0x02,EOT}},
+		{0x7, "GPIO",
+			{0x30,0x31,0x60,0x61,0x74,0x75,EOT},
+			{0x00,0x00,0x00,0x00,0x04,0x04,EOT}},
+		{0x8, "Power management",
+			{0x30,0x31,0x60,0x61,0x74,0x75,EOT},
+			{0x00,0x00,0x00,0x00,0x04,0x04,EOT}},
+		{EOT}}},
+	{0xe0, "PC87309", {
+		{NOLDN, NULL,
+			{0x20,0x21,0x22,0x27,0x2e,EOT},
+			{0xe0,MISC,0x00,NANA,RSVD,EOT}},
+		{0x0, "Floppy",
+			{0x30,0x31,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,0xf1,
+			 EOT},
+			{MISC,0x00,0x03,0xf2,0x06,0x03,0x02,0x04,0x20,0x00,
+			 EOT}},
+		{0x1, "Parallel port",
+			{0x30,0x31,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x00,0x02,0x78,0x07,0x00,0x04,0x04,0xf2,EOT}},
+		{0x2, "COM2 / IR",
+			{0x30,0x31,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x00,0x02,0xf8,0x03,0x03,0x04,0x04,0x02,EOT}},
+		{0x3, "COM1",
+			{0x30,0x31,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x00,0x03,0xf8,0x04,0x03,0x04,0x04,0x02,EOT}},
+		{0x4, "Power management",
+			{0x30,0x31,0x60,0x61,0x74,0x75,EOT},
+			{0x00,0x00,0x00,0x00,0x04,0x04,EOT}},
+		{0x5, "Mouse",
+			{0x30,0x70,0x71,0x74,0x75,EOT},
+			{0x00,0x0c,0x02,0x04,0x04,EOT}},
+		{0x6, "Keyboard",
+			{0x30,0x31,0x60,0x61,0x62,0x63,0x70,0x71,0x74,0x75,
+			 0xf0,EOT},
+			{0x01,0x00,0x00,0x60,0x00,0x64,0x01,0x02,0x04,0x04,
+			 0x40,EOT}},
 		{EOT}}},
 	{0xe1, "PC87360", {
+		{NOLDN, NULL,
+			{0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x2a,
+			 0x2b,0x2c,0x2d,0x2e,EOT},
+			{0xe1,0x11,0x00,0x03,0x00,0x00,0x00,NANA,0x00,MISC,
+			 0x00,0x00,0x00,RSVD,EOT}},
+		{0x0, "Floppy",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,0xf1,EOT},
+			{0x00,0x03,0xf2,0x06,0x03,0x02,0x04,0x24,0x00,EOT}},
+		{0x1, "Parallel port",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x02,0x78,0x07,0x02,0x04,0x04,0xf2,EOT}},
+		{0x2, "COM2",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x02,0xf8,0x03,0x03,0x04,0x04,0x02,EOT}},
+		{0x3, "COM1",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x03,0xf8,0x04,0x03,0x04,0x04,0x02,EOT}},
+		{0x4, "System wake-up control (SWC)",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,EOT},
+			{0x00,0x00,0x00,0x00,0x03,0x04,0x04,EOT}},
+		{0x5, "Mouse",
+			{0x30,0x70,0x71,0x74,0x75,EOT},
+			{0x00,0x0c,0x02,0x04,0x04,EOT}},
+		{0x6, "Keyboard",
+			{0x30,0x60,0x61,0x62,0x63,0x70,0x71,0x74,0x75,0xf0,
+			 EOT},
+			{0x01,0x00,0x60,0x00,0x64,0x01,0x02,0x04,0x04,0x40,
+			 EOT}},
+		{0x7, "GPIO",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,0xf1,0xf2,
+			 EOT},
+			{0x00,0x00,0x00,0x00,0x03,0x04,0x04,0x00,0x00,0x00,
+			 EOT}},
+		{0x8, "ACCESS.bus (ACB)",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x00,0x00,0x00,0x03,0x04,0x04,0x00,EOT}},
+		{0x9, "Fan speed control and monitor (FSCM)",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x00,0x00,0x00,0x03,0x04,0x04,0x00,EOT}},
+		{0xa, "Watchdog timer",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x00,0x00,0x00,0x03,0x04,0x04,0x02,EOT}},
 		{EOT}}},
 	{0xe2, "PC87351", {
 		{NOLDN, NULL,
@@ -66,106 +242,421 @@ const static struct superio_registers reg_table[] = {
 			{0x00,0x00,0x00,0x00,0x00,0x04,0x04,0x00,EOT}},
 		{EOT}}},
 	{0xe4, "PC87364", {
+		{NOLDN, NULL,
+			{0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x2a,
+			 0x2b,0x2c,0x2d,0x2e,EOT},
+			{0xe4,0x11,0x00,0x03,0x00,0x00,0x00,NANA,0x00,MISC,
+			 0x00,0x00,NANA,RSVD,EOT}},
+		{0x0, "Floppy",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,0xf1,EOT},
+			{0x00,0x03,0xf2,0x06,0x03,0x02,0x04,0x24,0x00,EOT}},
+		{0x1, "Parallel port",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x02,0x78,0x07,0x02,0x04,0x04,0xf2,EOT}},
+		{0x2, "COM2",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x02,0xf8,0x03,0x03,0x04,0x04,0x02,EOT}},
+		{0x3, "COM1",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x03,0xf8,0x04,0x03,0x04,0x04,0x02,EOT}},
+		{0x4, "System wake-up control (SWC)",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,EOT},
+			{0x00,0x00,0x00,0x00,0x03,0x04,0x04,EOT}},
+		{0x5, "Mouse",
+			{0x30,0x70,0x71,0x74,0x75,EOT},
+			{0x00,0x0c,0x02,0x04,0x04,EOT}},
+		{0x6, "Keyboard",
+			{0x30,0x60,0x61,0x62,0x63,0x70,0x71,0x74,0x75,0xf0,
+			 EOT},
+			{0x01,0x00,0x60,0x00,0x64,0x01,0x02,0x04,0x04,0x40,
+			 EOT}},
+		{0x7, "GPIO",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,0xf1,0xf2,
+			 EOT},
+			{0x00,0x00,0x00,0x00,0x03,0x04,0x04,0x00,0x00,0x00,
+			 EOT}},
+		{0x8, "ACCESS.bus (ACB)",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x00,0x00,0x00,0x03,0x04,0x04,0x00,EOT}},
+		{0x9, "Fan speed control and monitor (FSCM)",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,0xf1,EOT},
+			{0x00,0x00,0x00,0x00,0x03,0x04,0x04,0x00,0x00,EOT}},
+		{0xa, "Watchdog timer",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x00,0x00,0x00,0x03,0x04,0x04,0x02,EOT}},
 		{EOT}}},
 	{0xe5, "PC87365", {	/* SRID[7..0] == chip revision */
 		{EOT}}},
 	{0xe8, "PC87363", {
 		{EOT}}},
 	{0xe9, "PC87366", {
+		{NOLDN, NULL,
+			{0x20,0x21,0x22,0x23,0x24,0x25,0x27,0x28,0x2a,0x2b,
+			 0x2c,0x2d,0x2e,EOT},
+			{0xe9,0x11,0x00,0x03,0x00,0x00,NANA,0x00,MISC,MISC,
+			 0x00,MISC,RSVD,EOT}},
+		{0x0, "Floppy",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,0xf1,EOT},
+			{0x00,0x03,0xf2,0x06,0x03,0x02,0x04,0x24,0x00,EOT}},
+		{0x1, "Parallel port",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x02,0x78,0x07,0x02,0x04,0x04,0xf2,EOT}},
+		{0x2, "COM2",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x02,0xf8,0x03,0x03,0x04,0x04,0x02,EOT}},
+		{0x3, "COM1",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x03,0xf8,0x04,0x03,0x04,0x04,0x02,EOT}},
+		{0x4, "System wake-up control (SWC)",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,EOT},
+			{0x00,0x00,0x00,0x00,0x03,0x04,0x04,EOT}},
+		{0x5, "Mouse",
+			{0x30,0x70,0x71,0x74,0x75,EOT},
+			{0x00,0x0c,0x02,0x04,0x04,EOT}},
+		{0x6, "Keyboard",
+			{0x30,0x60,0x61,0x62,0x63,0x70,0x71,0x74,0x75,0xf0,
+			 EOT},
+			{0x01,0x00,0x60,0x00,0x64,0x01,0x02,0x04,0x04,0x40,
+			 EOT}},
+		{0x7, "GPIO",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,0xf1,0xf2,
+			 EOT},
+			{0x00,0x00,0x00,0x00,0x03,0x04,0x04,0x00,0x00,0x00,
+			 EOT}},
+		{0x8, "ACCESS.bus (ACB)",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x00,0x00,0x00,0x03,0x04,0x04,0x00,EOT}},
+		{0x9, "Fan speed control and monitor (FSCM)",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,0xf1,0xf2,
+			 EOT},
+			{0x00,0x00,0x00,0x00,0x03,0x04,0x04,0x00,0x00,0x00,
+			 EOT}},
+		{0xa, "Watchdog timer (WDT)",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x00,0x00,0x00,0x03,0x04,0x04,0x02,EOT}},
+		{0xb, "Game port",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x02,0x00,0x00,0x03,0x04,0x04,0x00,EOT}},
+		{0xc, "MIDI port",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x03,0x30,0x00,0x03,0x04,0x04,0x00,EOT}},
+		{0xd, "Voltage level monitor (VLM)",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,EOT},
+			{0x00,0x00,0x00,0x00,0x03,0x04,0x04,EOT}},
+		{0xe, "Temperature sensor (TMS)",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,EOT},
+			{0x00,0x00,0x00,0x00,0x03,0x04,0x04,EOT}},
+		{EOT}}},
+	{0xf4, "PC87382", {
+		{NOLDN, NULL,
+			{0x20,0x21,0x22,0x26,0x27,0x29,EOT},
+			{0xf4,0x11,0x63,0x00,0x00,0x00,EOT}},
+		{0x02, "IR",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x02,0xf8,0x03,0x03,0x04,0x04,0x02,EOT}},
+		{0x03, "COM1",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x03,0xf8,0x04,0x03,0x04,0x04,0x02,EOT}},
+		{0x07, "GPIO",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,0xf1,
+			 0xf2,EOT},
+			{0x00,0x00,0x00,0x00,0x03,0x04,0x04,0x00,MISC,
+			 0x01,EOT}},
+		{0x19, "Docking LPC switch",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,EOT},
+			{0x00,0x00,0x00,0x00,0x00,0x04,0x04,EOT}},
 		{EOT}}},
-
 	/* SID[7..0]: family, SRID[7..5]: ID, SRID[4..0]: rev. */
 	{0xea, "PC8739x", {
+		{NOLDN, NULL,
+			{0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,
+			 0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,EOT},
+			{0xea,0x11,MISC,MISC,MISC,0x80,0x00,NANA,0x00,MISC,
+			 0x37,RSVD,RSVD,RSVD,RSVD,RSVD,EOT}},
+		{0x0, "Floppy",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,0xf1,EOT},
+			{0x00,0x03,0xf2,0x06,0x03,0x02,0x04,0x24,0x00,EOT}},
+		{0x1, "Parallel port",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x02,0x78,0x07,0x02,0x04,0x04,0xf2,EOT}},
+		{0x2, "COM2 / FIR",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x02,0xf8,0x03,0x03,0x04,0x04,0x02,EOT}},
+		{0x3, "COM1",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x03,0xf8,0x04,0x03,0x04,0x04,0x02,EOT}},
+		{0x7, "GPIO",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,0xf1,0xf2,
+			 EOT},
+			{0x00,0x00,0x00,0x00,0x03,0x04,0x04,0x00,0x44,0x01,
+			 EOT}},
+		{0xa, "Watchdog timer (WDT)",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x00,0x00,0x00,0x03,0x04,0x04,0x02,EOT}},
+		{0xb, "Game port",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x02,0x01,0x00,0x03,0x04,0x04,0x00,EOT}},
+		{0xc, "MIDI port",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x03,0x30,0x00,0x03,0x04,0x04,0x00,EOT}},
+		{0xf, "X-Bus",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,0xf1,0xf2,
+			 0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,EOT},
+			{0x00,0x00,0x00,0x00,0x00,0x04,0x04,0x00,0x00,0x00,
+			 0x00,0x00,0x00,0x00,0x00,0x00,0x00,EOT}},
 		{EOT}}},
 	{0xec, "PC87591x", {
 		/* SRID[7..5]: 000=PC87591E, 001=PC87591S, 100=PC87591L */
 		{EOT}}},
 	{0xee, "PC8741x", {
 		/* SRID[7..5] is marked as "not applicable for the PC8741x". */
+		{NOLDN, NULL,
+			{0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,
+			 0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,EOT},
+			{0xee,0x11,0x20,MISC,MISC,MISC,0x00,NANA,0x00,MISC,
+			 0x00,RSVD,RSVD,RSVD,RSVD,RSVD,EOT}},
+		{0x0, "Floppy",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,0xf1,EOT},
+			{0x00,0x03,0xf2,0x06,0x03,0x02,0x04,0x24,0x00,EOT}},
+		{0x1, "Parallel port",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x02,0x78,0x07,0x02,0x04,0x04,0xf2,EOT}},
+		{0x2, "COM2",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x02,0xf8,0x03,0x03,0x04,0x04,0x02,EOT}},
+		{0x3, "COM1",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x03,0xf8,0x04,0x03,0x04,0x04,0x02,EOT}},
+		{0x4, "System wake-up control (SWC)",
+			{0x30,0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x70,
+			 0x71,0x74,0x75,EOT},
+			{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+			 0x03,0x04,0x04,EOT}},
+		{0x5, "Mouse",
+			{0x30,0x70,0x71,0x74,0x75,EOT},
+			{0x00,0x0c,0x02,0x04,0x04,EOT}},
+		{0x6, "Keyboard",
+			{0x30,0x60,0x61,0x62,0x63,0x70,0x71,0x74,0x75,0xf0,
+			 EOT},
+			{0x00,0x00,0x60,0x00,0x64,0x01,0x02,0x04,0x04,0x40,
+			 EOT}},
+		{0x7, "GPIO",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,0xf1,0xf2,
+			 0xf3,EOT},
+			{0x00,0x00,0x00,0x00,0x03,0x04,0x04,0x00,MISC,0x01,
+			 0x00,EOT}},
+		{0xf, "X-Bus",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,0xf1,0xf2,
+			 0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,0xfc,
+			 EOT},
+			{0x00,0x00,0x00,0x00,0x00,0x04,0x04,0x00,0x00,0x00,
+			 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+			 EOT}},
+		{0x10, "Real-time clock (RTC)",
+			{0x30,0x60,0x61,0x62,0x63,0x70,0x71,0x74,0x75,0xf0,
+			 0xf1,0xf2,0xf3,EOT},
+			{0x00,0x00,0x70,0x00,0x72,0x08,0x00,0x04,0x04,0x00,
+			 0x00,0x00,0x00,EOT}},
 		{EOT}}},
 	{0xf0, "PC87372", {
 		{EOT}}},
-	{0xf1, "PC8374L", {
+	{0x0f1, "PC8374L", {
+		{NOLDN, NULL,
+			{0x10,0x12,0x13,0x20,0x21,0x22,0x23,0x24,0x25,0x26,
+			 0x27,0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,EOT},
+			{0x00,0x00,0x00,0xf1,0x11,0x00,0x00,0x00,RSVD,0x00,
+			 MISC,RSVD,0x01,0x2e,RSVD,RSVD,RSVD,RSVD,RSVD,EOT}},
+		{0x0, "Floppy",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,0xf1,0xf8,
+			 EOT},
+			{0x00,0x03,0xf2,0x06,0x03,0x02,0x04,0x24,0x00,0x24,
+			 EOT}},
+		{0x1, "Parallel port",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,0xf8,EOT},
+			{0x00,0x02,0x78,0x07,0x02,0x04,0x04,0xf2,0x07,EOT}},
+		{0x2, "COM2 / IR",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x02,0xf8,0x03,0x03,0x04,0x04,0x02,EOT}},
+		{0x3, "COM1",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x03,0xf8,0x04,0x03,0x04,0x04,0x02,EOT}},
+		{0x4, "System wake-up control (SWC)",
+			{0x30,0x50,0x60,0x61,0x62,0x63,0x70,0x71,0x74,0x75,
+			 EOT},
+			{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x04,0x04,
+			 EOT}},
+		{0x5, "Mouse",
+			{0x30,0x70,0x71,0x74,0x75,EOT},
+			{0x00,0x0c,0x02,0x04,0x04,EOT}},
+		{0x6, "Keyboard",
+			{0x30,0x60,0x61,0x62,0x63,0x70,0x71,0x74,0x75,0xf0,
+			 EOT},
+			{0x00,0x00,0x60,0x00,0x64,0x01,0x02,0x04,0x04,0x40,
+			 EOT}},
+		{0x7, "GPIO",
+			{0x30,0x50,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,0xf1,
+			 0xf2,0xf3,0xf8,EOT},
+			{0x00,0x00,0x00,0x00,0x00,0x03,0x04,0x04,0x00,MISC,
+			 0x00,MISC,0x01,EOT}},
+		{0x8, "Health management",
+			{0x30,0x50,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x00,0x00,0x00,0x00,0x03,0x04,0x04,0x05,EOT}},
+		{EOT}}},
+	{0x8f1, "WPCD376I", {
+		{NOLDN, NULL,
+			{0x10,0x12,0x13,0x20,0x21,0x22,0x23,0x24,0x25,0x26,
+			 0x27,0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,EOT},
+			{0x00,0x00,0x00,0xf1,0x11,0x00,0x00,0x00,RSVD,0x00,
+			 MISC,RSVD,0x01,0x2e,RSVD,RSVD,RSVD,RSVD,RSVD,EOT}},
+		{0x0, "Floppy",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,0xf1,0xf8,
+			 EOT},
+			{0x00,0x03,0xf2,0x06,0x03,0x02,0x04,0x24,0x00,0x24,
+			 EOT}},
+		{0x1, "Parallel port",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,0xf8,EOT},
+			{0x00,0x02,0x78,0x07,0x02,0x04,0x04,0xf2,0x07,EOT}},
+		{0x2, "IR",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x02,0xf8,0x03,0x03,0x04,0x04,0x02,EOT}},
+		{0x3, "COM1",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x03,0xf8,0x04,0x03,0x04,0x04,0x02,EOT}},
+		{0x4, "System wake-up control (SWC)",
+			{0x30,0x50,0x60,0x61,0x62,0x63,0x70,0x71,0x74,0x75,
+			 EOT},
+			{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x04,0x04,
+			 EOT}},
+		{0x5, "Mouse",
+			{0x30,0x70,0x71,0x74,0x75,EOT},
+			{0x00,0x0c,0x02,0x04,0x04,EOT}},
+		{0x6, "Keyboard",
+			{0x30,0x60,0x61,0x62,0x63,0x70,0x71,0x74,0x75,0xf0,
+			 EOT},
+			{0x00,0x00,0x60,0x00,0x64,0x01,0x02,0x04,0x04,0x40,
+			 EOT}},
+		{0x7, "GPIO",
+			{0x30,0x50,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,0xf1,
+			 0xf2,0xf3,0xf8,EOT},
+			{0x00,0x00,0x00,0x00,0x00,0x03,0x04,0x04,0x00,MISC,
+			 0x00,MISC,0x01,EOT}},
 		{EOT}}},
 	{0xf2, "PC87427", {
 		/* SRID[7..5] is marked as "not applicable for the PC87427". */
+		{NOLDN, NULL,
+			{0x10,0x12,0x13,0x1d,0x20,0x21,0x22,0x23,0x24,0x25,
+			 0x26,0x27,0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,
+			 EOT},
+			{0x00,0x00,0x00,0x00,0xf2,0x11,0xa0,MISC,MISC,MISC,
+			 0x02,NANA,0x00,MISC,0x00,0x00,MISC,MISC,RSVD,RSVD,
+			 EOT}},
+		{0x0, "Floppy",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,0xf1,EOT},
+			{0x00,0x03,0xf2,0x06,0x03,0x02,0x04,0x24,0x00,EOT}},
+		{0x2, "COM2",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x02,0xf8,0x03,0x03,0x04,0x04,0x02,EOT}},
+		{0x3, "COM1",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x03,0xf8,0x04,0x03,0x04,0x04,0x02,EOT}},
+		{0x4, "System wake-up control (SWC)",
+			{0x30,0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x70,
+			 0x71,0x74,0x75,EOT},
+			{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+			 0x03,0x04,0x04,EOT}},
+		{0x5, "Mouse",
+			{0x30,0x70,0x71,0x74,0x75,EOT},
+			{0x00,0x0c,0x02,0x04,0x04,EOT}},
+		{0x6, "Keyboard",
+			{0x30,0x60,0x61,0x62,0x63,0x70,0x71,0x74,0x75,0xf0,
+			 EOT},
+			{0x00,0x00,0x60,0x00,0x64,0x01,0x02,0x04,0x04,0x40,
+			 EOT}},
+		{0x7, "GPIO",
+			{0x30,0x50,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,0xf1,
+			 0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,EOT},
+			{0x00,0x00,0x00,0x00,0x00,0x03,0x04,0x04,0x00,MISC,
+			 0x01,0x00,0x00,0x00,0x00,0x00,0x00,EOT}},
+		{0x9, "Fan Monitor and Control (FMC)",
+			{0x30,0x50,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,0xf1,
+			 EOT},
+			{0x00,0x00,0x00,0x00,0x00,0x03,0x04,0x04,0x19,0x06,
+			 EOT}},
+		{0xa, "Watchdog timer (WDT)",
+			{0x30,0x50,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,EOT},
+			{0x00,0x00,0x00,0x00,0x00,0x03,0x04,0x04,0x00,EOT}},
+		{0xf, "X-Bus",
+			{0x30,0x60,0x61,0x70,0x71,0x74,0x75,0xf0,0xf1,0xf2,
+			 0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,0xfc,
+			 0xfd,0xfe,0xff,EOT},
+			{0x00,0x00,0x00,0x00,0x00,0x04,0x04,0x00,0x00,0x00,
+			 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+			 0x00,0x80,0x10,EOT}},
+		{0x10, "Real-time clock (RTC)",
+			{0x30,0x60,0x61,0x62,0x63,0x70,0x71,0x74,0x75,0xf0,
+			 0xf1,0xf2,0xf3,0xf6,0xf7,EOT},
+			{0x00,0x00,0x70,0x00,0x72,0x08,0x00,0x04,0x04,0x00,
+			 0x00,0x00,0x00,MISC,0x00,EOT}},
+		{0x14, "Health monitoring and control (HMC)",
+			{0x30,0x50,0x60,0x61,0x62,0x63,0x70,0x71,0x74,0x75,
+			 0xf0,EOT},
+			{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x04,0x04,
+			 0x05,EOT}},
 		{EOT}}},
 	{0xf3, "PC87373", {
 		{EOT}}},
 	{EOT}
 };
 
-static void dump_readable_pc8374l(uint16_t port)
-{
-	if (!dump_readable)
-		return;
-
-	printf("Human-readable register dump:\n");
-
-	printf("Enables: 21=%02x, 22=%02x, 23=%02x, 24=%02x, 26=%02x\n",
-	       regval(port, 0x21), regval(port, 0x22), regval(port, 0x23),
-	       regval(port, 0x24), regval(port, 0x26));
-	printf("SMBUS at %02x\n", regval(port, 0x2a));
-
-	/* Check COM1. This is all we care about at present. */
-	printf("COM 1 is globally %s\n",
-	       regval(port, 0x26) & 8 ? "disabled" : "enabled");
-
-	/* Select COM1. */
-	regwrite(port, 0x07, 0x03);
-	printf("COM 1 is locally %s\n",
-	       regval(port, 0x30) & 1 ? "enabled" : "disabled");
-	printf
-	    ("COM1 60=%02x, 61=%02x, 70=%02x, 71=%02x, 74=%02x, 75=%02x, f0=%02x\n",
-	     regval(port, 0x60), regval(port, 0x61), regval(port, 0x70),
-	     regval(port, 0x71), regval(port, 0x74), regval(port, 0x75),
-	     regval(port, 0xf0));
-
-	/* Select GPIO. */
-	regwrite(port, 0x07, 0x07);
-	printf("GPIO is %s\n", regval(port, 0x30) & 1 ? "enabled" : "disabled");
-	printf
-	    ("GPIO 60=%02x, 61=%02x, 70=%02x, 71=%02x, 74=%02x, 75=%02x, f0=%02x\n",
-	     regval(port, 0x60), regval(port, 0x61), regval(port, 0x70),
-	     regval(port, 0x71), regval(port, 0x74), regval(port, 0x75),
-	     regval(port, 0xf0));
-}
-
 void probe_idregs_nsc(uint16_t port)
 {
 	uint8_t id, rev;
+	uint16_t magic;
 
 	probing_for("NSC", "", port);
 
-	outb(CHIP_ID_REG, port);
-	if (inb(port) != CHIP_ID_REG) {
+	OUTB(CHIP_ID_REG, port);
+	if (INB(port) != CHIP_ID_REG) {
 		if (verbose)
 			printf(NOTFOUND "port=0x%02x, port+1=0x%02x\n",
-			       inb(port), inb(port + 1));
+			       INB(port), INB(port + 1));
 		return;
 	}
-	id = inb(port + 1);
+	id = INB(port + 1);
 
-	outb(CHIP_REV_REG, port);
-	if (inb(port) != CHIP_REV_REG) {
+	OUTB(CHIP_REV_REG, port);
+	if (INB(port) != CHIP_REV_REG) {
 		printf("Warning: Can't get chip revision. Setting to 0xff.\n");
 		rev = 0xff;
 	} else {
-		rev = inb(port + 1);
+		rev = INB(port + 1);
 	}
 
-	if (superio_unknown(reg_table, id)) {
+	/*
+	 * NSC PC8374L has ID 0xf1, rev 0b000xxxxx according to datasheet.
+	 * Winbond WPCD376I has ID 0xf1, rev 0b100xxxxx according to datasheet.
+	 */
+	if (id == 0xf1)
+		magic = ((rev & 0xe0) << 4) | id;
+	else
+		magic = id;
+
+	if (superio_unknown(reg_table, magic)) {
 		if (verbose)
 			printf(NOTFOUND "sid=0x%02x, srid=0x%02x\n", id, rev);
 		return;
 	}
 
-	printf("Found NSC %s (sid=0x%02x, srid=0x%02x) at 0x%x\n",
-	       get_superio_name(reg_table, id), id, rev, port);
+	printf("Found %s %s (sid=0x%02x, srid=0x%02x) at 0x%x\n",
+	       magic == 0x8f1 ? "Winbond" : "NSC",
+	       get_superio_name(reg_table, magic), id, rev, port);
 	chip_found = 1;
 
-	dump_superio("NSC", reg_table, port, id);
-	if (id == 0xf1)
-		dump_readable_pc8374l(port);
+	dump_superio(magic == 0x8f1 ? "Winbond" : "NSC",
+		     reg_table, port, magic, LDN_SEL);
 }
 
+void print_nsc_chips(void)
+{
+	print_vendor_chips("NSC", reg_table);
+}