Change in ...coreboot[master]: arch/io.h: Fix PCI and PNP simple typedefs

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31690 )

Change subject: arch/io.h: Fix PCI and PNP simple typedefs
......................................................................

arch/io.h: Fix PCI and PNP simple typedefs

Provide clean separation for PCI and PNP headers,
followup will also move PNP outside <arch/io.h>.

Change-Id: I85db254d50f18ea34a5e95bc517eac4085a5fafa
Signed-off-by: Kyösti Mälkki 
Reviewed-on: https://review.coreboot.org/c/31690
Tested-by: build bot (Jenkins) 
Reviewed-by: Felix Held 
---
M src/arch/x86/include/arch/io.h
M src/include/device/pci_ehci.h
M src/include/device/pci_ops.h
M src/include/device/pci_type.h
M src/include/reg_script.h
M src/northbridge/amd/amdfam10/pci.h
6 files changed, 6 insertions(+), 4 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Felix Held: Looks good to me, approved

diff --git a/src/arch/x86/include/arch/io.h b/src/arch/x86/include/arch/io.h
index aecf0b6..98cb15a 100644
--- a/src/arch/x86/include/arch/io.h
+++ b/src/arch/x86/include/arch/io.h
@@ -16,7 +16,6 @@

#include <endian.h>
 #include <stdint.h>
-#include <device/pci_type.h>

/*
  * This file contains the definitions for the x86 IO instructions
@@ -203,6 +202,8 @@
 }
 #endif

+typedef u32 pnp_devfn_t;
+
 #ifdef __SIMPLE_DEVICE__

#define PNP_DEV(PORT, FUNC) (((PORT) << 8) | (FUNC))
diff --git a/src/include/device/pci_ehci.h b/src/include/device/pci_ehci.h
index 9d18bcc..146946c 100644
--- a/src/include/device/pci_ehci.h
+++ b/src/include/device/pci_ehci.h
@@ -17,8 +17,8 @@
 #ifndef _PCI_EHCI_H_
 #define _PCI_EHCI_H_

-#include <arch/io.h>
 #include <device/device.h>
+#include <device/pci_type.h>

#define EHCI_BAR_INDEX		0x10
 #define PCI_EHCI_CLASSCODE	0x0c0320  /* USB2.0 with EHCI controller */
diff --git a/src/include/device/pci_ops.h b/src/include/device/pci_ops.h
index 6971ce4..f1d50d7 100644
--- a/src/include/device/pci_ops.h
+++ b/src/include/device/pci_ops.h
@@ -3,6 +3,7 @@

#include <stdint.h>
 #include <device/device.h>
+#include <device/pci_type.h>
 #include <arch/pci_ops.h>

#ifdef __SIMPLE_DEVICE__
diff --git a/src/include/device/pci_type.h b/src/include/device/pci_type.h
index 0b08e8d..3f72c5f 100644
--- a/src/include/device/pci_type.h
+++ b/src/include/device/pci_type.h
@@ -17,7 +17,6 @@
 #include <stdint.h>

typedef u32 pci_devfn_t;
-typedef u32 pnp_devfn_t;

#define PCI_DEV(SEGBUS, DEV, FN) ( \
    (((SEGBUS) & 0xFFF) << 20) | \
diff --git a/src/include/reg_script.h b/src/include/reg_script.h
index 28fc82d..7ca457a 100644
--- a/src/include/reg_script.h
+++ b/src/include/reg_script.h
@@ -17,8 +17,8 @@
 #define REG_SCRIPT_H

#include <stdint.h>
-#include <arch/io.h>
 #include <device/device.h>
+#include <device/pci_type.h>
 #include <device/resource.h>

/*
diff --git a/src/northbridge/amd/amdfam10/pci.h b/src/northbridge/amd/amdfam10/pci.h
index 8fcdbd8..8302582 100644
--- a/src/northbridge/amd/amdfam10/pci.h
+++ b/src/northbridge/amd/amdfam10/pci.h
@@ -18,6 +18,7 @@

#include <inttypes.h>
 #include <arch/io.h>
+#include <device/pci_type.h>
 #include <device/pci_def.h>

u32 pci_read_config32_index(pci_devfn_t dev, u32 index_reg, u32 index);