From owner-svn-src-head@freebsd.org Tue Sep 1 21:49:15 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 850FA37C003; Tue, 1 Sep 2020 21:49:15 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh11R32nJz4TSX; Tue, 1 Sep 2020 21:49:15 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4BAB71FFF4; Tue, 1 Sep 2020 21:49:15 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LnFJT040562; Tue, 1 Sep 2020 21:49:15 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LnE1M040558; Tue, 1 Sep 2020 21:49:14 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012149.081LnE1M040558@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:49:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365139 - head/sys/dev/videomode X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/videomode X-SVN-Commit-Revision: 365139 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:49:15 -0000 Author: mjg Date: Tue Sep 1 21:49:14 2020 New Revision: 365139 URL: https://svnweb.freebsd.org/changeset/base/365139 Log: videomode: clean up empty lines in .c and .h files Modified: head/sys/dev/videomode/edid.c head/sys/dev/videomode/edidreg.h head/sys/dev/videomode/pickmode.c head/sys/dev/videomode/vesagtf.c Modified: head/sys/dev/videomode/edid.c ============================================================================== --- head/sys/dev/videomode/edid.c Tue Sep 1 21:48:55 2020 (r365138) +++ head/sys/dev/videomode/edid.c Tue Sep 1 21:49:14 2020 (r365139) @@ -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; } - Modified: head/sys/dev/videomode/edidreg.h ============================================================================== --- head/sys/dev/videomode/edidreg.h Tue Sep 1 21:48:55 2020 (r365138) +++ head/sys/dev/videomode/edidreg.h Tue Sep 1 21:49:14 2020 (r365139) @@ -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 */ @@ -209,7 +208,6 @@ #define EDID_DET_TIMING_FLAG_VSYNC_POSITIVE 0x04 #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]) Modified: head/sys/dev/videomode/pickmode.c ============================================================================== --- head/sys/dev/videomode/pickmode.c Tue Sep 1 21:48:55 2020 (r365138) +++ head/sys/dev/videomode/pickmode.c Tue Sep 1 21:49:14 2020 (r365139) @@ -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); Modified: head/sys/dev/videomode/vesagtf.c ============================================================================== --- head/sys/dev/videomode/vesagtf.c Tue Sep 1 21:48:55 2020 (r365138) +++ head/sys/dev/videomode/vesagtf.c Tue Sep 1 21:49:14 2020 (r365139) @@ -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 @@ -565,7 +563,6 @@ vesagtf_mode_params(unsigned h_pixels, unsigned v_line print_value(22, "[H FREQ]", h_freq); #endif - /* Stage 1 computations are now complete; I should really pass the results to another function and do the Stage 2