sync with OpenBSD -current
This commit is contained in:
parent
747d3a4033
commit
7bc640af07
GPG key ID:
F42C07F07E2E35B7
19 changed files with 98 additions and 146 deletions
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: atapiscsi.c,v 1.121 2024/05/26 10:01:01 jsg Exp $ */
|
||||
/* $OpenBSD: atapiscsi.c,v 1.122 2024/06/22 10:22:29 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* This code is derived from code with the copyright below.
|
||||
|
|
@ -409,7 +409,7 @@ wdc_atapi_send_cmd(struct scsi_xfer *sc_xfer)
|
|||
}
|
||||
|
||||
int
|
||||
wdc_atapi_ioctl (struct scsi_link *sc_link, u_long cmd, caddr_t addr, int flag)
|
||||
wdc_atapi_ioctl(struct scsi_link *sc_link, u_long cmd, caddr_t addr, int flag)
|
||||
{
|
||||
struct atapiscsi_softc *as = sc_link->bus->sb_adapter_softc;
|
||||
struct channel_softc *chp = as->chp;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: trm.c,v 1.45 2024/05/13 01:15:50 jsg Exp $
|
||||
/* $OpenBSD: trm.c,v 1.46 2024/06/22 10:22:29 jsg Exp $
|
||||
* ------------------------------------------------------------
|
||||
* O.S : OpenBSD
|
||||
* File Name : trm.c
|
||||
|
|
@ -550,7 +550,7 @@ trm_RecoverSRB(struct trm_softc *sc)
|
|||
* ------------------------------------------------------------
|
||||
*/
|
||||
void
|
||||
trm_reset (struct trm_softc *sc)
|
||||
trm_reset(struct trm_softc *sc)
|
||||
{
|
||||
const bus_space_handle_t ioh = sc->sc_iohandle;
|
||||
const bus_space_tag_t iot = sc->sc_iotag;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: gus.c,v 1.56 2024/05/28 09:27:08 jsg Exp $ */
|
||||
/* $OpenBSD: gus.c,v 1.57 2024/06/22 10:22:29 jsg Exp $ */
|
||||
/* $NetBSD: gus.c,v 1.51 1998/01/25 23:48:06 mycroft Exp $ */
|
||||
|
||||
/*-
|
||||
|
|
@ -3366,7 +3366,7 @@ gus_subattach(struct gus_softc *sc, struct isa_attach_args *ia)
|
|||
*/
|
||||
|
||||
int
|
||||
gus_test_iobase (bus_space_tag_t iot, int iobase)
|
||||
gus_test_iobase(bus_space_tag_t iot, int iobase)
|
||||
{
|
||||
bus_space_handle_t ioh1, ioh2, ioh3, ioh4;
|
||||
u_char s1, s2;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_ex.c,v 1.49 2023/05/30 08:30:01 jsg Exp $ */
|
||||
/* $OpenBSD: if_ex.c,v 1.50 2024/06/22 10:22:29 jsg Exp $ */
|
||||
/*
|
||||
* Copyright (c) 1997, Donald A. Schmidt
|
||||
* Copyright (c) 1996, Javier Martín Rueda (jmrueda@diatel.upm.es)
|
||||
|
|
@ -917,7 +917,7 @@ ex_get_media(struct ex_softc *sc)
|
|||
}
|
||||
|
||||
int
|
||||
ex_ifmedia_upd (struct ifnet *ifp)
|
||||
ex_ifmedia_upd(struct ifnet *ifp)
|
||||
{
|
||||
struct ex_softc *sc = ifp->if_softc;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -657,7 +657,7 @@ vesagtf_mode(unsigned x, unsigned y, unsigned refresh, struct videomode *vmp)
|
|||
|
||||
#ifndef _KERNEL
|
||||
void
|
||||
print_xf86_mode (struct videomode *vmp)
|
||||
print_xf86_mode(struct videomode *vmp)
|
||||
{
|
||||
float vf, hf;
|
||||
|
||||
|
|
@ -678,7 +678,7 @@ print_xf86_mode (struct videomode *vmp)
|
|||
}
|
||||
|
||||
int
|
||||
main (int argc, char *argv[])
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
struct videomode m;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue