Various coding style and whitespace fixes (trivial).

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@2761 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Uwe Hermann 2007-09-01 21:02:44 +00:00
parent c4c54a5df3
commit 2046ff92f0
1 changed files with 191 additions and 194 deletions

View File

@ -25,50 +25,55 @@
#include <stdlib.h>
#include <sys/io.h>
/* well, they really thought this through, eh? Family is 8 bits!!!! */
char *familyid[] = {
[0xf1] = "pc8374 (winbond, was NS)"
/* Well, they really thought this through, eh? Family is 8 bits! */
static const char *familyid[] = {
[0xf1] = "PC8374 (Winbond/NatSemi)"
};
/* eventually, if you care, break this out into a file. For now, I don't know
* if we need this.
*/
unsigned char regval(unsigned short port, unsigned char reg) {
unsigned char regval(unsigned short port, unsigned char reg)
{
outb(reg, port);
return inb(port + 1);
}
void regwrite(unsigned short port, unsigned char reg, unsigned char val) {
void regwrite(unsigned short port, unsigned char reg, unsigned char val)
{
outb(reg, port);
outb(val, port + 1);
}
void
dump_ns8374(unsigned short port) {
void dump_ns8374(unsigned short port)
{
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 */
/* 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 */
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));
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
dump_fintek(unsigned short port, unsigned int did)
void dump_fintek(unsigned short port, unsigned int did)
{
switch (did) {
case 0x0604:
@ -82,74 +87,74 @@ dump_fintek(unsigned short port, unsigned int did)
return;
}
printf("Flash write is %s.\n", regval(port, 0x28) & 0x80 ? "enabled" : "disabled");
printf("Flash write is %s.\n",
regval(port, 0x28) & 0x80 ? "enabled" : "disabled");
printf("Flash control is 0x%04x.\n", regval(port, 0x28));
printf("27=%02x\n", regval(port, 0x27));
printf("29=%02x\n", regval(port, 0x29));
printf("2a=%02x\n", regval(port, 0x2a));
printf("2b=%02x\n", regval(port, 0x2b));
/* select UART 1 */
/* Select UART 1. */
regwrite(port, 0x07, 0x01);
printf("UART1 is %s\n", regval(port, 0x30) & 1 ? "enabled" : "disabled");
printf("UART1 base=%02x%02x, irq=%02x, mode=%s\n",
regval(port, 0x60), regval(port, 0x61), regval(port, 0x70) & 0x0f,
printf("UART1 is %s\n",
regval(port, 0x30) & 1 ? "enabled" : "disabled");
printf("UART1 base=%02x%02x, irq=%02x, mode=%s\n", regval(port, 0x60),
regval(port, 0x61), regval(port, 0x70) & 0x0f,
regval(port, 0xf0) & 0x10 ? "RS485" : "RS232");
/* select UART 2 */
/* Select UART 2. */
regwrite(port, 0x07, 0x02);
printf("UART2 is %s\n", regval(port, 0x30) & 1 ? "enabled" : "disabled");
printf("UART2 base=%02x%02x, irq=%02x, mode=%s\n",
regval(port, 0x60), regval(port, 0x61), regval(port, 0x70) & 0x0f,
printf("UART2 is %s\n",
regval(port, 0x30) & 1 ? "enabled" : "disabled");
printf("UART2 base=%02x%02x, irq=%02x, mode=%s\n", regval(port, 0x60),
regval(port, 0x61), regval(port, 0x70) & 0x0f,
regval(port, 0xf0) & 0x10 ? "RS485" : "RS232");
/* select Parport */
/* Select parallel port. */
regwrite(port, 0x07, 0x03);
printf("PARPORT is %s\n", regval(port, 0x30) & 1 ? "enabled" : "disabled");
printf("PARPORT base=%02x%02x, irq=%02x\n",
regval(port, 0x60), regval(port, 0x61), regval(port, 0x70) & 0x0f);
printf("PARPORT is %s\n",
regval(port, 0x30) & 1 ? "enabled" : "disabled");
printf("PARPORT base=%02x%02x, irq=%02x\n", regval(port, 0x60),
regval(port, 0x61), regval(port, 0x70) & 0x0f);
/* select hw monitor */
/* Select HW monitor. */
regwrite(port, 0x07, 0x04);
printf("HW monitor is %s\n", regval(port, 0x30) & 1 ? "enabled" : "disabled");
printf("HW monitor base=%02x%02x, irq=%02x\n",
regval(port, 0x60), regval(port, 0x61), regval(port, 0x70) & 0x0f);
printf("HW monitor is %s\n",
regval(port, 0x30) & 1 ? "enabled" : "disabled");
printf("HW monitor base=%02x%02x, irq=%02x\n", regval(port, 0x60),
regval(port, 0x61), regval(port, 0x70) & 0x0f);
/* select gpio */
/* Select GPIO. */
regwrite(port, 0x07, 0x05);
printf("GPIO is %s\n", regval(port, 0x30) & 1 ? "enabled" : "disabled");
printf("GPIO 70=%02x, e0=%02x, e1=%02x, e2=%02x, e3=%02x, e4=%02x, e5=%02x\n",
regval(port, 0x70), regval(port, 0xe0), regval(port, 0xe1), regval(port, 0xe2),
regval(port, 0xe3), regval(port, 0xe4), regval(port, 0xe5));
printf("GPIO e6=%02x, e7=%02x, e8=%02x, e9=%02x, f0=%02x, f1=%02x, f3=%02x, f4=%02x\n",
regval(port, 0xe6), regval(port, 0xe7), regval(port, 0xe8), regval(port, 0xe9),
regval(port, 0xf0), regval(port, 0xf1), regval(port, 0xf3), regval(port, 0xf4));
printf("GPIO f5=%02x, f6=%02x, f7=%02x, f8=%02x\n",
regval(port, 0xf5), regval(port, 0xf6), regval(port, 0xf7), regval(port, 0xf8));
printf
("GPIO 70=%02x, e0=%02x, e1=%02x, e2=%02x, e3=%02x, e4=%02x, e5=%02x\n",
regval(port, 0x70), regval(port, 0xe0), regval(port, 0xe1),
regval(port, 0xe2), regval(port, 0xe3), regval(port, 0xe4),
regval(port, 0xe5));
printf
("GPIO e6=%02x, e7=%02x, e8=%02x, e9=%02x, f0=%02x, f1=%02x, f3=%02x, f4=%02x\n",
regval(port, 0xe6), regval(port, 0xe7), regval(port, 0xe8),
regval(port, 0xe9), regval(port, 0xf0), regval(port, 0xf1),
regval(port, 0xf3), regval(port, 0xf4));
printf("GPIO f5=%02x, f6=%02x, f7=%02x, f8=%02x\n", regval(port, 0xf5),
regval(port, 0xf6), regval(port, 0xf7), regval(port, 0xf8));
}
/* End Of Table */
#define EOT -1
/* NO LDN needed */
#define NOLDN -2
/* Not Available */
#define NANA -3
/* Maximum Name Length */
#define MAXNAMELEN 20
/* Biggest LDN */
#define MAXLDN 0xa
/* biggestLDN + 0 + NOLDN + EOT */
#define LDNSIZE MAXLDN + 3
/* MAXimum NUMber of Indexes */
#define MAXNUMIDX 70
#define IDXSIZE MAXNUMIDX + 1
#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 */
/* Yes, superio_id should be unsigned, but EOT has to be negative. */
signed short superio_id;
char name[MAXNAMELEN];
const char name[MAXNAMELEN];
struct ite_ldnidx {
signed short ldn;
signed short idx[IDXSIZE];
@ -321,14 +326,12 @@ const static struct ite_registers {
{EOT}
};
void
dump_ite(unsigned short port, unsigned short id)
void dump_ite(unsigned short port, unsigned short id)
{
int i, j, k;
signed short *idx;
printf ("ITE ");
/* ID Mapping Table
unknown -> IT8711 (no datasheet)
unknown -> IT8722 (no datasheet)
@ -359,7 +362,7 @@ dump_ite(unsigned short port, unsigned short id)
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",
printf("Switching to LDN 0x%01x\n",
ite_reg_table[i].ldn[j].ldn);
regwrite(port, 0x07,
ite_reg_table[i].ldn[j].ldn);
@ -389,27 +392,25 @@ dump_ite(unsigned short port, unsigned short id)
}
printf("\n");
}
}
break;
default:
printf ("unknown ITE chip, id=%04x\n", id);
printf("Unknown ITE chip, id=%04x\n", id);
for (i = 0x20; i <= 0x24; i++)
printf("index %02x=%02x\n", i, regval(port, i));
break;
}
}
void
probe_idregs_simple(unsigned short port){
void probe_idregs_simple(unsigned short port)
{
unsigned char id;
outb(0x20, port);
if (inb(port) != 0x20) {
if (inb(port) == 0xff)
printf("No SuperI/O chip found at 0x%04x\n", port);
else
printf("probing 0x%04x, failed (0x%02x), data returns 0x%02x\n",
port, inb(port), inb(port + 1));
printf("probing 0x%04x, failed (0x%02x), data returns 0x%02x\n", port, inb(port), inb(port + 1));
return;
}
id = inb(port + 1);
@ -433,13 +434,13 @@ probe_idregs_simple(unsigned short port){
}
}
void
probe_idregs_fintek(unsigned short port){
void probe_idregs_fintek(unsigned short port)
{
unsigned int vid, did, success = 0;
/* Enable configuration sequence (Fintek uses this for example)
Older ITE chips have the same enable sequence */
* Older ITE chips have the same enable sequence.
*/
outb(0x87, port);
outb(0x87, port);
@ -448,34 +449,33 @@ probe_idregs_fintek(unsigned short port){
if (inb(port) == 0xff)
printf("No SuperIO chip found at 0x%04x\n", port);
else
printf("probing 0x%04x, failed (0x%02x), data returns 0x%02x\n",
port, inb(port), inb(port + 1));
printf("probing 0x%04x, failed (0x%02x), data returns 0x%02x\n", port, inb(port), inb(port + 1));
return;
}
did = inb(port + 1);
did |= (regval(port, 0x21) << 8);
vid = regval(port, 0x23);
vid |= (regval(port, 0x24) << 8);
printf("SuperIO found at 0x%02x: vid=0x%04x/did=0x%04x\n", port, vid, did);
printf("Super I/O found at 0x%02x: vid=0x%04x/did=0x%04x\n",
port, vid, did);
if (vid == 0xff || vid == 0xffff)
return;
/* printf("%s\n", familyid[id]); */
switch (did) {
case 0x0887: /* pseudoreversed for ITE8708 */
case 0x1087: /* pseudoreversed for ITE8710 */
case 0x0887: /* Pseudoreversed for ITE8708 */
case 0x1087: /* Pseudoreversed for ITE8710 */
success = 1;
dump_ite(port, ((did & 0xff) << 8) | ((did & 0xff00) >> 8));
/* disable configuration */
regwrite(port, 0x02, 0x02);
regwrite(port, 0x02, 0x02); /* Exit MB PnP mode. */
break;
default:
break;
}
switch (vid) {
case 0x3419:
success = 1;
@ -484,24 +484,26 @@ probe_idregs_fintek(unsigned short port){
default:
break;
}
if (!success)
printf("no dump for vid 0x%04x, did 0x%04x\n", vid, did);
/* disable configuration (for Fintek, doesn't hurt ITE) */
if (!success)
printf("No dump for vid 0x%04x, did 0x%04x\n", vid, did);
/* Exit MB PnP mode (for Fintek, doesn't hurt ITE). */
outb(0xaa, port);
}
void
probe_idregs_ite(unsigned short port){
void probe_idregs_ite(unsigned short port)
{
unsigned int id, chipver;
/* Enable configuration sequence (ITE uses this for newer IT87[012]x)
IT871[01] uses 0x87, 0x87 -> fintek detection should handle it
IT8708 uses 0x87, 0x87 -> fintek detection should handle it
IT8761 uses 0x87, 0x61, 0x55, 0x55/0xaa
IT86xx series uses different ports
IT8661 uses 0x86, 0x61, 0x55/0xaa, 0x55/0xaa and 32 more writes
IT8673 uses 0x86, 0x80, 0x55/0xaa, 0x55/0xaa and 32 more writes */
* IT871[01] uses 0x87, 0x87 -> fintek detection should handle it
* IT8708 uses 0x87, 0x87 -> fintek detection should handle it
* IT8761 uses 0x87, 0x61, 0x55, 0x55/0xaa
* IT86xx series uses different ports
* IT8661 uses 0x86, 0x61, 0x55/0xaa, 0x55/0xaa and 32 more writes
* IT8673 uses 0x86, 0x80, 0x55/0xaa, 0x55/0xaa and 32 more writes
*/
outb(0x87, port);
outb(0x01, port);
outb(0x55, port);
@ -510,36 +512,35 @@ probe_idregs_ite(unsigned short port){
else
outb(0xAA, port);
/* Read Chip ID Byte 1 */
/* Read Chip ID Byte 1. */
id = regval(port, 0x20);
if (id != 0x87) {
if (inb(port) == 0xff)
printf ("No SuperIO chip found at 0x%04x\n", port);
printf("No Super-I/O chip found at 0x%04x\n", port);
else
printf("probing 0x%04x, failed (0x%02x), data returns 0x%02x\n",
port, inb(port), inb(port + 1));
printf("probing 0x%04x, failed (0x%02x), data returns 0x%02x\n", port, inb(port), inb(port + 1));
return;
}
id <<= 8;
/* Read Chip ID Byte 2 */
/* Read Chip ID Byte 2. */
id |= regval(port, 0x21);
/* Read Chip Version, only bit 3..0 for all IT87xx */
/* Read chip version, only bits 3..0 for all IT87xx. */
chipver = regval(port, 0x22) & 0x0f;
/* ID Mapping Table
unknown -> IT8711 (no datasheet)
unknown -> IT8722 (no datasheet)
0x8702 -> IT8702
0x8705 -> IT8700 or IT8705
0x8708 -> IT8708
0x8710 -> IT8710
0x8712 -> IT8712
0x8716 -> IT8716
0x8718 -> IT8718
0x8726 -> IT8726 (datasheet wrongly says 0x8716)
* unknown -> IT8711 (no datasheet)
* unknown -> IT8722 (no datasheet)
* 0x8702 -> IT8702
* 0x8705 -> IT8700 or IT8705
* 0x8708 -> IT8708
* 0x8710 -> IT8710
* 0x8712 -> IT8712
* 0x8716 -> IT8716
* 0x8718 -> IT8718
* 0x8726 -> IT8726 (datasheet wrongly says 0x8716)
*/
printf("Super I/O found at 0x%02x: id=0x%04x, chipver=0x%01x\n",
port, id, chipver);
@ -555,32 +556,28 @@ probe_idregs_ite(unsigned short port){
dump_ite(port, id);
break;
default:
printf("no dump for id 0x%04x\n", id);
printf("No dump for id 0x%04x\n", id);
break;
}
/* disable configuration */
regwrite(port, 0x02, 0x02);
regwrite(port, 0x02, 0x02); /* Exit MB PnP mode. */
}
void
probe_superio(unsigned short port) {
void probe_superio(unsigned short port)
{
probe_idregs_simple(port);
probe_idregs_fintek(port);
probe_idregs_ite(port);
}
int
main(int argc, char *argv[])
int main(int argc, char *argv[])
{
if (iopl(3) < 0) {
perror("iopl");
exit(1);
}
/* try the 2e */
probe_superio(0x2e);
/* now try the 4e */
probe_superio(0x4e);
probe_superio(0x2e); /* Try 0x2e. */
probe_superio(0x4e); /* Try 0x4e. */
return 0;
}