From 49631913e05a6381c10ed934c80d57c8d8445ed6 Mon Sep 17 00:00:00 2001 From: imp Date: Mon, 9 Mar 2009 13:27:33 +0000 Subject: Fix prototypes to be consistent. --- sys/dev/agp/agp.c | 2 +- sys/dev/agp/agp_amd64.c | 4 ++-- sys/dev/agp/agp_i810.c | 6 +++--- sys/dev/agp/agp_intel.c | 4 ++-- sys/dev/agp/agp_via.c | 4 ++-- sys/dev/agp/agppriv.h | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'sys/dev/agp') diff --git a/sys/dev/agp/agp.c b/sys/dev/agp/agp.c index 1e61871..af34d14 100644 --- a/sys/dev/agp/agp.c +++ b/sys/dev/agp/agp.c @@ -295,7 +295,7 @@ agp_generic_detach(device_t dev) * Default AGP aperture size detection which simply returns the size of * the aperture's PCI resource. */ -int +u_int32_t agp_generic_get_aperture(device_t dev) { struct agp_softc *sc = device_get_softc(dev); diff --git a/sys/dev/agp/agp_amd64.c b/sys/dev/agp/agp_amd64.c index 8151f48..c68847a 100644 --- a/sys/dev/agp/agp_amd64.c +++ b/sys/dev/agp/agp_amd64.c @@ -333,7 +333,7 @@ agp_amd64_set_aperture(device_t dev, uint32_t aperture) } static int -agp_amd64_bind_page(device_t dev, int offset, vm_offset_t physical) +agp_amd64_bind_page(device_t dev, vm_offset_t offset, vm_offset_t physical) { struct agp_amd64_softc *sc = device_get_softc(dev); @@ -347,7 +347,7 @@ agp_amd64_bind_page(device_t dev, int offset, vm_offset_t physical) } static int -agp_amd64_unbind_page(device_t dev, int offset) +agp_amd64_unbind_page(device_t dev, vm_offset_t offset) { struct agp_amd64_softc *sc = device_get_softc(dev); diff --git a/sys/dev/agp/agp_i810.c b/sys/dev/agp/agp_i810.c index b92da20..48cf171 100644 --- a/sys/dev/agp/agp_i810.c +++ b/sys/dev/agp/agp_i810.c @@ -836,12 +836,12 @@ agp_i810_write_gtt_entry(device_t dev, int offset, vm_offset_t physical, } static int -agp_i810_bind_page(device_t dev, int offset, vm_offset_t physical) +agp_i810_bind_page(device_t dev, vm_offset_t offset, vm_offset_t physical) { struct agp_i810_softc *sc = device_get_softc(dev); if (offset < 0 || offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) { - device_printf(dev, "failed: offset is 0x%08x, shift is %d, entries is %d\n", offset, AGP_PAGE_SHIFT, sc->gatt->ag_entries); + device_printf(dev, "failed: offset is 0x%08jx, shift is %d, entries is %d\n", (intmax_t)offset, AGP_PAGE_SHIFT, sc->gatt->ag_entries); return EINVAL; } @@ -858,7 +858,7 @@ agp_i810_bind_page(device_t dev, int offset, vm_offset_t physical) } static int -agp_i810_unbind_page(device_t dev, int offset) +agp_i810_unbind_page(device_t dev, vm_offset_t offset) { struct agp_i810_softc *sc = device_get_softc(dev); diff --git a/sys/dev/agp/agp_intel.c b/sys/dev/agp/agp_intel.c index 3e457ab..3463d82 100644 --- a/sys/dev/agp/agp_intel.c +++ b/sys/dev/agp/agp_intel.c @@ -365,7 +365,7 @@ agp_intel_set_aperture(device_t dev, u_int32_t aperture) } static int -agp_intel_bind_page(device_t dev, int offset, vm_offset_t physical) +agp_intel_bind_page(device_t dev, vm_offset_t offset, vm_offset_t physical) { struct agp_intel_softc *sc; @@ -379,7 +379,7 @@ agp_intel_bind_page(device_t dev, int offset, vm_offset_t physical) } static int -agp_intel_unbind_page(device_t dev, int offset) +agp_intel_unbind_page(device_t dev, vm_offset_t offset) { struct agp_intel_softc *sc; diff --git a/sys/dev/agp/agp_via.c b/sys/dev/agp/agp_via.c index dedc9da..2873692 100644 --- a/sys/dev/agp/agp_via.c +++ b/sys/dev/agp/agp_via.c @@ -358,7 +358,7 @@ agp_via_set_aperture(device_t dev, u_int32_t aperture) } static int -agp_via_bind_page(device_t dev, int offset, vm_offset_t physical) +agp_via_bind_page(device_t dev, vm_offset_t offset, vm_offset_t physical) { struct agp_via_softc *sc = device_get_softc(dev); @@ -370,7 +370,7 @@ agp_via_bind_page(device_t dev, int offset, vm_offset_t physical) } static int -agp_via_unbind_page(device_t dev, int offset) +agp_via_unbind_page(device_t dev, vm_offset_t offset) { struct agp_via_softc *sc = device_get_softc(dev); diff --git a/sys/dev/agp/agppriv.h b/sys/dev/agp/agppriv.h index c730053..fd64056 100644 --- a/sys/dev/agp/agppriv.h +++ b/sys/dev/agp/agppriv.h @@ -92,7 +92,7 @@ void agp_free_gatt(struct agp_gatt *gatt); void agp_free_res(device_t dev); int agp_generic_attach(device_t dev); int agp_generic_detach(device_t dev); -int agp_generic_get_aperture(device_t dev); +u_int32_t agp_generic_get_aperture(device_t dev); int agp_generic_set_aperture(device_t dev, u_int32_t aperture); int agp_generic_enable(device_t dev, u_int32_t mode); -- cgit v1.1