sync with OpenBSD -current

This commit is contained in:
purplerain 2024-10-06 20:38:55 +00:00
parent 8d26df7b18
commit ddc9562b79
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
16 changed files with 65 additions and 60 deletions

View file

@ -1,4 +1,4 @@
/* $OpenBSD: axppmic.c,v 1.20 2023/08/02 11:52:18 uaa Exp $ */
/* $OpenBSD: axppmic.c,v 1.21 2024/10/06 03:46:48 jsg Exp $ */
/*
* Copyright (c) 2017 Mark Kettenis <kettenis@openbsd.org>
*
@ -514,10 +514,6 @@ const struct cfattach axppmic_rsb_ca = {
NULL, axppmic_activate
};
struct cfdriver axppmic_rsb_cd = {
NULL, "axppmic", DV_DULL
};
uint8_t axppmic_rsb_read(struct axppmic_softc *, uint8_t);
void axppmic_rsb_write(struct axppmic_softc *, uint8_t, uint8_t);

View file

@ -1,4 +1,4 @@
/* $OpenBSD: atw.c,v 1.101 2024/05/13 01:15:50 jsg Exp $ */
/* $OpenBSD: atw.c,v 1.102 2024/10/06 01:12:15 jsg Exp $ */
/* $NetBSD: atw.c,v 1.69 2004/07/23 07:07:55 dyoung Exp $ */
/*-
@ -127,7 +127,6 @@
int atw_bbp_io_enable_delay = 20 * 1000;
int atw_bbp_io_disable_delay = 2 * 1000;
int atw_writewep_delay = 1000;
int atw_beacon_len_adjust = 4;
int atw_dwelltime = 200;
int atw_xindiv2 = 0;

View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_wi_usb.c,v 1.77 2024/05/23 03:21:09 jsg Exp $ */
/* $OpenBSD: if_wi_usb.c,v 1.78 2024/10/06 01:28:39 jsg Exp $ */
/*
* Copyright (c) 2003 Dale Rahn. All rights reserved.
@ -246,10 +246,6 @@ int wi_usb_match(struct device *, void *, void *);
void wi_usb_attach(struct device *, struct device *, void *);
int wi_usb_detach(struct device *, int);
struct cfdriver wi_usb_cd = {
NULL, "wi_usb", DV_IFNET
};
const struct cfattach wi_usb_ca = {
sizeof(struct wi_usb_softc), wi_usb_match, wi_usb_attach, wi_usb_detach
};

View file

@ -190,7 +190,7 @@ edid_print(struct edid_info *edid)
if (edid->edid_video_input & EDID_VIDEO_INPUT_BLANK_TO_BLACK)
printf("\tBlank-to-black setup\n");
if (edid->edid_video_input & EDID_VIDEO_INPUT_SEPARATE_SYNCS)
printf("\tSeperate syncs\n");
printf("\tSeparate syncs\n");
if (edid->edid_video_input & EDID_VIDEO_INPUT_COMPOSITE_SYNC)
printf("\tComposite sync\n");
if (edid->edid_video_input & EDID_VIDEO_INPUT_SYNC_ON_GRN)