correctly mark code segments as code in SELF

[coreboot.git] / util / inteltool / rootcmplx.c

diff --git a/util/inteltool/rootcmplx.c b/util/inteltool/rootcmplx.c
index 7e2b665ce6ad49935c5a57fb17bb75fb37a1ecf1..a47873114b5d954c463e29849a9ca7f57fabd904 100644 (file)
--- a/util/inteltool/rootcmplx.c
+++ b/util/inteltool/rootcmplx.c
@@ -1,9 +1,9 @@
 /*
  * inteltool - dump all registers on an Intel CPU + chipset based system.
  *
- * Copyright (C) 2008 by coresystems GmbH 
- *  written by Stefan Reinauer <stepan@coresystems.de> 
- * 
+ * Copyright (C) 2008 by coresystems GmbH
+ *  written by Stefan Reinauer <stepan@coresystems.de>
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; version 2 of the License.
@@ -18,18 +18,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
-#include <stdint.h>
-#include <getopt.h>
-#include <sys/mman.h>
-#include <sys/io.h>
-#include <pci/pci.h>
-
 #include "inteltool.h"
 
 int print_rcba(struct pci_dev *sb)
@@ -41,16 +31,30 @@ int print_rcba(struct pci_dev *sb)
        printf("\n============= RCBA ==============\n\n");
 
        switch (sb->device_id) {
+       case PCI_DEVICE_ID_INTEL_ICH6:
        case PCI_DEVICE_ID_INTEL_ICH7:
        case PCI_DEVICE_ID_INTEL_ICH7M:
        case PCI_DEVICE_ID_INTEL_ICH7DH:
        case PCI_DEVICE_ID_INTEL_ICH7MDH:
+       case PCI_DEVICE_ID_INTEL_ICH8:
+       case PCI_DEVICE_ID_INTEL_ICH8M:
+       case PCI_DEVICE_ID_INTEL_ICH9DH:
+       case PCI_DEVICE_ID_INTEL_ICH9DO:
+       case PCI_DEVICE_ID_INTEL_ICH9R:
+       case PCI_DEVICE_ID_INTEL_ICH9:
+       case PCI_DEVICE_ID_INTEL_ICH9M:
+       case PCI_DEVICE_ID_INTEL_ICH9ME:
+       case PCI_DEVICE_ID_INTEL_ICH10R:
+       case PCI_DEVICE_ID_INTEL_NM10:
+       case PCI_DEVICE_ID_INTEL_I63XX:
                rcba_phys = pci_read_long(sb, 0xf0) & 0xfffffffe;
                break;
        case PCI_DEVICE_ID_INTEL_ICH:
        case PCI_DEVICE_ID_INTEL_ICH0:
+       case PCI_DEVICE_ID_INTEL_ICH2:
        case PCI_DEVICE_ID_INTEL_ICH4:
        case PCI_DEVICE_ID_INTEL_ICH4M:
+       case PCI_DEVICE_ID_INTEL_ICH5:
                printf("This southbridge does not have RCBA.\n");
                return 1;
        default:
@@ -58,10 +62,9 @@ int print_rcba(struct pci_dev *sb)
                return 1;
        }
 
-       rcba = mmap(0, size, PROT_WRITE | PROT_READ, MAP_SHARED,
-                   fd_mem, (off_t) rcba_phys);
-       
-       if (rcba == MAP_FAILED) {
+       rcba = map_physical(rcba_phys, size);
+
+       if (rcba == NULL) {
                perror("Error mapping RCBA");
                exit(1);
        }
@@ -73,7 +76,6 @@ int print_rcba(struct pci_dev *sb)
                        printf("0x%04x: 0x%08x\n", i, *(uint32_t *)(rcba + i));
        }
 
-       munmap((void *)rcba, size);
+       unmap_physical((void *)rcba, size);
        return 0;
 }
-