From owner-p4-projects@FreeBSD.ORG Tue Nov 7 01:28:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4CBB16A415; Tue, 7 Nov 2006 01:28:40 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 AF6A816A40F for ; Tue, 7 Nov 2006 01:28:40 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 40D8643D45 for ; Tue, 7 Nov 2006 01:28:40 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA71Setp088937 for ; Tue, 7 Nov 2006 01:28:40 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA71SdXm088934 for perforce@freebsd.org; Tue, 7 Nov 2006 01:28:39 GMT (envelope-from sam@freebsd.org) Date: Tue, 7 Nov 2006 01:28:39 GMT Message-Id: <200611070128.kA71SdXm088934@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109407 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2006 01:28:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=109407 Change 109407 by sam@sam_ebb on 2006/11/07 01:28:29 add missing bus_space_handle_t param to bus_space_unmap Affected files ... .. //depot/projects/arm/src/sys/arm/arm/nexus_io.c#3 edit .. //depot/projects/arm/src/sys/arm/include/bus.h#5 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci_space.c#8 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_space.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/arm/nexus_io.c#3 (text+ko) ==== @@ -152,7 +152,7 @@ void -nexus_bs_unmap(void *t, bus_size_t size) +nexus_bs_unmap(void *t, bus_space_handle_t h, bus_size_t size) { /* * Temporary implementation ==== //depot/projects/arm/src/sys/arm/include/bus.h#5 (text+ko) ==== @@ -93,7 +93,7 @@ /* mapping/unmapping */ int (*bs_map) (void *, bus_addr_t, bus_size_t, int, bus_space_handle_t *); - void (*bs_unmap) (void *, bus_size_t); + void (*bs_unmap) (void *, bus_space_handle_t, bus_size_t); int (*bs_subregion) (void *, bus_space_handle_t, bus_size_t, bus_size_t, bus_space_handle_t *); @@ -471,7 +471,8 @@ bus_size_t size, int cacheable, bus_space_handle_t *bshp); #define bs_unmap_proto(f) \ -void __bs_c(f,_bs_unmap) (void *t, bus_size_t size); +void __bs_c(f,_bs_unmap) (void *t, bus_space_handle_t bsh, \ + bus_size_t size); #define bs_subregion_proto(f) \ int __bs_c(f,_bs_subregion) (void *t, bus_space_handle_t bsh, \ ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci_space.c#8 (text+ko) ==== @@ -231,7 +231,7 @@ } void -ixp425_pci_io_bs_unmap(void *t, bus_size_t size) +ixp425_pci_io_bs_unmap(void *t, bus_space_handle_t h, bus_size_t size) { /* Nothing to do. */ } @@ -424,7 +424,7 @@ } void -ixp425_pci_mem_bs_unmap(void *t, bus_size_t size) +ixp425_pci_mem_bs_unmap(void *t, bus_space_handle_t h, bus_size_t size) { vm_offset_t va, endva; ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_space.c#3 (text+ko) ==== @@ -166,7 +166,7 @@ } void -ixp425_bs_unmap(void *t, bus_size_t size) +ixp425_bs_unmap(void *t, bus_space_handle_t h, bus_size_t size) { vm_offset_t va, endva;