diff options
Diffstat (limited to 'sys/arch')
25 files changed, 169 insertions, 169 deletions
diff --git a/sys/arch/amd64/amd64/efifb.c b/sys/arch/amd64/amd64/efifb.c index 656bbd2b057..21458329ce7 100644 --- a/sys/arch/amd64/amd64/efifb.c +++ b/sys/arch/amd64/amd64/efifb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: efifb.c,v 1.28 2020/05/25 06:45:25 jsg Exp $ */ +/* $OpenBSD: efifb.c,v 1.29 2020/05/25 09:55:47 jsg Exp $ */ /* * Copyright (c) 2015 YASUOKA Masahiko <yasuoka@yasuoka.net> @@ -96,7 +96,7 @@ void efifb_rasops_preinit(struct efifb *); int efifb_ioctl(void *, u_long, caddr_t, int, struct proc *); paddr_t efifb_mmap(void *, off_t, int); int efifb_alloc_screen(void *, const struct wsscreen_descr *, void **, - int *, int *, long *); + int *, int *, uint32_t *); void efifb_free_screen(void *, void *); int efifb_show_screen(void *, void *, int, void (*cb) (void *, int, int), void *); @@ -211,7 +211,7 @@ efifb_attach(struct device *parent, struct device *self, void *aux) printf(": %dx%d, %dbpp\n", ri->ri_width, ri->ri_height, ri->ri_depth); if (console) { - long defattr = 0; + uint32_t defattr = 0; ccol = ri->ri_ccol; crow = ri->ri_crow; @@ -346,7 +346,7 @@ efifb_mmap(void *v, off_t off, int prot) int efifb_alloc_screen(void *v, const struct wsscreen_descr *descr, - void **cookiep, int *curxp, int *curyp, long *attrp) + void **cookiep, int *curxp, int *curyp, uint32_t *attrp) { struct efifb_softc *sc = v; struct rasops_info *ri = &sc->sc_fb->rinfo; @@ -430,7 +430,7 @@ efifb_cnattach_common(void) { struct efifb *fb = &efifb_console; struct rasops_info *ri = &fb->rinfo; - long defattr = 0; + uint32_t defattr = 0; ri->ri_bits = (u_char *)efifb_early_map(fb->paddr); diff --git a/sys/arch/armv7/exynos/exdisplay.c b/sys/arch/armv7/exynos/exdisplay.c index e0507d0ed06..3bc2f84dc7f 100644 --- a/sys/arch/armv7/exynos/exdisplay.c +++ b/sys/arch/armv7/exynos/exdisplay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exdisplay.c,v 1.5 2020/05/25 06:45:25 jsg Exp $ */ +/* $OpenBSD: exdisplay.c,v 1.6 2020/05/25 09:55:48 jsg Exp $ */ /* * Copyright (c) 2013 Patrick Wildt <patrick@blueri.se> * @@ -66,7 +66,7 @@ struct cfdriver exdisplay_cd = { int exdisplay_wsioctl(void *, u_long, caddr_t, int, struct proc *); paddr_t exdisplay_wsmmap(void *, off_t, int); int exdisplay_alloc_screen(void *, const struct wsscreen_descr *, - void **, int *, int *, long *); + void **, int *, int *, uint32_t *); void exdisplay_free_screen(void *, void *); int exdisplay_show_screen(void *, void *, int, void (*)(void *, int, int), void *); @@ -147,7 +147,7 @@ exdisplay_attach(struct device *parent, struct device *self, void *args) #if notyet /* FIXME: Set up framebuffer instead of re-using. */ if (!fdt_find_compatible("simple-framebuffer")) { - long defattr; + uint32_t defattr; ri->ri_bits = (u_char *)sc->sc_fbioh; exdisplay_setup_rasops(ri, &exdisplay_stdscreen); @@ -176,7 +176,7 @@ exdisplay_cnattach(bus_space_tag_t iot, bus_addr_t iobase, size_t size) { struct wsscreen_descr *descr = &exdisplay_stdscreen; struct rasops_info *ri = &exdisplay_ri; - long defattr; + uint32_t defattr; if (bus_space_map(iot, iobase, size, 0, (bus_space_handle_t *)&ri->ri_bits)) return ENOMEM; @@ -238,7 +238,7 @@ exdisplay_wsmmap(void *v, off_t off, int prot) int exdisplay_alloc_screen(void *v, const struct wsscreen_descr *type, - void **cookiep, int *curxp, int *curyp, long *attrp) + void **cookiep, int *curxp, int *curyp, uint32_t *attrp) { struct exdisplay_softc *sc = v; struct rasops_info *ri = sc->ro; diff --git a/sys/arch/armv7/omap/amdisplay.c b/sys/arch/armv7/omap/amdisplay.c index 4332de22801..8837cc294c0 100644 --- a/sys/arch/armv7/omap/amdisplay.c +++ b/sys/arch/armv7/omap/amdisplay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amdisplay.c,v 1.11 2019/12/25 11:42:05 jsg Exp $ */ +/* $OpenBSD: amdisplay.c,v 1.12 2020/05/25 09:55:48 jsg Exp $ */ /* * Copyright (c) 2016 Ian Sutton <ians@openbsd.org> * @@ -99,7 +99,7 @@ int amdisplay_intr(void *); int amdisplay_ioctl(void *, u_long, caddr_t, int, struct proc *); paddr_t amdisplay_mmap(void *, off_t, int); int amdisplay_alloc_screen(void *, const struct wsscreen_descr *, - void **, int *, int *, long *); + void **, int *, int *, uint32_t *); int amdisplay_setup_dma(struct amdisplay_softc *); void amdisplay_conf_crt_timings(struct amdisplay_softc *); @@ -644,7 +644,7 @@ amdisplay_mmap(void *sconf, off_t off, int prot) int amdisplay_alloc_screen(void *sconf, const struct wsscreen_descr *type, - void **cookiep, int *curxp, int *curyp, long *attrp) + void **cookiep, int *curxp, int *curyp, uint32_t *attrp) { return rasops_alloc_screen(sconf, cookiep, curxp, curyp, attrp); } diff --git a/sys/arch/armv7/omap/omdisplay.c b/sys/arch/armv7/omap/omdisplay.c index bb982a7d200..9a07ca093f7 100644 --- a/sys/arch/armv7/omap/omdisplay.c +++ b/sys/arch/armv7/omap/omdisplay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: omdisplay.c,v 1.7 2020/05/25 06:45:25 jsg Exp $ */ +/* $OpenBSD: omdisplay.c,v 1.8 2020/05/25 09:55:48 jsg Exp $ */ /* * Copyright (c) 2007 Dale Rahn <drahn@openbsd.org> * @@ -443,7 +443,7 @@ void omdisplay_initialize(struct omdisplay_softc *sc, void omdisplay_setup_rasops(struct omdisplay_softc *sc, struct rasops_info *rinfo); int omdisplay_alloc_screen(void *v, const struct wsscreen_descr *_type, - void **cookiep, int *curxp, int *curyp, long *attrp); + void **cookiep, int *curxp, int *curyp, uint32_t *attrp); int omdisplay_new_screen(struct omdisplay_softc *sc, struct omdisplay_screen *scr, int depth); paddr_t omdisplay_mmap(void *v, off_t offset, int prot); @@ -1142,7 +1142,7 @@ omdisplay_setup_rasops(struct omdisplay_softc *sc, struct rasops_info *rinfo) int omdisplay_alloc_screen(void *v, const struct wsscreen_descr *_type, - void **cookiep, int *curxp, int *curyp, long *attrp) + void **cookiep, int *curxp, int *curyp, uint32_t *attrp) { struct omdisplay_softc *sc = v; struct omdisplay_screen *scr; diff --git a/sys/arch/loongson/dev/radeonfb.c b/sys/arch/loongson/dev/radeonfb.c index 18e8b36f39b..96fe82e8d9e 100644 --- a/sys/arch/loongson/dev/radeonfb.c +++ b/sys/arch/loongson/dev/radeonfb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: radeonfb.c,v 1.3 2020/05/25 06:45:25 jsg Exp $ */ +/* $OpenBSD: radeonfb.c,v 1.4 2020/05/25 09:55:48 jsg Exp $ */ /* * Copyright (c) 2009 Mark Kettenis. @@ -123,7 +123,7 @@ struct radeonfb_softc { }; int radeonfb_alloc_screen(void *, const struct wsscreen_descr *, void **, - int *, int *, long *); + int *, int *, uint32_t *); void radeonfb_free_screen(void *, void *); int radeonfb_ioctl(void *, u_long, caddr_t, int, struct proc *); int radeonfb_list_font(void *, struct wsdisplay_font *); @@ -154,9 +154,9 @@ struct cfdriver radeonfb_cd = { }; int radeonfb_copycols(void *, int, int, int, int); -int radeonfb_erasecols(void *, int, int, int, long); +int radeonfb_erasecols(void *, int, int, int, uint32_t); int radeonfb_copyrows(void *, int, int, int); -int radeonfb_eraserows(void *, int, int, long); +int radeonfb_eraserows(void *, int, int, uint32_t); int radeonfb_setup(struct radeonfb *); void radeonfb_wait_fifo(struct radeonfb *, int); @@ -253,7 +253,7 @@ radeonfb_attach(struct device *parent, struct device *self, void *aux) int radeonfb_alloc_screen(void *v, const struct wsscreen_descr *type, - void **cookiep, int *curxp, int *curyp, long *attrp) + void **cookiep, int *curxp, int *curyp, uint32_t *attrp) { struct radeonfb_softc *sc = (struct radeonfb_softc *)v; struct rasops_info *ri = &sc->sc_fb->ri; @@ -433,7 +433,7 @@ radeonfb_copycols(void *cookie, int row, int src, int dst, int num) } int -radeonfb_erasecols(void *cookie, int row, int col, int num, long attr) +radeonfb_erasecols(void *cookie, int row, int col, int num, uint32_t attr) { struct rasops_info *ri = cookie; struct radeonfb *fb = ri->ri_hw; @@ -468,7 +468,7 @@ radeonfb_copyrows(void *cookie, int src, int dst, int num) } int -radeonfb_eraserows(void *cookie, int row, int num, long attr) +radeonfb_eraserows(void *cookie, int row, int num, uint32_t attr) { struct rasops_info *ri = cookie; struct radeonfb *fb = ri->ri_hw; @@ -686,7 +686,7 @@ int radeonfb_cnattach(bus_space_tag_t memt, bus_space_tag_t iot, pcitag_t tag, pcireg_t id) { - long defattr; + uint32_t defattr; struct rasops_info *ri; pcireg_t bar; int rc; diff --git a/sys/arch/loongson/dev/sisfb.c b/sys/arch/loongson/dev/sisfb.c index c3c17a28927..5e6f9519f37 100644 --- a/sys/arch/loongson/dev/sisfb.c +++ b/sys/arch/loongson/dev/sisfb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sisfb.c,v 1.6 2020/05/25 06:45:25 jsg Exp $ */ +/* $OpenBSD: sisfb.c,v 1.7 2020/05/25 09:55:48 jsg Exp $ */ /* * Copyright (c) 2010 Miodrag Vallat. @@ -84,7 +84,7 @@ struct cfdriver sisfb_cd = { }; int sisfb_alloc_screen(void *, const struct wsscreen_descr *, void **, int *, - int *, long *); + int *, uint32_t *); void sisfb_free_screen(void *, void *); int sisfb_ioctl(void *, u_long, caddr_t, int, struct proc *); int sisfb_list_font(void *, struct wsdisplay_font *); @@ -268,7 +268,7 @@ fail1: int sisfb_alloc_screen(void *v, const struct wsscreen_descr *type, void **cookiep, - int *curxp, int *curyp, long *attrp) + int *curxp, int *curyp, uint32_t *attrp) { struct sisfb_softc *sc = (struct sisfb_softc *)v; struct rasops_info *ri = &sc->sc_fb->ri; @@ -607,7 +607,7 @@ int sisfb_cnattach(bus_space_tag_t memt, bus_space_tag_t iot, pcitag_t tag, pcireg_t id) { - long defattr; + uint32_t defattr; struct rasops_info *ri; pcireg_t bar; int rc; diff --git a/sys/arch/loongson/dev/smfb.c b/sys/arch/loongson/dev/smfb.c index def3d6dfc1c..6c25b18f854 100644 --- a/sys/arch/loongson/dev/smfb.c +++ b/sys/arch/loongson/dev/smfb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smfb.c,v 1.18 2020/05/25 06:45:25 jsg Exp $ */ +/* $OpenBSD: smfb.c,v 1.19 2020/05/25 09:55:48 jsg Exp $ */ /* * Copyright (c) 2009, 2010 Miodrag Vallat. @@ -108,7 +108,7 @@ struct cfdriver smfb_cd = { }; int smfb_alloc_screen(void *, const struct wsscreen_descr *, void **, int *, - int *, long *); + int *, uint32_t *); void smfb_burner(void *, uint, uint); void smfb_free_screen(void *, void *); int smfb_ioctl(void *, u_long, caddr_t, int, struct proc *); @@ -137,8 +137,8 @@ void smfb_fillrect(struct smfb *, int, int, int, int, int); int smfb_copyrows(void *, int, int, int); int smfb_copycols(void *, int, int, int, int); int smfb_do_cursor(struct rasops_info *); -int smfb_erasecols(void *, int, int, int, long); -int smfb_eraserows(void *, int, int, long); +int smfb_erasecols(void *, int, int, int, uint32_t); +int smfb_eraserows(void *, int, int, uint32_t); int smfb_wait(struct smfb *); void smfb_wait_panel_vsync(struct smfb *, int); @@ -241,7 +241,7 @@ smfb_attach_common(struct smfb_softc *sc, int is5xx, bus_space_tag_t memt, int smfb_alloc_screen(void *v, const struct wsscreen_descr *type, void **cookiep, - int *curxp, int *curyp, long *attrp) + int *curxp, int *curyp, uint32_t *attrp) { struct smfb_softc *sc = (struct smfb_softc *)v; struct rasops_info *ri = &sc->sc_fb->ri; @@ -560,7 +560,7 @@ smfb_copycols(void *cookie, int row, int src, int dst, int num) } int -smfb_erasecols(void *cookie, int row, int col, int num, long attr) +smfb_erasecols(void *cookie, int row, int col, int num, uint32_t attr) { struct rasops_info *ri = cookie; struct smfb *fb = ri->ri_hw; @@ -580,7 +580,7 @@ smfb_erasecols(void *cookie, int row, int col, int num, long attr) } int -smfb_eraserows(void *cookie, int row, int num, long attr) +smfb_eraserows(void *cookie, int row, int num, uint32_t attr) { struct rasops_info *ri = cookie; struct smfb *fb = ri->ri_hw; @@ -676,7 +676,7 @@ int smfb_cnattach(bus_space_tag_t memt, bus_space_tag_t iot, pcitag_t tag, pcireg_t id) { - long defattr; + uint32_t defattr; struct rasops_info *ri; bus_space_handle_t fbh, mmioh; pcireg_t bar; diff --git a/sys/arch/luna88k/dev/lunafb.c b/sys/arch/luna88k/dev/lunafb.c index 4ec577993f5..f7c56172f60 100644 --- a/sys/arch/luna88k/dev/lunafb.c +++ b/sys/arch/luna88k/dev/lunafb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lunafb.c,v 1.26 2020/05/25 06:45:25 jsg Exp $ */ +/* $OpenBSD: lunafb.c,v 1.27 2020/05/25 09:55:48 jsg Exp $ */ /* $NetBSD: lunafb.c,v 1.7.6.1 2002/08/07 01:48:34 lukem Exp $ */ /*- @@ -111,8 +111,8 @@ void omfb_getdevconfig(paddr_t, struct om_hwdevconfig *); /* in omrasops.c */ int om_copycols(void *, int, int, int, int); int om_copyrows(void *, int, int, int num); -int om_erasecols(void *, int, int, int, long); -int om_eraserows(void *, int, int, long); +int om_erasecols(void *, int, int, int, uint32_t); +int om_eraserows(void *, int, int, uint32_t); void setup_omrasops1(struct rasops_info *); void setup_omrasops4(struct rasops_info *); @@ -131,7 +131,7 @@ const struct wsscreen_list omfb_screenlist = { int omfbioctl(void *, u_long, caddr_t, int, struct proc *); paddr_t omfbmmap(void *, off_t, int); int omfb_alloc_screen(void *, const struct wsscreen_descr *, - void **, int *, int *, long *); + void **, int *, int *, uint32_t *); void omfb_free_screen(void *, void *); int omfb_show_screen(void *, void *, int, void (*) (void *, int, int), void *); @@ -218,7 +218,7 @@ omfb_cnattach(void) { struct om_hwdevconfig *dc = &omfb_console_dc; struct rasops_info *ri = &dc->dc_ri; - long defattr; + uint32_t defattr; omfb_getdevconfig(OMFB_FB_WADDR, dc); ri->ri_ops.pack_attr(ri, 0, 0, 0, &defattr); @@ -469,7 +469,7 @@ omfb_getdevconfig(paddr_t paddr, struct om_hwdevconfig *dc) int omfb_alloc_screen(void *v, const struct wsscreen_descr *type, void **cookiep, - int *curxp, int *curyp, long *attrp) + int *curxp, int *curyp, uint32_t *attrp) { struct omfb_softc *sc = v; struct rasops_info *ri = &sc->sc_dc->dc_ri; diff --git a/sys/arch/luna88k/dev/omrasops.c b/sys/arch/luna88k/dev/omrasops.c index 70328f2df3e..70501079ce7 100644 --- a/sys/arch/luna88k/dev/omrasops.c +++ b/sys/arch/luna88k/dev/omrasops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: omrasops.c,v 1.15 2020/05/25 06:45:25 jsg Exp $ */ +/* $OpenBSD: omrasops.c,v 1.16 2020/05/25 09:55:48 jsg Exp $ */ /* $NetBSD: omrasops.c,v 1.1 2000/01/05 08:48:56 nisimura Exp $ */ /*- @@ -56,12 +56,12 @@ /* wscons emulator operations */ int om_copycols(void *, int, int, int, int); int om_copyrows(void *, int, int, int num); -int om_erasecols(void *, int, int, int, long); -int om_eraserows(void *, int, int, long); +int om_erasecols(void *, int, int, int, uint32_t); +int om_eraserows(void *, int, int, uint32_t); int om1_cursor(void *, int, int, int); -int om1_putchar(void *, int, int, u_int, long); +int om1_putchar(void *, int, int, u_int, uint32_t); int om4_cursor(void *, int, int, int); -int om4_putchar(void *, int, int, u_int, long); +int om4_putchar(void *, int, int, u_int, uint32_t); /* depth-depended setup functions */ void setup_omrasops1(struct rasops_info *); @@ -74,7 +74,7 @@ int om4_windowmove(struct rasops_info *, u_int16_t, u_int16_t, u_int16_t, u_int16_t, u_int16_t, u_int16_t, int16_t, int16_t); /* MI function in src/sys/dev/rasops/rasops.c */ -int rasops_pack_cattr(void *, int, int, int, long *); +int rasops_pack_cattr(void *, int, int, int, uint32_t *); static int (*om_windowmove)(struct rasops_info *, u_int16_t, u_int16_t, u_int16_t, u_int16_t, u_int16_t, u_int16_t, int16_t, int16_t); @@ -92,7 +92,7 @@ extern struct wsscreen_descr omfb_stdscreen; * - 1bpp version - */ int -om1_putchar(void *cookie, int row, int startcol, u_int uc, long attr) +om1_putchar(void *cookie, int row, int startcol, u_int uc, uint32_t attr) { struct rasops_info *ri = cookie; u_int8_t *p; @@ -157,7 +157,7 @@ om1_putchar(void *cookie, int row, int startcol, u_int uc, long attr) * - 4bpp version - */ int -om4_putchar(void *cookie, int row, int startcol, u_int uc, long attr) +om4_putchar(void *cookie, int row, int startcol, u_int uc, uint32_t attr) { struct rasops_info *ri = cookie; u_int8_t *p; @@ -287,7 +287,7 @@ om4_putchar(void *cookie, int row, int startcol, u_int uc, long attr) } int -om_erasecols(void *cookie, int row, int col, int num, long attr) +om_erasecols(void *cookie, int row, int col, int num, uint32_t attr) { struct rasops_info *ri = cookie; int fg, bg; @@ -311,7 +311,7 @@ om_erasecols(void *cookie, int row, int col, int num, long attr) } int -om_eraserows(void *cookie, int row, int num, long attr) +om_eraserows(void *cookie, int row, int num, uint32_t attr) { struct rasops_info *ri = cookie; int fg, bg; diff --git a/sys/arch/macppc/macppc/ofw_machdep.c b/sys/arch/macppc/macppc/ofw_machdep.c index 23a8d2cc3f8..42542bea79d 100644 --- a/sys/arch/macppc/macppc/ofw_machdep.c +++ b/sys/arch/macppc/macppc/ofw_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ofw_machdep.c,v 1.58 2020/05/25 06:45:25 jsg Exp $ */ +/* $OpenBSD: ofw_machdep.c,v 1.59 2020/05/25 09:55:48 jsg Exp $ */ /* $NetBSD: ofw_machdep.c,v 1.1 1996/09/30 16:34:50 ws Exp $ */ /* @@ -486,7 +486,7 @@ of_display_console(void) { struct ofwfb *fb = &ofwfb; struct rasops_info *ri = &fb->ofw_ri; - long defattr; + uint32_t defattr; ri->ri_width = cons_width; ri->ri_height = cons_height; diff --git a/sys/arch/macppc/pci/vgafb.c b/sys/arch/macppc/pci/vgafb.c index b18979f78be..e3752045b95 100644 --- a/sys/arch/macppc/pci/vgafb.c +++ b/sys/arch/macppc/pci/vgafb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vgafb.c,v 1.61 2020/05/25 06:45:25 jsg Exp $ */ +/* $OpenBSD: vgafb.c,v 1.62 2020/05/25 09:55:48 jsg Exp $ */ /* $NetBSD: vga.c,v 1.3 1996/12/02 22:24:54 cgd Exp $ */ /* @@ -66,7 +66,7 @@ struct vgafb_softc { int vgafb_ioctl(void *, u_long, caddr_t, int, struct proc *); paddr_t vgafb_mmap(void *, off_t, int); int vgafb_alloc_screen(void *, const struct wsscreen_descr *, void **, - int *, int *, long *); + int *, int *, uint32_t *); void vgafb_free_screen(void *, void *); int vgafb_show_screen(void *, void *, int, void (*cb)(void *, int, int), void *); @@ -179,7 +179,7 @@ int vgafb_console_init(struct vgafb_softc *sc) { struct rasops_info *ri = &sc->sc_ri; - long defattr; + uint32_t defattr; ri->ri_flg = RI_CENTER | RI_VCONS | RI_WRONLY; ri->ri_hw = sc; @@ -452,7 +452,7 @@ vgafb_burn(void *v, u_int on, u_int flags) int vgafb_alloc_screen(void *v, const struct wsscreen_descr *type, void **cookiep, - int *curxp, int *curyp, long *attrp) + int *curxp, int *curyp, uint32_t *attrp) { struct vgafb_softc *sc = v; struct rasops_info *ri = &sc->sc_ri; diff --git a/sys/arch/sgi/dev/gbe.c b/sys/arch/sgi/dev/gbe.c index 437a7c5508b..ba8ad0268e6 100644 --- a/sys/arch/sgi/dev/gbe.c +++ b/sys/arch/sgi/dev/gbe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gbe.c,v 1.22 2020/05/25 06:45:25 jsg Exp $ */ +/* $OpenBSD: gbe.c,v 1.23 2020/05/25 09:55:48 jsg Exp $ */ /* * Copyright (c) 2007, 2008, 2009 Joel Sing <jsing@openbsd.org> @@ -124,7 +124,7 @@ void gbe_loadcmap(struct gbe_screen *, u_int, u_int); int gbe_ioctl(void *, u_long, caddr_t, int, struct proc *); paddr_t gbe_mmap(void *, off_t, int); int gbe_alloc_screen(void *, const struct wsscreen_descr *, void **, - int *, int *, long *); + int *, int *, uint32_t *); void gbe_free_screen(void *, void *); int gbe_show_screen(void *, void *, int, void (*)(void *, int, int), void *); @@ -138,11 +138,11 @@ void gbe_rop(struct gbe_softc *, int, int, int, int, int); void gbe_copyrect(struct gbe_softc *, int, int, int, int, int, int, int); void gbe_fillrect(struct gbe_softc *, int, int, int, int, int); int gbe_do_cursor(struct rasops_info *); -int gbe_putchar(void *, int, int, u_int, long); +int gbe_putchar(void *, int, int, u_int, uint32_t); int gbe_copycols(void *, int, int, int, int); -int gbe_erasecols(void *, int, int, int, long); +int gbe_erasecols(void *, int, int, int, uint32_t); int gbe_copyrows(void *, int, int, int); -int gbe_eraserows(void *, int, int, long); +int gbe_eraserows(void *, int, int, uint32_t); static struct gbe_screen gbe_consdata; static int gbe_console; @@ -209,7 +209,7 @@ gbe_attach(struct device *parent, struct device *self, void *aux) int fb_nsegs; int ro_nsegs; uint32_t val; - long attr; + uint32_t attr; printf(": "); @@ -945,7 +945,7 @@ gbe_mmap(void *v, off_t offset, int protection) int gbe_alloc_screen(void *v, const struct wsscreen_descr *type, void **cookiep, - int *curxp, int *curyp, long *attrp) + int *curxp, int *curyp, uint32_t *attrp) { struct gbe_screen *screen = (struct gbe_screen *)v; struct gbe_softc *gsc = (struct gbe_softc *)screen->sc; @@ -1191,7 +1191,7 @@ gbe_do_cursor(struct rasops_info *ri) } int -gbe_putchar(void *cookie, int row, int col, u_int uc, long attr) +gbe_putchar(void *cookie, int row, int col, u_int uc, uint32_t attr) { struct rasops_info *ri = cookie; struct gbe_softc *gsc = ri->ri_hw; @@ -1234,7 +1234,7 @@ gbe_copycols(void *cookie, int row, int src, int dst, int num) } int -gbe_erasecols(void *cookie, int row, int col, int num, long attr) +gbe_erasecols(void *cookie, int row, int col, int num, uint32_t attr) { struct rasops_info *ri = cookie; struct gbe_softc *sc = ri->ri_hw; @@ -1269,7 +1269,7 @@ gbe_copyrows(void *cookie, int src, int dst, int num) } int -gbe_eraserows(void *cookie, int row, int num, long attr) +gbe_eraserows(void *cookie, int row, int num, uint32_t attr) { struct rasops_info *ri = cookie; struct gbe_softc *sc = ri->ri_hw; @@ -1326,7 +1326,7 @@ gbe_cnattach(bus_space_tag_t iot, bus_addr_t addr) uint32_t val; paddr_t pa; vaddr_t va; - long attr; + uint32_t attr; /* * Setup GBE for use as early console. diff --git a/sys/arch/sgi/dev/impact.c b/sys/arch/sgi/dev/impact.c index 0d79d017ca7..f8ade562d2e 100644 --- a/sys/arch/sgi/dev/impact.c +++ b/sys/arch/sgi/dev/impact.c @@ -1,4 +1,4 @@ -/* $OpenBSD: impact.c,v 1.10 2020/05/25 06:45:25 jsg Exp $ */ +/* $OpenBSD: impact.c,v 1.11 2020/05/25 09:55:48 jsg Exp $ */ /* * Copyright (c) 2010, 2012 Miodrag Vallat. @@ -71,7 +71,7 @@ struct cfdriver impact_cd = { struct impact_screen { struct rasops_info ri; - long defattr; + uint32_t defattr; struct wsdisplay_charcell *bs; struct impact_softc *sc; @@ -101,11 +101,11 @@ int impact_init_screen(struct impact_screen *); void impact_rop(struct impact_screen *, int, int, int, int, int, u_int); void impact_fillrect(struct impact_screen *, int, int, int, int, u_int); int impact_do_cursor(struct rasops_info *); -int impact_putchar(void *, int, int, u_int, long); +int impact_putchar(void *, int, int, u_int, uint32_t); int impact_copycols(void *, int, int, int, int); -int impact_erasecols(void *, int, int, int, long); +int impact_erasecols(void *, int, int, int, uint32_t); int impact_copyrows(void *, int, int, int); -int impact_eraserows(void *, int, int, long); +int impact_eraserows(void *, int, int, uint32_t); /* * Interfaces for wscons. @@ -113,7 +113,7 @@ int impact_eraserows(void *, int, int, long); int impact_ioctl(void *, u_long, caddr_t, int, struct proc *); paddr_t impact_mmap(void *, off_t, int); int impact_alloc_screen(void *, const struct wsscreen_descr *, void **, - int *, int *, long *); + int *, int *, uint32_t *); void impact_free_screen(void *, void *); int impact_show_screen(void *, void *, int, void (*)(void *, int, int), void *); @@ -433,7 +433,7 @@ impact_mmap(void *v, off_t offset, int prot) int impact_alloc_screen(void *v, const struct wsscreen_descr *type, - void **cookiep, int *curxp, int *curyp, long *attrp) + void **cookiep, int *curxp, int *curyp, uint32_t *attrp) { struct impact_screen *scr = (struct impact_screen *)v; struct rasops_info *ri = &scr->ri; @@ -537,7 +537,7 @@ impact_do_cursor(struct rasops_info *ri) } int -impact_putchar(void *cookie, int row, int col, u_int uc, long attr) +impact_putchar(void *cookie, int row, int col, u_int uc, uint32_tattr) { struct rasops_info *ri = cookie; struct impact_screen *scr = ri->ri_hw; @@ -660,7 +660,7 @@ impact_copycols(void *cookie, int row, int src, int dst, int num) } int -impact_erasecols(void *cookie, int row, int col, int num, long attr) +impact_erasecols(void *cookie, int row, int col, int num, uint32_t attr) { struct rasops_info *ri = cookie; struct impact_screen *scr = ri->ri_hw; @@ -709,7 +709,7 @@ impact_copyrows(void *cookie, int src, int dst, int num) } int -impact_eraserows(void *cookie, int row, int num, long attr) +impact_eraserows(void *cookie, int row, int num, uint32_t attr) { struct rasops_info *ri = cookie; struct impact_screen *scr = ri->ri_hw; diff --git a/sys/arch/sgi/gio/grtwo.c b/sys/arch/sgi/gio/grtwo.c index 527f003ec30..1090dedff94 100644 --- a/sys/arch/sgi/gio/grtwo.c +++ b/sys/arch/sgi/gio/grtwo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grtwo.c,v 1.14 2020/05/25 06:45:25 jsg Exp $ */ +/* $OpenBSD: grtwo.c,v 1.15 2020/05/25 09:55:48 jsg Exp $ */ /* $NetBSD: grtwo.c,v 1.11 2009/11/22 19:09:15 mbalmer Exp $ */ /* @@ -94,7 +94,7 @@ struct grtwo_softc { struct grtwo_devconfig { struct rasops_info dc_ri; - long dc_defattr; + uint32_t dc_defattr; struct wsdisplay_charcell *dc_bs; uint32_t dc_addr; @@ -131,7 +131,7 @@ const struct cfattach grtwo_ca = { int grtwo_ioctl(void *, u_long, caddr_t, int, struct proc *); paddr_t grtwo_mmap(void *, off_t, int); int grtwo_alloc_screen(void *, const struct wsscreen_descr *, void **, - int *, int *, long *); + int *, int *, uint32_t *); void grtwo_free_screen(void *, void *); int grtwo_show_screen(void *, void *, int, void (*)(void *, int, int), void *); @@ -151,11 +151,11 @@ static struct wsdisplay_accessops grtwo_accessops = { }; int grtwo_cursor(void *, int, int, int); -int grtwo_putchar(void *, int, int, u_int, long); +int grtwo_putchar(void *, int, int, u_int, uint32_t); int grtwo_copycols(void *, int, int, int, int); -int grtwo_erasecols(void *, int, int, int, long); +int grtwo_erasecols(void *, int, int, int, uint32_t); int grtwo_copyrows(void *, int, int, int); -int grtwo_eraserows(void *, int, int, long); +int grtwo_eraserows(void *, int, int, uint32_t); void grtwo_wait_gfifo(struct grtwo_devconfig *); static __inline__ @@ -457,7 +457,7 @@ grtwo_cnattach(struct gio_attach_args *ga) { struct rasops_info *ri = &grtwo_console_dc.dc_ri; struct wsdisplay_charcell *cell; - long defattr; + uint32_t defattr; int rc; int i; @@ -562,7 +562,7 @@ grtwo_cursor(void *c, int on, int row, int col) } int -grtwo_putchar(void *c, int row, int col, u_int ch, long attr) +grtwo_putchar(void *c, int row, int col, u_int ch, uint32_t attr) { struct rasops_info *ri = c; struct grtwo_devconfig *dc = ri->ri_hw; @@ -709,7 +709,7 @@ grtwo_copycols(void *c, int row, int src, int dst, int ncol) } int -grtwo_erasecols(void *c, int row, int startcol, int ncol, long attr) +grtwo_erasecols(void *c, int row, int startcol, int ncol, uint32_t attr) { struct rasops_info *ri = c; struct grtwo_devconfig *dc = ri->ri_hw; @@ -773,7 +773,7 @@ grtwo_copyrows(void *c, int src, int dst, int nrow) } int -grtwo_eraserows(void *c, int startrow, int nrow, long attr) +grtwo_eraserows(void *c, int startrow, int nrow, uint32_t attr) { struct rasops_info *ri = c; struct grtwo_devconfig *dc = ri->ri_hw; @@ -813,7 +813,7 @@ grtwo_eraserows(void *c, int startrow, int nrow, long attr) int grtwo_alloc_screen(void *v, const struct wsscreen_descr * type, void **cookiep, - int *curxp, int *curyp, long *attrp) + int *curxp, int *curyp, uint32_t *attrp) { struct grtwo_devconfig *dc = v; struct rasops_info *ri = &dc->dc_ri; diff --git a/sys/arch/sgi/gio/light.c b/sys/arch/sgi/gio/light.c index 5d221623cf9..ad7289f343d 100644 --- a/sys/arch/sgi/gio/light.c +++ b/sys/arch/sgi/gio/light.c @@ -1,4 +1,4 @@ -/* $OpenBSD: light.c,v 1.9 2020/05/25 06:45:25 jsg Exp $ */ +/* $OpenBSD: light.c,v 1.10 2020/05/25 09:55:48 jsg Exp $ */ /* $NetBSD: light.c,v 1.5 2007/03/04 06:00:39 christos Exp $ */ /* @@ -88,7 +88,7 @@ struct light_softc { struct light_devconfig { struct rasops_info dc_ri; - long dc_defattr; + uint32_t dc_defattr; uint32_t dc_addr; bus_space_tag_t dc_st; @@ -122,7 +122,7 @@ const struct cfattach light_ca = { int light_ioctl(void *, u_long, caddr_t, int, struct proc *); paddr_t light_mmap(void *, off_t, int); int light_alloc_screen(void *, const struct wsscreen_descr *, void **, - int *, int *, long *); + int *, int *, uint32_t *); void light_free_screen(void *, void *); int light_show_screen(void *, void *, int, void (*)(void *, int, int), void *); @@ -142,11 +142,11 @@ struct wsdisplay_accessops light_accessops = { }; int light_do_cursor(struct rasops_info *); -int light_putchar(void *, int, int, u_int, long); +int light_putchar(void *, int, int, u_int, uint32_t); int light_copycols(void *, int, int, int, int); -int light_erasecols(void *, int, int, int, long); +int light_erasecols(void *, int, int, int, uint32_t); int light_copyrows(void *, int, int, int); -int light_eraserows(void *, int, int, long); +int light_eraserows(void *, int, int, uint32_t); static __inline__ uint32_t rex_read(struct light_devconfig *, uint32_t, uint32_t); @@ -442,7 +442,7 @@ int light_cnattach(struct gio_attach_args *ga) { struct rasops_info *ri = &light_console_dc.dc_ri; - long defattr; + uint32_t defattr; light_attach_common(&light_console_dc, ga); light_init_screen(&light_console_dc); @@ -524,7 +524,7 @@ light_do_cursor(struct rasops_info *ri) } int -light_putchar(void *c, int row, int col, u_int ch, long attr) +light_putchar(void *c, int row, int col, u_int ch, uint32_t attr) { struct rasops_info *ri = c; struct light_devconfig *dc = ri->ri_hw; @@ -614,7 +614,7 @@ light_copycols(void *c, int row, int srccol, int dstcol, int ncols) /* erase a set of columns in the same line */ int -light_erasecols(void *c, int row, int startcol, int ncols, long attr) +light_erasecols(void *c, int row, int startcol, int ncols, uint32_t attr) { struct rasops_info *ri = c; struct light_devconfig *dc = ri->ri_hw; @@ -657,7 +657,7 @@ light_copyrows(void *c, int srcrow, int dstrow, int nrows) /* erase a set of complete rows */ int -light_eraserows(void *c, int row, int nrows, long attr) +light_eraserows(void *c, int row, int nrows, uint32_t attr) { struct rasops_info *ri = c; struct light_devconfig *dc = ri->ri_hw; @@ -730,7 +730,7 @@ light_mmap(void *v, off_t off, int prot) int light_alloc_screen(void *v, const struct wsscreen_descr *type, void **cookiep, - int *curxp, int *curyp, long *attrp) + int *curxp, int *curyp, uint32_t *attrp) { struct light_devconfig *dc = v; struct rasops_info *ri = &dc->dc_ri; diff --git a/sys/arch/sgi/gio/newport.c b/sys/arch/sgi/gio/newport.c index dfc31e78f06..bb0416ad59b 100644 --- a/sys/arch/sgi/gio/newport.c +++ b/sys/arch/sgi/gio/newport.c @@ -1,4 +1,4 @@ -/* $OpenBSD: newport.c,v 1.12 2020/05/25 06:45:25 jsg Exp $ */ +/* $OpenBSD: newport.c,v 1.13 2020/05/25 09:55:48 jsg Exp $ */ /* $NetBSD: newport.c,v 1.15 2009/05/12 23:51:25 macallan Exp $ */ /* @@ -76,7 +76,7 @@ struct newport_softc { struct newport_devconfig { struct rasops_info dc_ri; - long dc_defattr; + uint32_t dc_defattr; uint32_t dc_addr; bus_space_tag_t dc_st; @@ -113,7 +113,7 @@ const struct cfattach newport_ca = { int newport_ioctl(void *, u_long, caddr_t, int, struct proc *); paddr_t newport_mmap(void *, off_t, int); int newport_alloc_screen(void *, const struct wsscreen_descr *, void **, - int *, int *, long *); + int *, int *, uint32_t *); void newport_free_screen(void *, void *); int newport_show_screen(void *, void *, int, void (*)(void *, int, int), void *); @@ -131,11 +131,11 @@ struct wsdisplay_accessops newport_accessops = { }; int newport_do_cursor(struct rasops_info *); -int newport_putchar(void *, int, int, u_int, long); +int newport_putchar(void *, int, int, u_int, uint32_t); int newport_copycols(void *, int, int, int, int); -int newport_erasecols(void *, int, int, int, long); +int newport_erasecols(void *, int, int, int, uint32_t); int newport_copyrows(void *, int, int, int); -int newport_eraserows(void *, int, int, long); +int newport_eraserows(void *, int, int, uint32_t); static __inline__ void rex3_write(struct newport_devconfig *, bus_size_t, uint32_t); @@ -580,7 +580,7 @@ int newport_cnattach(struct gio_attach_args *ga) { struct rasops_info *ri = &newport_console_dc.dc_ri; - long defattr; + uint32_t defattr; int rc; newport_attach_common(&newport_console_dc, ga); @@ -665,7 +665,7 @@ newport_do_cursor(struct rasops_info *ri) } int -newport_putchar(void *c, int row, int col, u_int ch, long attr) +newport_putchar(void *c, int row, int col, u_int ch, uint32_t attr) { struct rasops_info *ri = c; struct newport_devconfig *dc = ri->ri_hw; @@ -749,7 +749,7 @@ newport_copycols(void *c, int row, int srccol, int dstcol, int ncols) } int -newport_erasecols(void *c, int row, int startcol, int ncols, long attr) +newport_erasecols(void *c, int row, int startcol, int ncols, uint32_t attr) { struct rasops_info *ri = c; struct newport_devconfig *dc = ri->ri_hw; @@ -786,7 +786,7 @@ newport_copyrows(void *c, int srcrow, int dstrow, int nrows) } int -newport_eraserows(void *c, int startrow, int nrows, long attr) +newport_eraserows(void *c, int startrow, int nrows, uint32_t attr) { struct rasops_info *ri = c; struct newport_devconfig *dc = ri->ri_hw; @@ -810,7 +810,7 @@ newport_eraserows(void *c, int startrow, int nrows, long attr) int newport_alloc_screen(void *v, const struct wsscreen_descr *type, - void **cookiep, int *curxp, int *curyp, long *attrp) + void **cookiep, int *curxp, int *curyp, uint32_t *attrp) { struct newport_devconfig *dc = v; struct rasops_info *ri = &dc->dc_ri; diff --git a/sys/arch/sgi/xbow/odyssey.c b/sys/arch/sgi/xbow/odyssey.c index d606eff1140..00e3a552525 100644 --- a/sys/arch/sgi/xbow/odyssey.c +++ b/sys/arch/sgi/xbow/odyssey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: odyssey.c,v 1.13 2020/05/25 06:45:25 jsg Exp $ */ +/* $OpenBSD: odyssey.c,v 1.14 2020/05/25 09:55:48 jsg Exp $ */ /* * Copyright (c) 2009, 2010 Joel Sing <jsing@openbsd.org> * @@ -63,7 +63,7 @@ struct odyssey_screen { struct rasops_info ri; /* Screen raster display info. */ struct odyssey_cmap cmap; /* Display colour map. */ - long attr; /* Rasops attributes. */ + uint32_t attr; /* Rasops attributes. */ int width; /* Width in pixels. */ int height; /* Height in pixels. */ @@ -109,11 +109,11 @@ void odyssey_rop(struct odyssey_softc *, int, int, int, int, int, int); void odyssey_copyrect(struct odyssey_softc *, int, int, int, int, int, int); void odyssey_fillrect(struct odyssey_softc *, int, int, int, int, u_int); int odyssey_do_cursor(struct rasops_info *); -int odyssey_putchar(void *, int, int, u_int, long); +int odyssey_putchar(void *, int, int, u_int, uint32_t); int odyssey_copycols(void *, int, int, int, int); -int odyssey_erasecols(void *, int, int, int, long); +int odyssey_erasecols(void *, int, int, int, uint32_t); int odyssey_copyrows(void *, int, int, int); -int odyssey_eraserows(void *, int, int, long); +int odyssey_eraserows(void *, int, int, uint32_t); u_int32_t ieee754_sp(uint); @@ -123,7 +123,7 @@ u_int32_t ieee754_sp(uint); int odyssey_ioctl(void *, u_long, caddr_t, int, struct proc *); paddr_t odyssey_mmap(void *, off_t, int); int odyssey_alloc_screen(void *, const struct wsscreen_descr *, void **, - int *, int *, long *); + int *, int *, uint32_t *); void odyssey_free_screen(void *, void *); int odyssey_show_screen(void *, void *, int, void (*)(void *, int, int), void *); @@ -653,7 +653,7 @@ odyssey_mmap(void *v, off_t offset, int protection) int odyssey_alloc_screen(void *v, const struct wsscreen_descr *type, - void **cookiep, int *curxp, int *curyp, long *attrp) + void **cookiep, int *curxp, int *curyp, uint32_t *attrp) { struct odyssey_screen *screen = (struct odyssey_screen *)v; struct odyssey_softc *sc = (struct odyssey_softc *)screen->sc; @@ -802,7 +802,7 @@ odyssey_do_cursor(struct rasops_info *ri) } int -odyssey_putchar(void *cookie, int row, int col, u_int uc, long attr) +odyssey_putchar(void *cookie, int row, int col, u_int uc, uint32_t attr) { struct rasops_info *ri = cookie; struct odyssey_softc *sc = ri->ri_hw; @@ -970,7 +970,7 @@ odyssey_copycols(void *cookie, int row, int src, int dst, int num) } int -odyssey_erasecols(void *cookie, int row, int col, int num, long attr) +odyssey_erasecols(void *cookie, int row, int col, int num, uint32_t attr) { struct rasops_info *ri = cookie; struct odyssey_softc *sc = ri->ri_hw; @@ -1022,7 +1022,7 @@ odyssey_copyrows(void *cookie, int src, int dst, int num) } int -odyssey_eraserows(void *cookie, int row, int num, long attr) +odyssey_eraserows(void *cookie, int row, int num, uint32_t attr) { struct rasops_info *ri = cookie; struct odyssey_softc *sc = ri->ri_hw; diff --git a/sys/arch/sparc64/dev/creator.c b/sys/arch/sparc64/dev/creator.c index 9c090cd504c..52a5cd870db 100644 --- a/sys/arch/sparc64/dev/creator.c +++ b/sys/arch/sparc64/dev/creator.c @@ -1,4 +1,4 @@ -/* $OpenBSD: creator.c,v 1.52 2020/05/25 06:45:25 jsg Exp $ */ +/* $OpenBSD: creator.c,v 1.53 2020/05/25 09:55:48 jsg Exp $ */ /* * Copyright (c) 2002 Jason L. Wright (jason@thought.net) @@ -54,8 +54,8 @@ void creator_ras_fifo_wait(struct creator_softc *, int); void creator_ras_wait(struct creator_softc *); void creator_ras_init(struct creator_softc *); int creator_ras_copyrows(void *, int, int, int); -int creator_ras_erasecols(void *, int, int, int, long int); -int creator_ras_eraserows(void *, int, int, long int); +int creator_ras_erasecols(void *, int, int, int, uint32_t); +int creator_ras_eraserows(void *, int, int, uint32_t); void creator_ras_fill(struct creator_softc *); void creator_ras_setfg(struct creator_softc *, int32_t); @@ -241,7 +241,7 @@ creator_ioctl(v, cmd, data, flags, p) sc->sc_mode = *(u_int *)data; if (sc->sc_mode == WSDISPLAYIO_MODE_EMUL) { struct rasops_info *ri = &sc->sc_sunfb.sf_ro; - long attr; + uint32_t attr; if ((sc->sc_sunfb.sf_dev.dv_cfdata->cf_flags & CREATOR_CFFLAG_NOACCEL) == 0) @@ -594,7 +594,7 @@ int creator_ras_eraserows(cookie, row, n, attr) void *cookie; int row, n; - long int attr; + uint32_t attr; { struct rasops_info *ri = cookie; struct creator_softc *sc = ri->ri_hw; @@ -634,7 +634,7 @@ int creator_ras_erasecols(cookie, row, col, n, attr) void *cookie; int row, col, n; - long int attr; + uint32_t attr; { struct rasops_info *ri = cookie; struct creator_softc *sc = ri->ri_hw; diff --git a/sys/arch/sparc64/dev/fb.c b/sys/arch/sparc64/dev/fb.c index 20866cce071..b24917a4b21 100644 --- a/sys/arch/sparc64/dev/fb.c +++ b/sys/arch/sparc64/dev/fb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fb.c,v 1.29 2020/05/25 06:45:25 jsg Exp $ */ +/* $OpenBSD: fb.c,v 1.30 2020/05/25 09:55:48 jsg Exp $ */ /* $NetBSD: fb.c,v 1.23 1997/07/07 23:30:22 pk Exp $ */ /* @@ -118,7 +118,7 @@ void fb_initwsd(struct sunfb *); void fb_updatecursor(struct rasops_info *); int fb_alloc_screen(void *, const struct wsscreen_descr *, void **, - int *, int *, long *); + int *, int *, uint32_t *); void fb_free_screen(void *, void *); int fb_show_screen(void *, void *, int, void (*)(void *, int, int), void *); @@ -311,7 +311,7 @@ fbwscons_console_init(struct sunfb *sf, int row) { struct rasops_info *ri = &sf->sf_ro; void *cookie; - long defattr; + uint32_t defattr; if (romgetcursoraddr(&sf->sf_crowp, &sf->sf_ccolp)) sf->sf_ccolp = sf->sf_crowp = NULL; @@ -444,7 +444,7 @@ fbwscons_attach(struct sunfb *sf, struct wsdisplay_accessops *op, int isconsole) */ int fb_alloc_screen(void *v, const struct wsscreen_descr *type, - void **cookiep, int *curxp, int *curyp, long *attrp) + void **cookiep, int *curxp, int *curyp, uint32_t *attrp) { struct sunfb *sf = v; struct rasops_info *ri = &sf->sf_ro; diff --git a/sys/arch/sparc64/dev/gfxp.c b/sys/arch/sparc64/dev/gfxp.c index e7bdae44f0e..2c6826ff0a8 100644 --- a/sys/arch/sparc64/dev/gfxp.c +++ b/sys/arch/sparc64/dev/gfxp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gfxp.c,v 1.13 2013/10/20 20:07:27 miod Exp $ */ +/* $OpenBSD: gfxp.c,v 1.14 2020/05/25 09:55:48 jsg Exp $ */ /* * Copyright (c) 2009 Mark Kettenis. @@ -148,9 +148,9 @@ int gfxp_putcmap(struct gfxp_softc *, struct wsdisplay_cmap *); void gfxp_setcolor(void *, u_int, u_int8_t, u_int8_t, u_int8_t); int gfxp_copycols(void *, int, int, int, int); -int gfxp_erasecols(void *, int, int, int, long); +int gfxp_erasecols(void *, int, int, int, uint32_t); int gfxp_copyrows(void *, int, int, int); -int gfxp_eraserows(void *, int, int, long); +int gfxp_eraserows(void *, int, int, uint32_t); void gfxp_init(struct gfxp_softc *); void gfxp_reinit(struct gfxp_softc *); @@ -467,7 +467,7 @@ gfxp_copycols(void *cookie, int row, int src, int dst, int num) } int -gfxp_erasecols(void *cookie, int row, int col, int num, long attr) +gfxp_erasecols(void *cookie, int row, int col, int num, uint32_t attr) { struct rasops_info *ri = cookie; struct gfxp_softc *sc = ri->ri_hw; @@ -502,7 +502,7 @@ gfxp_copyrows(void *cookie, int src, int dst, int num) } int -gfxp_eraserows(void *cookie, int row, int num, long attr) +gfxp_eraserows(void *cookie, int row, int num, uint32_t attr) { struct rasops_info *ri = cookie; struct gfxp_softc *sc = ri->ri_hw; diff --git a/sys/arch/sparc64/dev/ifb.c b/sys/arch/sparc64/dev/ifb.c index 029aa20965c..9286d2a0a0d 100644 --- a/sys/arch/sparc64/dev/ifb.c +++ b/sys/arch/sparc64/dev/ifb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ifb.c,v 1.22 2013/10/20 20:07:27 miod Exp $ */ +/* $OpenBSD: ifb.c,v 1.23 2020/05/25 09:55:48 jsg Exp $ */ /* * Copyright (c) 2007, 2008, 2009 Miodrag Vallat. @@ -331,18 +331,18 @@ void ifb_rop_ifb(void *, int, int, int, int, int, int, uint32_t, int32_t); void ifb_rop_jfb(void *, int, int, int, int, int, int, uint32_t, int32_t); int ifb_rop_wait(struct ifb_softc *); -int ifb_putchar_dumb(void *, int, int, u_int, long); +int ifb_putchar_dumb(void *, int, int, u_int, uint32_t); int ifb_copycols_dumb(void *, int, int, int, int); -int ifb_erasecols_dumb(void *, int, int, int, long); +int ifb_erasecols_dumb(void *, int, int, int, uint32_t); int ifb_copyrows_dumb(void *, int, int, int); -int ifb_eraserows_dumb(void *, int, int, long); +int ifb_eraserows_dumb(void *, int, int, uint32_t); int ifb_do_cursor_dumb(struct rasops_info *); -int ifb_putchar(void *, int, int, u_int, long); +int ifb_putchar(void *, int, int, u_int, uint32_t); int ifb_copycols(void *, int, int, int, int); -int ifb_erasecols(void *, int, int, int, long); +int ifb_erasecols(void *, int, int, int, uint32_t); int ifb_copyrows(void *, int, int, int); -int ifb_eraserows(void *, int, int, long); +int ifb_eraserows(void *, int, int, uint32_t); int ifb_do_cursor(struct rasops_info *); int @@ -843,7 +843,7 @@ ifb_mapregs(struct ifb_softc *sc, struct pci_attach_args *pa) */ int -ifb_putchar_dumb(void *cookie, int row, int col, u_int uc, long attr) +ifb_putchar_dumb(void *cookie, int row, int col, u_int uc, uint32_t attr) { struct rasops_info *ri = cookie; struct ifb_softc *sc = ri->ri_hw; @@ -871,7 +871,7 @@ ifb_copycols_dumb(void *cookie, int row, int src, int dst, int num) } int -ifb_erasecols_dumb(void *cookie, int row, int col, int num, long attr) +ifb_erasecols_dumb(void *cookie, int row, int col, int num, uint32_t attr) { struct rasops_info *ri = cookie; struct ifb_softc *sc = ri->ri_hw; @@ -899,7 +899,7 @@ ifb_copyrows_dumb(void *cookie, int src, int dst, int num) } int -ifb_eraserows_dumb(void *cookie, int row, int num, long attr) +ifb_eraserows_dumb(void *cookie, int row, int num, uint32_t attr) { struct rasops_info *ri = cookie; struct ifb_softc *sc = ri->ri_hw; @@ -1016,7 +1016,7 @@ ifb_copycols(void *cookie, int row, int src, int dst, int num) } int -ifb_erasecols(void *cookie, int row, int col, int num, long attr) +ifb_erasecols(void *cookie, int row, int col, int num, uint32_t attr) { struct rasops_info *ri = cookie; struct ifb_softc *sc = ri->ri_hw; @@ -1051,7 +1051,7 @@ ifb_copyrows(void *cookie, int src, int dst, int num) } int -ifb_eraserows(void *cookie, int row, int num, long attr) +ifb_eraserows(void *cookie, int row, int num, uint32_t attr) { struct rasops_info *ri = cookie; struct ifb_softc *sc = ri->ri_hw; diff --git a/sys/arch/sparc64/dev/machfb.c b/sys/arch/sparc64/dev/machfb.c index 967c634fc2f..c9a122c047e 100644 --- a/sys/arch/sparc64/dev/machfb.c +++ b/sys/arch/sparc64/dev/machfb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machfb.c,v 1.10 2014/07/28 15:00:27 jsg Exp $ */ +/* $OpenBSD: machfb.c,v 1.11 2020/05/25 09:55:48 jsg Exp $ */ /* * Copyright (c) 2009 Mark Kettenis. @@ -215,9 +215,9 @@ int machfb_putcmap(struct machfb_softc *, struct wsdisplay_cmap *); void machfb_setcolor(void *, u_int, u_int8_t, u_int8_t, u_int8_t); int machfb_copycols(void *, int, int, int, int); -int machfb_erasecols(void *, int, int, int, long); +int machfb_erasecols(void *, int, int, int, uint32_t); int machfb_copyrows(void *, int, int, int); -int machfb_eraserows(void *, int, int, long); +int machfb_eraserows(void *, int, int, uint32_t); void machfb_init(struct machfb_softc *); int machfb_wait_fifo(struct machfb_softc *, int); @@ -528,7 +528,7 @@ machfb_copycols(void *cookie, int row, int src, int dst, int num) } int -machfb_erasecols(void *cookie, int row, int col, int num, long attr) +machfb_erasecols(void *cookie, int row, int col, int num, uint32_t attr) { struct rasops_info *ri = cookie; struct machfb_softc *sc = ri->ri_hw; @@ -563,7 +563,7 @@ machfb_copyrows(void *cookie, int src, int dst, int num) } int -machfb_eraserows(void *cookie, int row, int num, long attr) +machfb_eraserows(void *cookie, int row, int num, uint32_t attr) { struct rasops_info *ri = cookie; struct machfb_softc *sc = ri->ri_hw; diff --git a/sys/arch/sparc64/dev/pcons.c b/sys/arch/sparc64/dev/pcons.c index 5f33896ba8f..bcde1e25101 100644 --- a/sys/arch/sparc64/dev/pcons.c +++ b/sys/arch/sparc64/dev/pcons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcons.c,v 1.24 2018/02/19 08:59:52 mpi Exp $ */ +/* $OpenBSD: pcons.c,v 1.25 2020/05/25 09:55:48 jsg Exp $ */ /* $NetBSD: pcons.c,v 1.7 2001/05/02 10:32:20 scw Exp $ */ /*- @@ -552,13 +552,13 @@ cn_get_magic(char *magic, int maglen) { #if NWSDISPLAY > 0 int pcons_alloc_screen(void *, const struct wsscreen_descr *, void **, - int *, int *, long *); + int *, int *, uint32_t *); void pcons_cursor(void *, int, int, int); void pcons_free_screen(void *, void *); int pcons_ioctl(void *, u_long, caddr_t, int, struct proc *); int pcons_mapchar(void *, int, unsigned int *); paddr_t pcons_mmap(void *, off_t, int); -int pcons_putchar(void *, int, int, u_int, long); +int pcons_putchar(void *, int, int, u_int, uint32_t); int pcons_show_screen(void *, void *, int, void (*)(void *, int, int), void *); @@ -590,7 +590,7 @@ struct wsdisplay_accessops pcons_accessops = { int pcons_alloc_screen(void *v, const struct wsscreen_descr *typ, void **cookiep, - int *curxp, int *curyp, long *attrp) + int *curxp, int *curyp, uint32_t *attrp) { struct pconssoftc *sc = v; int *rowp, *colp; @@ -664,7 +664,7 @@ pcons_mapchar(void *v, int uc, unsigned int *idx) } int -pcons_putchar(void *v, int row, int col, u_int uc, long attr) +pcons_putchar(void *v, int row, int col, u_int uc, uint32_t attr) { u_char buf[1]; int s; diff --git a/sys/arch/sparc64/dev/radeonfb.c b/sys/arch/sparc64/dev/radeonfb.c index 1f9d6d58e63..bafd767c310 100644 --- a/sys/arch/sparc64/dev/radeonfb.c +++ b/sys/arch/sparc64/dev/radeonfb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: radeonfb.c,v 1.5 2013/10/20 20:07:27 miod Exp $ */ +/* $OpenBSD: radeonfb.c,v 1.6 2020/05/25 09:55:48 jsg Exp $ */ /* * Copyright (c) 2009 Mark Kettenis. @@ -142,9 +142,9 @@ int radeonfb_putcmap(struct radeonfb_softc *, struct wsdisplay_cmap *); void radeonfb_setcolor(void *, u_int, u_int8_t, u_int8_t, u_int8_t); int radeonfb_copycols(void *, int, int, int, int); -int radeonfb_erasecols(void *, int, int, int, long); +int radeonfb_erasecols(void *, int, int, int, uint32_t); int radeonfb_copyrows(void *, int, int, int); -int radeonfb_eraserows(void *, int, int, long); +int radeonfb_eraserows(void *, int, int, uint32_t); void radeonfb_init(struct radeonfb_softc *); void radeonfb_wait_fifo(struct radeonfb_softc *, int); @@ -467,7 +467,7 @@ radeonfb_copycols(void *cookie, int row, int src, int dst, int num) } int -radeonfb_erasecols(void *cookie, int row, int col, int num, long attr) +radeonfb_erasecols(void *cookie, int row, int col, int num, uint32_t attr) { struct rasops_info *ri = cookie; struct radeonfb_softc *sc = ri->ri_hw; @@ -502,7 +502,7 @@ radeonfb_copyrows(void *cookie, int src, int dst, int num) } int -radeonfb_eraserows(void *cookie, int row, int num, long attr) +radeonfb_eraserows(void *cookie, int row, int num, uint32_t attr) { struct rasops_info *ri = cookie; struct radeonfb_softc *sc = ri->ri_hw; diff --git a/sys/arch/sparc64/dev/raptor.c b/sys/arch/sparc64/dev/raptor.c index fe8acb4d724..a11882e1dc9 100644 --- a/sys/arch/sparc64/dev/raptor.c +++ b/sys/arch/sparc64/dev/raptor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: raptor.c,v 1.8 2013/10/20 20:07:27 miod Exp $ */ +/* $OpenBSD: raptor.c,v 1.9 2020/05/25 09:55:48 jsg Exp $ */ /* * Copyright (c) 2009 Mark Kettenis. @@ -154,9 +154,9 @@ int raptor_putcmap(struct raptor_softc *, struct wsdisplay_cmap *); void raptor_setcolor(void *, u_int, u_int8_t, u_int8_t, u_int8_t); int raptor_copycols(void *, int, int, int, int); -int raptor_erasecols(void *, int, int, int, long); +int raptor_erasecols(void *, int, int, int, uint32_t); int raptor_copyrows(void *, int, int, int); -int raptor_eraserows(void *, int, int, long); +int raptor_eraserows(void *, int, int, uint32_t); void raptor_init(struct raptor_softc *); int raptor_wait(struct raptor_softc *); @@ -439,7 +439,7 @@ raptor_copycols(void *cookie, int row, int src, int dst, int num) } int -raptor_erasecols(void *cookie, int row, int col, int num, long attr) +raptor_erasecols(void *cookie, int row, int col, int num, uint32_t attr) { struct rasops_info *ri = cookie; struct raptor_softc *sc = ri->ri_hw; @@ -474,7 +474,7 @@ raptor_copyrows(void *cookie, int src, int dst, int num) } int -raptor_eraserows(void *cookie, int row, int num, long attr) +raptor_eraserows(void *cookie, int row, int num, uint32_t attr) { struct rasops_info *ri = cookie; struct raptor_softc *sc = ri->ri_hw; |