[coreboot-gerrit] New patch to review for coreboot: 9b1913d mainboard: Test watchdog.c

Edward O'Callaghan (eocallaghan@alterapraxis.com) gerrit at coreboot.org
Thu Oct 30 21:14:54 CET 2014


Edward O'Callaghan (eocallaghan at alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7281

-gerrit

commit 9b1913dd6bcf59345f8999593f82370d322b0f11
Author: Edward O'Callaghan <eocallaghan at alterapraxis.com>
Date:   Fri Oct 31 07:13:17 2014 +1100

    mainboard: Test watchdog.c
    
    Change-Id: Ib9f04c3936b38b536ee72e0cce361a3e025ca3b7
    Signed-off-by: Edward O'Callaghan <eocallaghan at alterapraxis.com>
---
 src/mainboard/intel/jarrell/watchdog.c        | 8 ++++----
 src/mainboard/supermicro/x6dai_g/watchdog.c   | 2 +-
 src/mainboard/supermicro/x6dhe_g/watchdog.c   | 6 +++---
 src/mainboard/supermicro/x6dhe_g2/watchdog.c  | 6 +++---
 src/mainboard/supermicro/x6dhr_ig/watchdog.c  | 6 +++---
 src/mainboard/supermicro/x6dhr_ig2/watchdog.c | 6 +++---
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/mainboard/intel/jarrell/watchdog.c b/src/mainboard/intel/jarrell/watchdog.c
index 7f7a039..9722c04 100644
--- a/src/mainboard/intel/jarrell/watchdog.c
+++ b/src/mainboard/intel/jarrell/watchdog.c
@@ -6,7 +6,7 @@
 #define ICH5_WDBASE 0x400
 #define ICH5_GPIOBASE 0x500
 
