Set asus/a8v-3_se to use printk in CAR. (trivial)

[coreboot.git] / util / superiotool / superiotool.c

diff --git a/util/superiotool/superiotool.c b/util/superiotool/superiotool.c
index d96396f24ae37765d015f3bf7dd3fc26771097b0..1bbe5feec7a815f1d63a62f05b2ba23e259dd093 100644 (file)
--- a/util/superiotool/superiotool.c
+++ b/util/superiotool/superiotool.c
@@ -23,33 +23,38 @@
 
 #include "superiotool.h"
 
+#if defined(__FreeBSD__)
+#include <fcntl.h>
+#include <unistd.h>
+#endif
+
 /* Command line options. */
-int dump = 0, verbose = 0;
+int dump = 0, verbose = 0, extra_dump = 0;
 
 /* Global flag which indicates whether a chip was detected at all. */
 int chip_found = 0;
 
 uint8_t regval(uint16_t port, uint8_t reg)
 {
-       outb(reg, port);
-       return inb(port + 1);
+       OUTB(reg, port);
+       return INB(port + ((port == 0x3bd) ? 2 : 1)); /* 0x3bd is special. */
 }
 
 void regwrite(uint16_t port, uint8_t reg, uint8_t val)
 {
-       outb(reg, port);
-       outb(val, port + 1);
+       OUTB(reg, port);
+       OUTB(val, port + 1);
 }
 
 void enter_conf_mode_winbond_fintek_ite_8787(uint16_t port)
 {
-       outb(0x87, port);
-       outb(0x87, port);
+       OUTB(0x87, port);
+       OUTB(0x87, port);
 }
 
 void exit_conf_mode_winbond_fintek_ite_8787(uint16_t port)
 {
-       outb(0xaa, port);               /* Fintek, Winbond */
+       OUTB(0xaa, port);               /* Fintek, Winbond */
        regwrite(port, 0x02, 0x02);     /* ITE */
 }
 
@@ -80,7 +85,7 @@ static void dump_regs(const struct superio_registers reg_table[],
                      int i, int j, uint16_t port)
 {
        int k;
-       const int *idx;
+       const int16_t *idx;
 
        if (reg_table[i].ldn[j].ldn != NOLDN) {
                printf("LDN 0x%02x", reg_table[i].ldn[j].ldn);
@@ -158,8 +163,7 @@ void probing_for(const char *vendor, const char *info, uint16_t port)
                return;
 
        /* Yes, there's no space between '%s' and 'at'! */
-       printf("Probing for %s Super I/O %sat 0x%x...\n",
-              vendor, info, port);
+       printf("Probing for %s Super I/O %sat 0x%x...\n", vendor, info, port);
 }
 
 /** Print a list of all supported chips from the given vendor. */
@@ -205,9 +209,13 @@ static void print_version(void)
 int main(int argc, char *argv[])
 {
        int i, j, opt, option_index;
+#if defined(__FreeBSD__)
+       int io_fd;
+#endif
 
        static const struct option long_options[] = {
                {"dump",                no_argument, NULL, 'd'},
+               {"extra-dump",          no_argument, NULL, 'e'},
                {"list-supported",      no_argument, NULL, 'l'},
                {"verbose",             no_argument, NULL, 'V'},
                {"version",             no_argument, NULL, 'v'},
@@ -215,12 +223,15 @@ int main(int argc, char *argv[])
                {0, 0, 0, 0}
        };
 
-       while ((opt = getopt_long(argc, argv, "dlVvh",
+       while ((opt = getopt_long(argc, argv, "delVvh",
                                  long_options, &option_index)) != EOF) {
                switch (opt) {
                case 'd':
                        dump = 1;
                        break;
+               case 'e':
+                       extra_dump = 1;
+                       break;
                case 'l':
                        print_list_of_supported_chips();
                        exit(0);
@@ -234,6 +245,7 @@ int main(int argc, char *argv[])
                        break;
                case 'h':
                        printf(USAGE);
+                       printf(USAGE_INFO);
                        exit(0);
                        break;
                default:
@@ -243,8 +255,13 @@ int main(int argc, char *argv[])
                }
        }
 
+#if defined(__FreeBSD__)
+       if ((io_fd = open("/dev/io", O_RDWR)) < 0) {
+               perror("/dev/io");
+#else
        if (iopl(3) < 0) {
                perror("iopl");
+#endif
                printf("Superiotool must be run as root.\n");
                exit(1);
        }
@@ -260,5 +277,8 @@ int main(int argc, char *argv[])
        if (!chip_found)
                printf("No Super I/O found\n");
 
+#if defined(__FreeBSD__)
+       close(io_fd);
+#endif
        return 0;
 }