diff options
| author |   mpi <mpi@openbsd.org> | 2020-01-09 14:36:26 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2020-01-09 14:36:26 +0000 |
| commit | af3c181fd70dd3cbf33a79f8f63cf6ca375eb6ed (patch) | |
| tree | f3b496405e6dfc421b092bc006908d6f0e436490 | |
| parent | Convert sleeps of 1sec or more to tsleep_nsec(9). (diff) | |
| download | wireguard-openbsd-af3c181fd70dd3cbf33a79f8f63cf6ca375eb6ed.tar.xz wireguard-openbsd-af3c181fd70dd3cbf33a79f8f63cf6ca375eb6ed.zip | |
Rename udl_mode field to not shadow global `hz' variable.
ok mglocker@
| -rw-r--r-- | sys/dev/usb/udl.c | 18 | ||||
| -rw-r--r-- | sys/dev/usb/udl.h | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/sys/dev/usb/udl.c b/sys/dev/usb/udl.c index b9669a458df..7c59abc1382 100644 --- a/sys/dev/usb/udl.c +++ b/sys/dev/usb/udl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udl.c,v 1.90 2020/01/05 19:13:48 mpi Exp $ */ +/* $OpenBSD: udl.c,v 1.91 2020/01/09 14:36:26 mpi Exp $ */ /* * Copyright (c) 2009 Marcus Glocker <mglocker@openbsd.org> @@ -1245,7 +1245,7 @@ fail: } uint8_t -udl_lookup_mode(uint16_t hdisplay, uint16_t vdisplay, uint8_t hz, +udl_lookup_mode(uint16_t hdisplay, uint16_t vdisplay, uint8_t freq, uint16_t chip, uint32_t clock) { uint8_t idx = 0; @@ -1270,7 +1270,7 @@ udl_lookup_mode(uint16_t hdisplay, uint16_t vdisplay, uint8_t hz, while (idx < MAX_DL_MODES) { if ((udl_modes[idx].hdisplay == hdisplay) && (udl_modes[idx].vdisplay == vdisplay) && - (udl_modes[idx].hz == hz) && + (udl_modes[idx].freq == freq) && (udl_modes[idx].chip <= chip)) { return(idx); } @@ -2031,7 +2031,7 @@ udl_select_mode(struct udl_softc *sc) edid_print(&sc->sc_edid_info); #endif if (sc->sc_edid_info.edid_preferred_mode != NULL) { - mode.hz = + mode.freq = (sc->sc_edid_info.edid_preferred_mode->dot_clock * 1000) / (sc->sc_edid_info.edid_preferred_mode->htotal * sc->sc_edid_info.edid_preferred_mode->vtotal); @@ -2041,7 +2041,7 @@ udl_select_mode(struct udl_softc *sc) sc->sc_edid_info.edid_preferred_mode->hdisplay; mode.vdisplay = sc->sc_edid_info.edid_preferred_mode->vdisplay; - index = udl_lookup_mode(mode.hdisplay, mode.vdisplay, mode.hz, + index = udl_lookup_mode(mode.hdisplay, mode.vdisplay, mode.freq, sc->sc_chip, mode.clock); sc->sc_cur_mode = index; } else { @@ -2050,11 +2050,11 @@ udl_select_mode(struct udl_softc *sc) if (index == MAX_DL_MODES) { DPRINTF(1, "%s: %s: no mode line found for %dx%d @ %dHz!\n", - DN(sc), FUNC, mode.hdisplay, mode.vdisplay, mode.hz); + DN(sc), FUNC, mode.hdisplay, mode.vdisplay, mode.freq); i = 0; while (i < sc->sc_edid_info.edid_nmodes) { - mode.hz = + mode.freq = (sc->sc_edid_info.edid_modes[i].dot_clock * 1000) / (sc->sc_edid_info.edid_modes[i].htotal * sc->sc_edid_info.edid_modes[i].vtotal); @@ -2065,7 +2065,7 @@ udl_select_mode(struct udl_softc *sc) mode.vdisplay = sc->sc_edid_info.edid_modes[i].vdisplay; index = udl_lookup_mode(mode.hdisplay, mode.vdisplay, - mode.hz, sc->sc_chip, mode.clock); + mode.freq, sc->sc_chip, mode.clock); if (index < MAX_DL_MODES) if ((sc->sc_cur_mode == MAX_DL_MODES) || (index > sc->sc_cur_mode)) @@ -2090,7 +2090,7 @@ udl_select_mode(struct udl_softc *sc) sc->sc_depth = 16; DPRINTF(1, "%s: %s: %dx%d @ %dHz\n", - DN(sc), FUNC, mode.hdisplay, mode.vdisplay, mode.hz); + DN(sc), FUNC, mode.hdisplay, mode.vdisplay, mode.freq); } int diff --git a/sys/dev/usb/udl.h b/sys/dev/usb/udl.h index adf8caec0f5..9d80917db4c 100644 --- a/sys/dev/usb/udl.h +++ b/sys/dev/usb/udl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: udl.h,v 1.23 2017/04/08 02:57:25 deraadt Exp $ */ +/* $OpenBSD: udl.h,v 1.24 2020/01/09 14:36:26 mpi Exp $ */ /* * Copyright (c) 2009 Marcus Glocker <mglocker@openbsd.org> @@ -278,7 +278,7 @@ uint8_t udl_reg_vals_1920x1080_60[] = { /* 138.50 MHz 59.9 Hz */ struct udl_mode { uint16_t hdisplay; uint16_t vdisplay; - uint8_t hz; + uint8_t freq; uint16_t chip; uint32_t clock; #define UDL_MODE_SIZE 29 |