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 <dev@dettori.io>
Reviewed-on: https://review.coreboot.org/17303
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Antonello Dettori 2016-11-08 18:44:46 +01:00 committed by Patrick Georgi
parent 823f7bb962
commit 6b542faf20

View File

@ -31,7 +31,7 @@
#define FLAG_REC_MODE 1 #define FLAG_REC_MODE 1
#define FLAG_DEV_MODE 2 #define FLAG_DEV_MODE 2
#ifndef __PRE_RAM__ #ifndef __SIMPLE_DEVICE__
#include <boot/coreboot_tables.h> #include <boot/coreboot_tables.h>
#include "ec.h" #include "ec.h"
#include <ec/smsc/mec1308/ec.h> #include <ec/smsc/mec1308/ec.h>
@ -87,10 +87,11 @@ void fill_lb_gpios(struct lb_gpios *gpios)
int get_write_protect_state(void) int get_write_protect_state(void)
{ {
device_t dev; #ifdef __SIMPLE_DEVICE__
#ifdef __PRE_RAM__ pci_devfn_t dev;
dev = PCI_DEV(0, 0x1f, 2); dev = PCI_DEV(0, 0x1f, 2);
#else #else
device_t dev;
dev = dev_find_slot(0, PCI_DEVFN(0x1f, 2)); dev = dev_find_slot(0, PCI_DEVFN(0x1f, 2));
#endif #endif
return (pci_read_config32(dev, SATA_SP) >> FLAG_SPI_WP) & 1; 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) int get_developer_mode_switch(void)
{ {
device_t dev; #ifdef __SIMPLE_DEVICE__
#ifdef __PRE_RAM__ pci_devfn_t dev;
dev = PCI_DEV(0, 0x1f, 2); dev = PCI_DEV(0, 0x1f, 2);
#else #else
device_t dev;
dev = dev_find_slot(0, PCI_DEVFN(0x1f, 2)); dev = dev_find_slot(0, PCI_DEVFN(0x1f, 2));
#endif #endif
return (pci_read_config32(dev, SATA_SP) >> FLAG_DEV_MODE) & 1; 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) int get_recovery_mode_switch(void)
{ {
device_t dev; #ifdef __SIMPLE_DEVICE__
#ifdef __PRE_RAM__ pci_devfn_t dev;
dev = PCI_DEV(0, 0x1f, 2); dev = PCI_DEV(0, 0x1f, 2);
#else #else
device_t dev;
dev = dev_find_slot(0, PCI_DEVFN(0x1f, 2)); dev = dev_find_slot(0, PCI_DEVFN(0x1f, 2));
#endif #endif
return (pci_read_config32(dev, SATA_SP) >> FLAG_REC_MODE) & 1; return (pci_read_config32(dev, SATA_SP) >> FLAG_REC_MODE) & 1;