From 6b542faf202757d6525a31a8e29e1e69540c12e5 Mon Sep 17 00:00:00 2001 From: Antonello Dettori Date: Tue, 8 Nov 2016 18:44:46 +0100 Subject: mainboard/samsung/lumpy: transition away from device_t Replace the use of the old device_t definition inside mainboard/samsung/lumpy. Change-Id: I39fe6bad42b3b0772d09d0fa7af357b797b8e04f Signed-off-by: Antonello Dettori Reviewed-on: https://review.coreboot.org/17303 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/mainboard/samsung/lumpy/chromeos.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'src/mainboard/samsung/lumpy/chromeos.c') diff --git a/src/mainboard/samsung/lumpy/chromeos.c b/src/mainboard/samsung/lumpy/chromeos.c index 71d82b5e37..a287c74538 100644 --- a/src/mainboard/samsung/lumpy/chromeos.c +++ b/src/mainboard/samsung/lumpy/chromeos.c @@ -31,7 +31,7 @@ #define FLAG_REC_MODE 1 #define FLAG_DEV_MODE 2 -#ifndef __PRE_RAM__ +#ifndef __SIMPLE_DEVICE__ #include #include "ec.h" #include @@ -87,10 +87,11 @@ void fill_lb_gpios(struct lb_gpios *gpios) int get_write_protect_state(void) { - device_t dev; -#ifdef __PRE_RAM__ +#ifdef __SIMPLE_DEVICE__ + pci_devfn_t dev; dev = PCI_DEV(0, 0x1f, 2); #else + device_t dev; dev = dev_find_slot(0, PCI_DEVFN(0x1f, 2)); #endif return (pci_read_config32(dev, SATA_SP) >> FLAG_SPI_WP) & 1; @@ -98,10 +99,11 @@ int get_write_protect_state(void) int get_developer_mode_switch(void) { - device_t dev; -#ifdef __PRE_RAM__ +#ifdef __SIMPLE_DEVICE__ + pci_devfn_t dev; dev = PCI_DEV(0, 0x1f, 2); #else + device_t dev; dev = dev_find_slot(0, PCI_DEVFN(0x1f, 2)); #endif return (pci_read_config32(dev, SATA_SP) >> FLAG_DEV_MODE) & 1; @@ -109,10 +111,11 @@ int get_developer_mode_switch(void) int get_recovery_mode_switch(void) { - device_t dev; -#ifdef __PRE_RAM__ +#ifdef __SIMPLE_DEVICE__ + pci_devfn_t dev; dev = PCI_DEV(0, 0x1f, 2); #else + device_t dev; dev = dev_find_slot(0, PCI_DEVFN(0x1f, 2)); #endif return (pci_read_config32(dev, SATA_SP) >> FLAG_REC_MODE) & 1; -- cgit v1.2.3