summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/udl.c4
-rw-r--r--sys/dev/videomode/edid.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/dev/usb/udl.c b/sys/dev/usb/udl.c
index e19ce99251f..958b37d26c5 100644
--- a/sys/dev/usb/udl.c
+++ b/sys/dev/usb/udl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: udl.c,v 1.100 2024/05/23 03:21:09 jsg Exp $ */
+/* $OpenBSD: udl.c,v 1.101 2024/11/02 15:00:26 miod Exp $ */
/*
* Copyright (c) 2009 Marcus Glocker <mglocker@openbsd.org>
@@ -2027,7 +2027,7 @@ udl_select_mode(struct udl_softc *sc)
/* try to get the preferred mode from EDID */
edid_parse(sc->sc_edid, &sc->sc_edid_info);
-#ifdef UDL_DEBUG
+#if defined(UDL_DEBUG) && defined(EDID_DEBUG)
edid_print(&sc->sc_edid_info);
#endif
if (sc->sc_edid_info.edid_preferred_mode != NULL) {
diff --git a/sys/dev/videomode/edid.c b/sys/dev/videomode/edid.c
index 84b57d9f7bb..711e8ae9a2d 100644
--- a/sys/dev/videomode/edid.c
+++ b/sys/dev/videomode/edid.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: edid.c,v 1.6 2024/11/02 15:00:26 miod Exp $ */
/* $NetBSD: edid.c,v 1.5 2007/03/07 19:56:40 macallan Exp $ */
/*-
@@ -50,6 +51,7 @@ int edid_std_timing(uint8_t *, struct videomode *);
int edid_det_timing(uint8_t *, struct videomode *);
void edid_block(struct edid_info *, uint8_t *);
+/* #define EDID_DEBUG */
#define EDIDVERBOSE 1
#define DIVIDE(x,y) (((x) + ((y) / 2)) / (y))
@@ -148,6 +150,7 @@ edid_is_valid(uint8_t *d)
return 0;
}
+#ifdef EDID_DEBUG
void
edid_print(struct edid_info *edid)
{
@@ -279,6 +282,7 @@ edid_print(struct edid_info *edid)
edid->edid_preferred_mode->htotal),
edid->edid_preferred_mode->vtotal));
}
+#endif
const struct videomode *
edid_mode_lookup_list(const char *name)