Tue Apr 18 11:06:57 2023 UTC ()
G/C unnecessary

extern paddr_t physical_start, physical_end;


(skrll)
diff -r1.12 -r1.13 src/sys/arch/arm/include/bus_funcs.h
cvs diff -r1.12 -r1.13 src/sys/arch/arm/include/bus_funcs.h (expand / switch to unified diff)

--- src/sys/arch/arm/include/bus_funcs.h 2022/11/19 12:15:22 1.12
+++ src/sys/arch/arm/include/bus_funcs.h 2023/04/18 11:06:57 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: bus_funcs.h,v 1.12 2022/11/19 12:15:22 skrll Exp $ */ 1/* $NetBSD: bus_funcs.h,v 1.13 2023/04/18 11:06:57 skrll Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc. 4 * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility, 8 * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
9 * NASA Ames Research Center. 9 * NASA Ames Research Center.
10 * 10 *
11 * Redistribution and use in source and binary forms, with or without 11 * Redistribution and use in source and binary forms, with or without
12 * modification, are permitted provided that the following conditions 12 * modification, are permitted provided that the following conditions
13 * are met: 13 * are met:
14 * 1. Redistributions of source code must retain the above copyright 14 * 1. Redistributions of source code must retain the above copyright
@@ -698,28 +698,26 @@ void bus_dmamap_sync(bus_dma_tag_t, bus_ @@ -698,28 +698,26 @@ void bus_dmamap_sync(bus_dma_tag_t, bus_
698 (*(t)->_dmamem_map)((t), (sg), (n), (s), (k), (f)) 698 (*(t)->_dmamem_map)((t), (sg), (n), (s), (k), (f))
699#define bus_dmamem_unmap(t, k, s) \ 699#define bus_dmamem_unmap(t, k, s) \
700 (*(t)->_dmamem_unmap)((t), (k), (s)) 700 (*(t)->_dmamem_unmap)((t), (k), (s))
701#define bus_dmamem_mmap(t, sg, n, o, p, f) \ 701#define bus_dmamem_mmap(t, sg, n, o, p, f) \
702 (*(t)->_dmamem_mmap)((t), (sg), (n), (o), (p), (f)) 702 (*(t)->_dmamem_mmap)((t), (sg), (n), (o), (p), (f))
703 703
704#define bus_dmatag_subregion(t, mna, mxa, nt, f) \ 704#define bus_dmatag_subregion(t, mna, mxa, nt, f) \
705 (*(t)->_dmatag_subregion)((t), (mna), (mxa), (nt), (f)) 705 (*(t)->_dmatag_subregion)((t), (mna), (mxa), (nt), (f))
706#define bus_dmatag_destroy(t) \ 706#define bus_dmatag_destroy(t) \
707 (*(t)->_dmatag_destroy)(t) 707 (*(t)->_dmatag_destroy)(t)
708 708
709#ifdef _ARM32_BUS_DMA_PRIVATE 709#ifdef _ARM32_BUS_DMA_PRIVATE
710 710
711extern paddr_t physical_start, physical_end; 
712 
713int arm32_dma_range_intersect(struct arm32_dma_range *, int, 711int arm32_dma_range_intersect(struct arm32_dma_range *, int,
714 paddr_t pa, psize_t size, paddr_t *pap, psize_t *sizep); 712 paddr_t pa, psize_t size, paddr_t *pap, psize_t *sizep);
715 713
716int _bus_dmamap_create(bus_dma_tag_t, bus_size_t, int, bus_size_t, 714int _bus_dmamap_create(bus_dma_tag_t, bus_size_t, int, bus_size_t,
717 bus_size_t, int, bus_dmamap_t *); 715 bus_size_t, int, bus_dmamap_t *);
718void _bus_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t); 716void _bus_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t);
719int _bus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *, 717int _bus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *,
720 bus_size_t, struct proc *, int); 718 bus_size_t, struct proc *, int);
721int _bus_dmamap_load_mbuf(bus_dma_tag_t, bus_dmamap_t, 719int _bus_dmamap_load_mbuf(bus_dma_tag_t, bus_dmamap_t,
722 struct mbuf *, int); 720 struct mbuf *, int);
723int _bus_dmamap_load_uio(bus_dma_tag_t, bus_dmamap_t, 721int _bus_dmamap_load_uio(bus_dma_tag_t, bus_dmamap_t,
724 struct uio *, int); 722 struct uio *, int);
725int _bus_dmamap_load_raw(bus_dma_tag_t, bus_dmamap_t, 723int _bus_dmamap_load_raw(bus_dma_tag_t, bus_dmamap_t,