diff options
| -rw-r--r-- | sys/arch/armv7/omap/amdisplay.c | 4 | ||||
| -rw-r--r-- | sys/dev/usb/udl.c | 4 | ||||
| -rw-r--r-- | sys/dev/videomode/edid.c | 12 | ||||
| -rw-r--r-- | sys/dev/videomode/edidvar.h | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/sys/arch/armv7/omap/amdisplay.c b/sys/arch/armv7/omap/amdisplay.c index a13d012e5cf..2508d116fef 100644 --- a/sys/arch/armv7/omap/amdisplay.c +++ b/sys/arch/armv7/omap/amdisplay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amdisplay.c,v 1.19 2024/11/02 15:00:26 miod Exp $ */ +/* $OpenBSD: amdisplay.c,v 1.20 2024/11/06 07:09:45 miod Exp $ */ /* * Copyright (c) 2016 Ian Sutton <ians@openbsd.org> * @@ -209,7 +209,7 @@ amdisplay_attach(struct device *parent, struct device *self, void *args) sc->sc_flags |= LCD_MODE_ALLOC; if (nxphdmi_get_edid(edid_buf, EDID_LENGTH) || - edid_parse(edid_buf, &sc->sc_edid)) { + edid_parse(DEVNAME(sc), edid_buf, &sc->sc_edid)) { printf("%s: no display attached.\n", DEVNAME(sc)); free(edid_buf, M_DEVBUF, EDID_LENGTH); amdisplay_detach(self, 0); diff --git a/sys/dev/usb/udl.c b/sys/dev/usb/udl.c index 958b37d26c5..3c37156311e 100644 --- a/sys/dev/usb/udl.c +++ b/sys/dev/usb/udl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udl.c,v 1.101 2024/11/02 15:00:26 miod Exp $ */ +/* $OpenBSD: udl.c,v 1.102 2024/11/06 07:09:45 miod Exp $ */ /* * Copyright (c) 2009 Marcus Glocker <mglocker@openbsd.org> @@ -2026,7 +2026,7 @@ udl_select_mode(struct udl_softc *sc) int index = MAX_DL_MODES, i; /* try to get the preferred mode from EDID */ - edid_parse(sc->sc_edid, &sc->sc_edid_info); + edid_parse(DN(sc), sc->sc_edid, &sc->sc_edid_info); #if defined(UDL_DEBUG) && defined(EDID_DEBUG) edid_print(&sc->sc_edid_info); #endif diff --git a/sys/dev/videomode/edid.c b/sys/dev/videomode/edid.c index 711e8ae9a2d..d647b2f0bac 100644 --- a/sys/dev/videomode/edid.c +++ b/sys/dev/videomode/edid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: edid.c,v 1.6 2024/11/02 15:00:26 miod Exp $ */ +/* $OpenBSD: edid.c,v 1.7 2024/11/06 07:09:45 miod Exp $ */ /* $NetBSD: edid.c,v 1.5 2007/03/07 19:56:40 macallan Exp $ */ /*- @@ -485,7 +485,7 @@ edid_block(struct edid_info *edid, uint8_t *data) * Gets EDID version in BCD, e.g. EDID v1.3 returned as 0x0103 */ int -edid_parse(uint8_t *data, struct edid_info *edid) +edid_parse(const char *devname, uint8_t *data, struct edid_info *edid) { uint16_t manfid, estmodes; const struct videomode *vmp; @@ -560,8 +560,8 @@ edid_parse(uint8_t *data, struct edid_info *edid) } #ifdef DIAGNOSTIC else - printf("no data for est. mode %s\n", - _edid_modes[i]); + printf("%s: no data for est. mode %s\n", + devname, _edid_modes[i]); #endif } } @@ -598,8 +598,8 @@ edid_parse(uint8_t *data, struct edid_info *edid) if (edid->edid_modes[i].dot_clock > max_dotclock) max_dotclock = edid->edid_modes[i].dot_clock; - printf("max_dotclock according to supported modes: %d\n", - max_dotclock); + printf("%s: max_dotclock according to supported modes: %d\n", + devname, max_dotclock); mhz = (max_dotclock + 999) / 1000; diff --git a/sys/dev/videomode/edidvar.h b/sys/dev/videomode/edidvar.h index caf044cb6cf..e1b006f1fb1 100644 --- a/sys/dev/videomode/edidvar.h +++ b/sys/dev/videomode/edidvar.h @@ -87,7 +87,7 @@ struct edid_info { }; int edid_is_valid(uint8_t *); -int edid_parse(uint8_t *, struct edid_info *); +int edid_parse(const char *, uint8_t *, struct edid_info *); void edid_print(struct edid_info *); #endif /* _DEV_VIDEOMODE_EDIDVAR_H */ |