Module Name: src
Committed By: macallan
Date: Thu Jan 3 18:28:21 UTC 2019
Modified Files:
src/sys/arch/shark/ofw: vlpci.c
Log Message:
catch up with struct arm32_pci_chipset changes
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/shark/ofw/vlpci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/shark/ofw/vlpci.c
diff -u src/sys/arch/shark/ofw/vlpci.c:1.8 src/sys/arch/shark/ofw/vlpci.c:1.9
--- src/sys/arch/shark/ofw/vlpci.c:1.8 Tue Apr 18 14:11:42 2017
+++ src/sys/arch/shark/ofw/vlpci.c Thu Jan 3 18:28:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vlpci.c,v 1.8 2017/04/18 14:11:42 flxd Exp $ */
+/* $NetBSD: vlpci.c,v 1.9 2019/01/03 18:28:21 macallan Exp $ */
/*
* Copyright (c) 2017 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vlpci.c,v 1.8 2017/04/18 14:11:42 flxd Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vlpci.c,v 1.9 2019/01/03 18:28:21 macallan Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -78,7 +78,7 @@ static const char * vlpci_pc_intr_string
size_t);
static const struct evcnt * vlpci_pc_intr_evcnt(void *, pci_intr_handle_t);
static void * vlpci_pc_intr_establish(void *, pci_intr_handle_t, int,
- int (*)(void *), void *);
+ int (*)(void *), void *, const char *);
static void vlpci_pc_intr_disestablish(void *, void *);
#ifdef __HAVE_PCI_CONF_HOOK
@@ -433,7 +433,7 @@ vlpci_pc_intr_string(void *v, pci_intr_h
if (ih == PCI_INTERRUPT_PIN_NONE)
return NULL;
- snprintf(buf, len, "irq %lu", ih);
+ snprintf(buf, len, "irq %llu", ih);
return buf;
}
@@ -446,7 +446,7 @@ vlpci_pc_intr_evcnt(void *v, pci_intr_ha
static void *
vlpci_pc_intr_establish(void *v, pci_intr_handle_t pih, int ipl,
- int (*callback)(void *), void *arg)
+ int (*callback)(void *), void *arg, const char *foo)
{
if (pih == 0)
