summaryrefslogtreecommitdiff
path: root/sys/arch/sgi
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/sgi')
-rw-r--r--sys/arch/sgi/dev/gbe.c22
-rw-r--r--sys/arch/sgi/dev/impact.c20
-rw-r--r--sys/arch/sgi/gio/grtwo.c22
-rw-r--r--sys/arch/sgi/gio/light.c22
-rw-r--r--sys/arch/sgi/gio/newport.c22
-rw-r--r--sys/arch/sgi/xbow/odyssey.c20
6 files changed, 64 insertions, 64 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;
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;
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-23 04:32:48 +0000