Patch set updated for coreboot: e0dcd06 include/device/device.h: Deduplicate '*_pnp_devfn_t' typedefs

[Edward O'Callaghan]

Edward O'Callaghan ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6230

-gerrit

commit e0dcd06565912d16e0c96fa89ea3e34c7c1c4213
Author: Edward O'Callaghan 
Date:   Wed Jul 9 18:41:12 2014 +1000

include/device/device.h: Deduplicate '*_pnp_devfn_t' typedefs

'pci_devfn_t' and 'pnp_devfn_t' are already defined in arch/io.h

Change-Id: I006182bf6933fae21fe6671659b76e7031e74b71
    Signed-off-by: Edward O'Callaghan 
---
 src/arch/x86/include/arch/io.h | 9 ++++++---
 src/include/device/device.h    | 2 --
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/arch/x86/include/arch/io.h b/src/arch/x86/include/arch/io.h
index b6d82f9..d5cdf35 100644
--- a/src/arch/x86/include/arch/io.h
+++ b/src/arch/x86/include/arch/io.h
@@ -4,6 +4,11 @@
 #include <stdint.h>
 #include <rules.h>

+/* FIXME: Sources for romstage still use device_t. */
+/* Use pci_devfn_t or pnp_devfn_t instead */
+typedef u32 pci_devfn_t;
+typedef u32 pnp_devfn_t;
+
 /*
  * This file contains the definitions for the x86 IO instructions
  * inb/inw/inl/outb/outw/outl and the "string versions" of the same
@@ -218,11 +223,9 @@ static inline int log2f(int value)
 #define PNP_DEV(PORT, FUNC) (((PORT) << 8) | (FUNC))

/* FIXME: Sources for romstage still use device_t. */
+/* Use pci_devfn_t or pnp_devfn_t instead */
 typedef u32 device_t;

-typedef u32 pci_devfn_t;
-typedef u32 pnp_devfn_t;
-
 /* FIXME: We need to make the coreboot to run at 64bit mode, So when read/write memory above 4G,
  * We don't need to set %fs, and %gs anymore
  * Before that We need to use %gs, and leave %fs to other RAM access
diff --git a/src/include/device/device.h b/src/include/device/device.h
index cf4cb8c..3810716 100644
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -18,8 +18,6 @@ struct device;

#ifndef __SIMPLE_DEVICE__
 typedef struct device * device_t;
-typedef u32 pci_devfn_t;
-typedef u32 pnp_devfn_t;
 struct pci_operations;
 struct pci_bus_operations;
 struct smbus_bus_operations;