From 0a3f7c435a71f5d318b35a38b3b86f640f3c810e Mon Sep 17 00:00:00 2001 From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:49:14 +0000 Subject: [PATCH] videomode: clean up empty lines in .c and .h files --- sys/dev/videomode/edid.c | 7 +++---- sys/dev/videomode/edidreg.h | 2 -- sys/dev/videomode/pickmode.c | 1 - sys/dev/videomode/vesagtf.c | 3 --- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/sys/dev/videomode/edid.c b/sys/dev/videomode/edid.c index 5bd7ee3ec3d4..41676676e876 100644 --- a/sys/dev/videomode/edid.c +++ b/sys/dev/videomode/edid.c @@ -133,10 +133,10 @@ edid_is_valid(uint8_t *d) { int sum = 0, i; uint8_t sig[8] = EDID_SIGNATURE; - + if (memcmp(d, sig, 8) != 0) return EINVAL; - + for (i = 0; i < 128; i++) sum += d[i]; if ((sum & 0xff) != 0) @@ -391,7 +391,7 @@ edid_det_timing(uint8_t *data, struct videomode *vmp) vblank = EDID_DET_TIMING_VBLANK(data); vsyncwid = EDID_DET_TIMING_VSYNC_WIDTH(data); vsyncoff = EDID_DET_TIMING_VSYNC_OFFSET(data); - + /* Borders are contained within the blank areas. */ vmp->hdisplay = hactive; @@ -644,4 +644,3 @@ edid_parse(uint8_t *data, struct edid_info *edid) return 0; } - diff --git a/sys/dev/videomode/edidreg.h b/sys/dev/videomode/edidreg.h index 29b04665c212..001a031023e9 100644 --- a/sys/dev/videomode/edidreg.h +++ b/sys/dev/videomode/edidreg.h @@ -54,7 +54,6 @@ #define EDID_OFFSET_MFG_TIMING 0x25 #define EDID_OFFSET_STD_TIMING 0x26 #define EDID_OFFSET_DESC_BLOCK 0x36 - #define EDID_SIGNATURE { 0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0 } /* assume x is 16-bit value */ @@ -210,7 +209,6 @@ #define EDID_DET_TIMING_FLAG_HSYNC_POSITIVE 0x02 #define EDID_DET_TIMING_FLAG_STEREO_MODE 0x01 /* stereo mode */ - /* N.B.: these tests assume that we already checked for detailed timing! */ #define EDID_BLOCK_TYPE(ptr) ((ptr)[3]) diff --git a/sys/dev/videomode/pickmode.c b/sys/dev/videomode/pickmode.c index 66dea82483e4..533a0ce6032b 100644 --- a/sys/dev/videomode/pickmode.c +++ b/sys/dev/videomode/pickmode.c @@ -77,7 +77,6 @@ pick_mode_by_ref(int width, int height, int refresh) DPRINTF("%s: looking for %d x %d at up to %d Hz\n", __func__, width, height, refresh); for (i = 0; i < videomode_count; i++) { - this = &videomode_list[i]; mref = this->dot_clock * 1000 / (this->htotal * this->vtotal); diff = abs(mref - refresh); diff --git a/sys/dev/videomode/vesagtf.c b/sys/dev/videomode/vesagtf.c index 7164ae420d58..9398e61b17a3 100644 --- a/sys/dev/videomode/vesagtf.c +++ b/sys/dev/videomode/vesagtf.c @@ -150,7 +150,6 @@ * */ - #ifdef _KERNEL #include @@ -203,7 +202,6 @@ print_value(int n, const char *name, unsigned val) #define print_value(n, name, val) #endif - /* * vert_refresh() - as defined by the GTF Timing Standard, compute the * Stage 1 Parameters using the vertical refresh frequency. In other @@ -566,7 +564,6 @@ vesagtf_mode_params(unsigned h_pixels, unsigned v_lines, unsigned freq, #endif - /* Stage 1 computations are now complete; I should really pass the results to another function and do the Stage 2 computations, but I only need a few more values so I'll just