GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/6230
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins)
This commit is contained in:
Edward O'Callaghan 2014-07-09 18:41:12 +10:00
parent 5962b4ce9c
commit dc878b45ad
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/arch/x86/include/arch/io.h
View File

@ -4,6 +4,11 @@
#include <stdint.h> #include <stdint.h>
#include <rules.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 * This file contains the definitions for the x86 IO instructions
* inb/inw/inl/outb/outw/outl and the "string versions" of the same * 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)) #define PNP_DEV(PORT, FUNC) (((PORT) << 8) | (FUNC))
/* FIXME: Sources for romstage still use device_t. */ /* FIXME: Sources for romstage still use device_t. */
/* Use pci_devfn_t or pnp_devfn_t instead */
typedef u32 device_t; 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, /* 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 * We don't need to set %fs, and %gs anymore
* Before that We need to use %gs, and leave %fs to other RAM access * Before that We need to use %gs, and leave %fs to other RAM access

2
src/include/device/device.h
View File

@ -18,8 +18,6 @@ struct device;
#ifndef __SIMPLE_DEVICE__ #ifndef __SIMPLE_DEVICE__
typedef struct device * device_t; typedef struct device * device_t;
typedef u32 pci_devfn_t;
typedef u32 pnp_devfn_t;
struct pci_operations; struct pci_operations;
struct pci_bus_operations; struct pci_bus_operations;
struct smbus_bus_operations; struct smbus_bus_operations;