diff options
Diffstat (limited to 'sys/arch/sgi/dev')
| -rw-r--r-- | sys/arch/sgi/dev/gbe.c | 22 | ||||
| -rw-r--r-- | sys/arch/sgi/dev/impact.c | 20 |
2 files changed, 21 insertions, 21 deletions
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; |