SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-06-23 03:24:22 +00:00
parent 747d3a4033
commit 7bc640af07
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
19 changed files with 98 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sys/dev/pci/bktr/bktr_core.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: bktr_core.c,v 1.43 2022/01/09 05:42:58 jsg Exp $ */
/* $OpenBSD: bktr_core.c,v 1.44 2024/06/22 10:22:29 jsg Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp $ */
/*
@ -2367,7 +2367,7 @@ dump_bt848( bktr_ptr_t bktr )
#define BKTR_TEST_RISC_STATUS_BIT3 (1U << 31)
static bool_t
notclipped (bktr_reg_t * bktr, int x, int width) {
notclipped(bktr_reg_t * bktr, int x, int width) {
int i;
bktr_clip_t * clip_node;
bktr->clip_start = -1;

10
sys/dev/pci/sv.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: sv.c,v 1.44 2024/05/24 06:02:58 jsg Exp $ */
/* $OpenBSD: sv.c,v 1.45 2024/06/22 10:22:29 jsg Exp $ */
/*
* Copyright (c) 1998 Constantine Paul Sapuntzakis
@ -170,19 +170,19 @@ static __inline__ void sv_write_indirect(struct sv_softc *, u_int8_t, u_int8_t )
static void sv_init_mixer(struct sv_softc *);
static __inline__ void
sv_write (struct sv_softc *sc, u_int8_t reg, u_int8_t val)
sv_write(struct sv_softc *sc, u_int8_t reg, u_int8_t val)
{
bus_space_write_1(sc->sc_iot, sc->sc_ioh, reg, val);
}
static __inline__ u_int8_t
sv_read (struct sv_softc *sc, u_int8_t reg)
sv_read(struct sv_softc *sc, u_int8_t reg)
{
return (bus_space_read_1(sc->sc_iot, sc->sc_ioh, reg));
}
static __inline__ u_int8_t
sv_read_indirect (struct sv_softc *sc, u_int8_t reg)
sv_read_indirect(struct sv_softc *sc, u_int8_t reg)
{
u_int8_t iaddr = 0;
@ -196,7 +196,7 @@ sv_read_indirect (struct sv_softc *sc, u_int8_t reg)
}
static __inline__ void
sv_write_indirect (struct sv_softc *sc, u_int8_t reg, u_int8_t val)
sv_write_indirect(struct sv_softc *sc, u_int8_t reg, u_int8_t val)
{
u_int8_t iaddr = 0;
#ifdef DIAGNOSTIC

8
sys/dev/pci/tga.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: tga.c,v 1.43 2022/07/15 17:57:26 kettenis Exp $ */
/* $OpenBSD: tga.c,v 1.44 2024/06/22 10:22:29 jsg Exp $ */
/* $NetBSD: tga.c,v 1.40 2002/03/13 15:05:18 ad Exp $ */
/*
@ -548,8 +548,8 @@ tgaattach(parent, self, aux)
#endif
}
void
tga_config_interrupts (d)
void
tga_config_interrupts(d)
struct device *d;
{
struct tga_softc *sc = (struct tga_softc *)d;
@ -1435,7 +1435,7 @@ tga_eraserows(c, row, num, attr)
}
int
tga_erasecols (c, row, col, num, attr)
tga_erasecols(c, row, col, num, attr)
void *c;
int row, col, num;
uint32_t attr;