From eda7aef3bf2957f7a91ba8fb2f75ab5797e8d1df Mon Sep 17 00:00:00 2001 From: Artur Grabowski Date: Wed, 31 Oct 2001 12:26:19 +0000 Subject: Change the internal vc_mmap from returning int to paddr_t. --- sys/arch/macppc/pci/vgafb_pci.c | 6 +++--- sys/arch/macppc/pci/vgafbvar.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'sys') diff --git a/sys/arch/macppc/pci/vgafb_pci.c b/sys/arch/macppc/pci/vgafb_pci.c index f458fcdfe10..ea27e674ddd 100644 --- a/sys/arch/macppc/pci/vgafb_pci.c +++ b/sys/arch/macppc/pci/vgafb_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vgafb_pci.c,v 1.1 2001/09/01 15:55:18 drahn Exp $ */ +/* $OpenBSD: vgafb_pci.c,v 1.2 2001/10/31 12:26:18 art Exp $ */ /* $NetBSD: vga_pci.c,v 1.4 1996/12/05 01:39:38 cgd Exp $ */ /* @@ -73,7 +73,7 @@ int vgafb_pci_match __P((struct device *, struct cfdata *, void *)); #endif void vgafb_pci_attach __P((struct device *, struct device *, void *)); -int vgafbpcimmap __P((void *, off_t, int)); +paddr_t vgafbpcimmap __P((void *, off_t, int)); int vgafbpciioctl __P((void *, u_long, caddr_t, int, struct proc *)); struct cfattach vgafb_pci_ca = { @@ -388,7 +388,7 @@ vgafbpciioctl(v, cmd, data, flag, p) return (vgafb_ioctl(sc->sc_vc, cmd, data, flag, p)); } -int +paddr_t vgafbpcimmap(v, offset, prot) void *v; off_t offset; diff --git a/sys/arch/macppc/pci/vgafbvar.h b/sys/arch/macppc/pci/vgafbvar.h index f8ba388c48c..c769aecdc47 100644 --- a/sys/arch/macppc/pci/vgafbvar.h +++ b/sys/arch/macppc/pci/vgafbvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vgafbvar.h,v 1.1 2001/09/01 15:55:18 drahn Exp $ */ +/* $OpenBSD: vgafbvar.h,v 1.2 2001/10/31 12:26:18 art Exp $ */ /* $NetBSD: vgavar.h,v 1.2 1996/11/23 06:06:43 cgd Exp $ */ /* @@ -53,7 +53,7 @@ struct vgafb_config { int (*vc_ioctl) __P((void *, u_long, caddr_t, int, struct proc *)); - int (*vc_mmap) __P((void *, off_t, int)); + paddr_t (*vc_mmap) __P((void *, off_t, int)); #if 0 struct raster dc_raster; /* raster description */ #endif @@ -75,7 +75,7 @@ void vgafb_cnattach __P((bus_space_tag_t iot, bus_space_tag_t memt, void vgafb_wsdisplay_attach __P((struct device *parent, struct vgafb_config *vc, int console)); int vgafbioctl __P((void *, u_long, caddr_t, int, struct proc *)); -int vgafbmmap __P((void *, off_t, int)); +paddr_t vgafbmmap __P((void *, off_t, int)); int vgafb_ioctl __P((void *, u_long, caddr_t, int, struct proc *)); paddr_t vgafb_mmap __P((void *, off_t, int)); int vgafb_alloc_screen __P((void *v, const struct wsscreen_descr *type, -- cgit v1.2.3