Add directive __SIMPLE_DEVICE__

The tests for __PRE_RAM__ or __SMM__ were repeatedly used
for detection if dev->ops in the devicetree are not available
and simple device model functions need be used.

If a source file build for ramstage had __PRE_RAM__ inserted
at the beginning, the struct device would no longer match the
allocation the object had taken. This problem is fixed by
replacing such cases with explicit __SIMPLE_DEVICE__.

Change-Id: Ib74c9b2d8753e6e37e1a23fcfaa2f3657790d4c0
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/3555
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@google.com>
This commit is contained in:
Kyösti Mälkki
2013-06-25 23:17:43 +03:00
parent 0aede1185b
commit ef84401149
21 changed files with 138 additions and 57 deletions

View File

@ -17,13 +17,15 @@
#include <stdint.h>
#include <stddef.h>
#include <arch/rules.h>
#include <device/pci_def.h>
#include <device/resource.h>
#include <device/device.h>
#if !defined(__PRE_RAM__) && !defined(__SMM__)
#include <device/pci_ops.h>
#include <device/pci_rom.h>
#ifndef __SIMPLE_DEVICE__
/* Common pci operations without a standard interface */
struct pci_operations {
/* set the Subsystem IDs for the PCI device */
@ -94,5 +96,5 @@ static inline const struct pci_operations *ops_pci(device_t dev)
return pops;
}
#endif
#endif /* ! __SIMPLE_DEVICE__ */
#endif /* PCI_H */