Module Name: src
Committed By: mrg
Date: Mon Apr 26 07:18:01 UTC 2021
Modified Files:
src/sys/arch/sparc64/dev: iommu.c iommuvar.h
Log Message:
iommu_enter() and iommu_remove() are static to iommu.c.
To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/sys/arch/sparc64/dev/iommu.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sparc64/dev/iommuvar.h
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/sparc64/dev/iommu.c
diff -u src/sys/arch/sparc64/dev/iommu.c:1.115 src/sys/arch/sparc64/dev/iommu.c:1.116
--- src/sys/arch/sparc64/dev/iommu.c:1.115 Sat Feb 9 11:27:05 2019
+++ src/sys/arch/sparc64/dev/iommu.c Mon Apr 26 07:18:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: iommu.c,v 1.115 2019/02/09 11:27:05 mrg Exp $ */
+/* $NetBSD: iommu.c,v 1.116 2021/04/26 07:18:01 mrg Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.115 2019/02/09 11:27:05 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.116 2021/04/26 07:18:01 mrg Exp $");
#include "opt_ddb.h"
@@ -289,7 +289,7 @@ iommu_reset(struct iommu_state *is)
* Here are the iommu control routines.
*/
-void
+static void
iommu_enter(struct strbuf_ctl *sb, vaddr_t va, int64_t pa, int flags)
{
DPRINTF(IDB_IOMMU, ("iommu_enter: va %lx pa %lx flags %x\n",
@@ -389,8 +389,7 @@ iommu_extract(struct iommu_state *is, va
* XXX: this function needs better internal error checking.
*/
-
-void
+static void
iommu_remove(struct iommu_state *is, vaddr_t va, size_t len)
{
DPRINTF(IDB_IOMMU, ("iommu_remove: va %lx len %zu\n", va, len));
Index: src/sys/arch/sparc64/dev/iommuvar.h
diff -u src/sys/arch/sparc64/dev/iommuvar.h:1.23 src/sys/arch/sparc64/dev/iommuvar.h:1.24
--- src/sys/arch/sparc64/dev/iommuvar.h:1.23 Sat Feb 9 11:27:05 2019
+++ src/sys/arch/sparc64/dev/iommuvar.h Mon Apr 26 07:18:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: iommuvar.h,v 1.23 2019/02/09 11:27:05 mrg Exp $ */
+/* $NetBSD: iommuvar.h,v 1.24 2021/04/26 07:18:01 mrg Exp $ */
/*
* Copyright (c) 1999 Matthew R. Green
@@ -72,8 +72,6 @@ struct iommu_state {
/* interfaces for PCI/SBUS code */
void iommu_init(char *, struct iommu_state *, int, uint32_t);
void iommu_reset(struct iommu_state *);
-void iommu_enter(struct strbuf_ctl *, vaddr_t, int64_t, int);
-void iommu_remove(struct iommu_state *, vaddr_t, size_t);
paddr_t iommu_extract(struct iommu_state *, vaddr_t);
int iommu_dvmamap_load(bus_dma_tag_t, bus_dmamap_t, void *, bus_size_t,