From owner-p4-projects@FreeBSD.ORG Sun Mar 7 22:56:18 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB48A16A4D0; Sun, 7 Mar 2004 22:56:17 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7A3EF16A4CE for ; Sun, 7 Mar 2004 22:56:17 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 68D7A43D41 for ; Sun, 7 Mar 2004 22:56:17 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i286uHGe040106 for ; Sun, 7 Mar 2004 22:56:17 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i286uGia040103 for perforce@freebsd.org; Sun, 7 Mar 2004 22:56:16 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 7 Mar 2004 22:56:16 -0800 (PST) Message-Id: <200403080656.i286uGia040103@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48411 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Mar 2004 06:56:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=48411 Change 48411 by jmallett@jmallett_oingo on 2004/03/07 22:55:16 Get types right. Affected files ... .. //depot/projects/mips/sys/mips/mips/cache_r4k.c#3 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/cache_r4k.c#3 (text+ko) ==== @@ -60,8 +60,8 @@ void r4k_icache_sync_all_16(void) { - vm_paddr_t va = MIPS_PHYS_TO_KSEG0(0); - vm_paddr_t eva = va + mips_picache_size; + vm_offset_t va = MIPS_PHYS_TO_KSEG0(0); + vm_offset_t eva = va + mips_picache_size; mips_dcache_wbinv_all(); @@ -74,9 +74,9 @@ } void -r4k_icache_sync_range_16(vm_paddr_t va, vm_size_t size) +r4k_icache_sync_range_16(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); va = trunc_line(va); @@ -96,9 +96,9 @@ } void -r4k_icache_sync_range_index_16(vm_paddr_t va, vm_size_t size) +r4k_icache_sync_range_index_16(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva, orig_va; + vm_offset_t eva, orig_va; orig_va = va; @@ -134,8 +134,8 @@ void r4k_pdcache_wbinv_all_16(void) { - vm_paddr_t va = MIPS_PHYS_TO_KSEG0(0); - vm_paddr_t eva = va + mips_pdcache_size; + vm_offset_t va = MIPS_PHYS_TO_KSEG0(0); + vm_offset_t eva = va + mips_pdcache_size; while (va < eva) { cache_r4k_op_32lines_16(va, @@ -145,9 +145,9 @@ } void -r4k_pdcache_wbinv_range_16(vm_paddr_t va, vm_size_t size) +r4k_pdcache_wbinv_range_16(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); va = trunc_line(va); @@ -164,9 +164,9 @@ } void -r4k_pdcache_wbinv_range_index_16(vm_paddr_t va, vm_size_t size) +r4k_pdcache_wbinv_range_index_16(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva; + vm_offset_t eva; /* * Since we're doing Index ops, we expect to not be able @@ -192,9 +192,9 @@ } void -r4k_pdcache_inv_range_16(vm_paddr_t va, vm_size_t size) +r4k_pdcache_inv_range_16(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); va = trunc_line(va); @@ -210,9 +210,9 @@ } void -r4k_pdcache_wb_range_16(vm_paddr_t va, vm_size_t size) +r4k_pdcache_wb_range_16(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); va = trunc_line(va); @@ -236,8 +236,8 @@ void r4k_icache_sync_all_32(void) { - vm_paddr_t va = MIPS_PHYS_TO_KSEG0(0); - vm_paddr_t eva = va + mips_picache_size; + vm_offset_t va = MIPS_PHYS_TO_KSEG0(0); + vm_offset_t eva = va + mips_picache_size; mips_dcache_wbinv_all(); @@ -250,9 +250,9 @@ } void -r4k_icache_sync_range_32(vm_paddr_t va, vm_size_t size) +r4k_icache_sync_range_32(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); va = trunc_line(va); @@ -272,9 +272,9 @@ } void -r4k_icache_sync_range_index_32(vm_paddr_t va, vm_size_t size) +r4k_icache_sync_range_index_32(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva; + vm_offset_t eva; eva = round_line(va + size); va = trunc_line(va); @@ -308,8 +308,8 @@ void r4k_pdcache_wbinv_all_32(void) { - vm_paddr_t va = MIPS_PHYS_TO_KSEG0(0); - vm_paddr_t eva = va + mips_pdcache_size; + vm_offset_t va = MIPS_PHYS_TO_KSEG0(0); + vm_offset_t eva = va + mips_pdcache_size; while (va < eva) { cache_r4k_op_32lines_32(va, @@ -319,9 +319,9 @@ } void -r4k_pdcache_wbinv_range_32(vm_paddr_t va, vm_size_t size) +r4k_pdcache_wbinv_range_32(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); va = trunc_line(va); @@ -338,9 +338,9 @@ } void -r4k_pdcache_wbinv_range_index_32(vm_paddr_t va, vm_size_t size) +r4k_pdcache_wbinv_range_index_32(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva; + vm_offset_t eva; /* * Since we're doing Index ops, we expect to not be able @@ -366,9 +366,9 @@ } void -r4k_pdcache_inv_range_32(vm_paddr_t va, vm_size_t size) +r4k_pdcache_inv_range_32(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); va = trunc_line(va); @@ -384,9 +384,9 @@ } void -r4k_pdcache_wb_range_32(vm_paddr_t va, vm_size_t size) +r4k_pdcache_wb_range_32(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); va = trunc_line(va); @@ -404,8 +404,8 @@ void r4k_sdcache_wbinv_all_32(void) { - vm_paddr_t va = MIPS_PHYS_TO_KSEG0(0); - vm_paddr_t eva = va + mips_sdcache_size; + vm_offset_t va = MIPS_PHYS_TO_KSEG0(0); + vm_offset_t eva = va + mips_sdcache_size; while (va < eva) { cache_r4k_op_32lines_32(va, @@ -415,9 +415,9 @@ } void -r4k_sdcache_wbinv_range_32(vm_paddr_t va, vm_size_t size) +r4k_sdcache_wbinv_range_32(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); va = trunc_line(va); @@ -434,9 +434,9 @@ } void -r4k_sdcache_wbinv_range_index_32(vm_paddr_t va, vm_size_t size) +r4k_sdcache_wbinv_range_index_32(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva; + vm_offset_t eva; /* * Since we're doing Index ops, we expect to not be able @@ -462,9 +462,9 @@ } void -r4k_sdcache_inv_range_32(vm_paddr_t va, vm_size_t size) +r4k_sdcache_inv_range_32(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); va = trunc_line(va); @@ -480,9 +480,9 @@ } void -r4k_sdcache_wb_range_32(vm_paddr_t va, vm_size_t size) +r4k_sdcache_wb_range_32(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); va = trunc_line(va); @@ -506,8 +506,8 @@ void r4k_sdcache_wbinv_all_128(void) { - vm_paddr_t va = MIPS_PHYS_TO_KSEG0(0); - vm_paddr_t eva = va + mips_sdcache_size; + vm_offset_t va = MIPS_PHYS_TO_KSEG0(0); + vm_offset_t eva = va + mips_sdcache_size; while (va < eva) { cache_r4k_op_32lines_128(va, @@ -517,9 +517,9 @@ } void -r4k_sdcache_wbinv_range_128(vm_paddr_t va, vm_size_t size) +r4k_sdcache_wbinv_range_128(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); va = trunc_line(va); @@ -536,9 +536,9 @@ } void -r4k_sdcache_wbinv_range_index_128(vm_paddr_t va, vm_size_t size) +r4k_sdcache_wbinv_range_index_128(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva; + vm_offset_t eva; /* * Since we're doing Index ops, we expect to not be able @@ -564,9 +564,9 @@ } void -r4k_sdcache_inv_range_128(vm_paddr_t va, vm_size_t size) +r4k_sdcache_inv_range_128(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); va = trunc_line(va); @@ -582,9 +582,9 @@ } void -r4k_sdcache_wb_range_128(vm_paddr_t va, vm_size_t size) +r4k_sdcache_wb_range_128(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); va = trunc_line(va); @@ -608,8 +608,8 @@ void r4k_sdcache_wbinv_all_generic(void) { - vm_paddr_t va = MIPS_PHYS_TO_KSEG0(0); - vm_paddr_t eva = va + mips_sdcache_size; + vm_offset_t va = MIPS_PHYS_TO_KSEG0(0); + vm_offset_t eva = va + mips_sdcache_size; int line_size = mips_sdcache_line_size; while (va < eva) { @@ -619,9 +619,9 @@ } void -r4k_sdcache_wbinv_range_generic(vm_paddr_t va, vm_size_t size) +r4k_sdcache_wbinv_range_generic(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); int line_size = mips_sdcache_line_size; va = trunc_line(va); @@ -633,9 +633,9 @@ } void -r4k_sdcache_wbinv_range_index_generic(vm_paddr_t va, vm_size_t size) +r4k_sdcache_wbinv_range_index_generic(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva; + vm_offset_t eva; int line_size = mips_sdcache_line_size; /* @@ -656,9 +656,9 @@ } void -r4k_sdcache_inv_range_generic(vm_paddr_t va, vm_size_t size) +r4k_sdcache_inv_range_generic(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); int line_size = mips_sdcache_line_size; va = trunc_line(va); @@ -670,9 +670,9 @@ } void -r4k_sdcache_wb_range_generic(vm_paddr_t va, vm_size_t size) +r4k_sdcache_wb_range_generic(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); int line_size = mips_sdcache_line_size; va = trunc_line(va);