-static void disable_sio_watchdog(device_t dev)
+static void disable_sio_watchdog(pci_devfn_t dev)
 {
 	/* FIXME move me somewhere more appropriate */
 	pnp_set_logical_device(dev);
@@ -20,7 +20,7 @@ static void disable_sio_watchdog(device_t dev)
 static void disable_ich5_watchdog(void)
 {
 	/* FIXME move me somewhere more appropriate */
-	device_t dev;
+	pci_devfn_t dev;
 	unsigned long value, base;
 	dev = pci_locate_device(PCI_ID(0x8086, 0x24d0), 0);
 	if (dev == PCI_DEV_INVALID) {
@@ -48,7 +48,7 @@ static void disable_ich5_watchdog(void)
 
 static void disable_jarell_frb3(void)
 {
-	device_t dev;
+	pci_devfn_t dev;
 	unsigned long value, base;
 	dev = pci_locate_device(PCI_ID(0x8086, 0x24d0), 0);
 	if (dev == PCI_DEV_INVALID) {
@@ -97,7 +97,7 @@ static void disable_watchdogs(void)
 
 static void ich5_watchdog_on(void)
 {
-	device_t dev;
+	pci_devfn_t dev;
 	unsigned long value, base;
 	unsigned char byte;
 
diff --git a/src/mainboard/supermicro/x6dai_g/watchdog.c b/src/mainboard/supermicro/x6dai_g/watchdog.c
index 2fd3274..bf9f9f1 100644
--- a/src/mainboard/supermicro/x6dai_g/watchdog.c
+++ b/src/mainboard/supermicro/x6dai_g/watchdog.c
@@ -8,7 +8,7 @@
 static void disable_esb6300_watchdog(void)
 {
 	/* FIXME move me somewhere more appropriate */
-	device_t dev;
+	pci_devfn_t dev;
 	unsigned long value, base;
 	dev = pci_locate_device(PCI_ID(0x8086, 0x25a1), 0);
 	if (dev == PCI_DEV_INVALID) {
diff --git a/src/mainboard/supermicro/x6dhe_g/watchdog.c b/src/mainboard/supermicro/x6dhe_g/watchdog.c
index 1d34f7d..3fab7f9 100644
--- a/src/mainboard/supermicro/x6dhe_g/watchdog.c
+++ b/src/mainboard/supermicro/x6dhe_g/watchdog.c
@@ -5,7 +5,7 @@
 #define ESB6300_WDBASE 0x400
 #define ESB6300_GPIOBASE 0x500
 
-static void disable_sio_watchdog(device_t dev)
+static void disable_sio_watchdog(pci_devfn_t dev)
 {
 #if 0
 	/* FIXME move me somewhere more appropriate */
@@ -21,7 +21,7 @@ static void disable_sio_watchdog(device_t dev)
 static void disable_esb6300_watchdog(void)
 {
 	/* FIXME move me somewhere more appropriate */
-	device_t dev;
+	pci_devfn_t dev;
 	unsigned long value, base;
 	dev = pci_locate_device(PCI_ID(0x8086, 0x25a1), 0);
 	if (dev == PCI_DEV_INVALID) {
@@ -50,7 +50,7 @@ static void disable_esb6300_watchdog(void)
 static void disable_jarell_frb3(void)
 {
 #if 0
-	device_t dev;
+	pci_devfn_t dev;
 	unsigned long value, base;
 	dev = pci_locate_device(PCI_ID(0x8086, 0x25a1), 0);
 	if (dev == PCI_DEV_INVALID) {
diff --git a/src/mainboard/supermicro/x6dhe_g2/watchdog.c b/src/mainboard/supermicro/x6dhe_g2/watchdog.c
index 1d34f7d..3fab7f9 100644
--- a/src/mainboard/supermicro/x6dhe_g2/watchdog.c
+++ b/src/mainboard/supermicro/x6dhe_g2/watchdog.c
@@ -5,7 +5,7 @@
 #define ESB6300_WDBASE 0x400
 #define ESB6300_GPIOBASE 0x500
 
-static void disable_sio_watchdog(device_t dev)
+static void disable_sio_watchdog(pci_devfn_t dev)
 {
 #if 0
 	/* FIXME move me somewhere more appropriate */
@@ -21,7 +21,7 @@ static void disable_sio_watchdog(device_t dev)
 static void disable_esb6300_watchdog(void)
 {
 	/* FIXME move me somewhere more appropriate */
-	device_t dev;
+	pci_devfn_t dev;
 	unsigned long value, base;
 	dev = pci_locate_device(PCI_ID(0x8086, 0x25a1), 0);
 	if (dev == PCI_DEV_INVALID) {
@@ -50,7 +50,7 @@ static void disable_esb6300_watchdog(void)
 static void disable_jarell_frb3(void)
 {
 #if 0
-	device_t dev;
+	pci_devfn_t dev;
 	unsigned long value, base;
 	dev = pci_locate_device(PCI_ID(0x8086, 0x25a1), 0);
 	if (dev == PCI_DEV_INVALID) {
diff --git a/src/mainboard/supermicro/x6dhr_ig/watchdog.c b/src/mainboard/supermicro/x6dhr_ig/watchdog.c
index a451c32..259ea79 100644
--- a/src/mainboard/supermicro/x6dhr_ig/watchdog.c
+++ b/src/mainboard/supermicro/x6dhr_ig/watchdog.c
@@ -5,7 +5,7 @@
 #define ICH5_WDBASE 0x400
 #define ICH5_GPIOBASE 0x500
 
-static void disable_sio_watchdog(device_t dev)
+static void disable_sio_watchdog(pci_devfn_t dev)
 {
 #if 0
 	/* FIXME move me somewhere more appropriate */
@@ -21,7 +21,7 @@ static void disable_sio_watchdog(device_t dev)
 static void disable_ich5_watchdog(void)
 {
 	/* FIXME move me somewhere more appropriate */
-	device_t dev;
+	pci_devfn_t dev;
 	unsigned long value, base;
 	dev = pci_locate_device(PCI_ID(0x8086, 0x24d0), 0);
 	if (dev == PCI_DEV_INVALID) {
@@ -50,7 +50,7 @@ static void disable_ich5_watchdog(void)
 static void disable_jarell_frb3(void)
 {
 #if 0
-	device_t dev;
+	pci_devfn_t dev;
 	unsigned long value, base;
 	dev = pci_locate_device(PCI_ID(0x8086, 0x24d0), 0);
 	if (dev == PCI_DEV_INVALID) {
diff --git a/src/mainboard/supermicro/x6dhr_ig2/watchdog.c b/src/mainboard/supermicro/x6dhr_ig2/watchdog.c
index a451c32..259ea79 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/watchdog.c
+++ b/src/mainboard/supermicro/x6dhr_ig2/watchdog.c
@@ -5,7 +5,7 @@
 #define ICH5_WDBASE 0x400
 #define ICH5_GPIOBASE 0x500
 
-static void disable_sio_watchdog(device_t dev)
+static void disable_sio_watchdog(pci_devfn_t dev)
 {
 #if 0
 	/* FIXME move me somewhere more appropriate */
@@ -21,7 +21,7 @@ static void disable_sio_watchdog(device_t dev)
 static void disable_ich5_watchdog(void)
 {
 	/* FIXME move me somewhere more appropriate */
-	device_t dev;
+	pci_devfn_t dev;
 	unsigned long value, base;
 	dev = pci_locate_device(PCI_ID(0x8086, 0x24d0), 0);
 	if (dev == PCI_DEV_INVALID) {
@@ -50,7 +50,7 @@ static void disable_ich5_watchdog(void)
 static void disable_jarell_frb3(void)
 {
 #if 0
-	device_t dev;
+	pci_devfn_t dev;
 	unsigned long value, base;
 	dev = pci_locate_device(PCI_ID(0x8086, 0x24d0), 0);
 	if (dev == PCI_DEV_INVALID) {



More information about the coreboot-gerrit mailing list