[Openchrome-devel] xf86-video-openchrome: 2 commits - configure.ac src/via_outputs.c src/via_tv.c
Kevin Brace
kevinbrace at kemper.freedesktop.org
Wed Sep 7 20:42:05 UTC 2016
configure.ac | 2 +-
src/via_outputs.c | 4 ++--
src/via_tv.c | 12 ++++++------
3 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit bedc6badd3ae24e82e8de803b818bb54d327bc13
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Wed Sep 7 13:41:38 2016 -0700
Version bumped to 0.5.152
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/configure.ac b/configure.ac
index 6889e39..44f5c16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.5.151],
+ [0.5.152],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit a34b1919a7b9aebd9c53c7db534543cfc3b44b11
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Wed Sep 7 13:18:25 2016 -0700
Fixing incorrect logical negation
The previous way if statements with negation was written will
cause malfunctions.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_outputs.c b/src/via_outputs.c
index 8e89ac0..02978ee 100644
--- a/src/via_outputs.c
+++ b/src/via_outputs.c
@@ -336,11 +336,11 @@ viaProbePinStrapping(ScrnInfoPtr pScrn)
* 01: NTSC
* 10: PAL-N
* 11: PAL-NC */
- if ((~(sr13 & 0x08)) & (sr13 & 0x04)) {
+ if ((!(sr13 & 0x08)) & (sr13 & 0x04)) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"NTSC for the TV encoder.\n");
} else {
- if (~(sr13 & 0x08)) {
+ if (!(sr13 & 0x08)) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"PAL for the TV encoder.\n");
} else {
diff --git a/src/via_tv.c b/src/via_tv.c
index ed964b6..0213964 100644
--- a/src/via_tv.c
+++ b/src/via_tv.c
@@ -105,7 +105,7 @@ viaTVSetDisplaySource(ScrnInfoPtr pScrn, CARD8 displaySource)
* 1: 24-bit FPDP (Flat Panel Display Port) */
if ((sr12 & 0x40) && (sr12 & 0x20)) {
viaDVP0SetDisplaySource(pScrn, displaySource);
- } else if ((sr13 & 0x08) && (~(sr12 & 0x10))) {
+ } else if ((sr13 & 0x08) && (!(sr12 & 0x10))) {
viaDFPLowSetDisplaySource(pScrn, displaySource);
} else if (sr13 & 0x08) {
viaDVP1SetDisplaySource(pScrn, displaySource);
@@ -128,7 +128,7 @@ viaTVSetDisplaySource(ScrnInfoPtr pScrn, CARD8 displaySource)
* 3C5.12[4] - FPD4 pin strapping
* 0: Dual 12-bit FPDP (Flat Panel Display Port)
* 1: 24-bit FPDP (Flat Panel Display Port) */
- if ((sr12 & 0x40) & (sr12 & 0x20) &(~(sr12 & 0x10))) {
+ if ((sr12 & 0x40) & (sr12 & 0x20) &(!(sr12 & 0x10))) {
viaDVP0SetDisplaySource(pScrn, displaySource);
} else {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -145,7 +145,7 @@ viaTVSetDisplaySource(ScrnInfoPtr pScrn, CARD8 displaySource)
* 0: DVP1 is used as a DVP (Digital Video Port)
* 1: DVP1 is used as a capture port
*/
- if (~(sr13 & 0x40)) {
+ if (!(sr13 & 0x40)) {
viaDVP1SetDisplaySource(pScrn, displaySource);
} else {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -239,7 +239,7 @@ viaTVEnableIOPads(ScrnInfoPtr pScrn, CARD8 ioPadState)
* 1: 24-bit FPDP (Flat Panel Display Port) */
if ((sr12 & 0x40) && (sr12 & 0x20)) {
viaDVP0EnableIOPads(pScrn, ioPadState);
- } else if ((sr13 & 0x08) && (~(sr12 & 0x10))) {
+ } else if ((sr13 & 0x08) && (!(sr12 & 0x10))) {
viaDFPLowEnableIOPads(pScrn, ioPadState);
} else if (sr13 & 0x08) {
viaDVP1EnableIOPads(pScrn, ioPadState);
@@ -262,7 +262,7 @@ viaTVEnableIOPads(ScrnInfoPtr pScrn, CARD8 ioPadState)
* 3C5.12[4] - FPD4 pin strapping
* 0: Dual 12-bit FPDP (Flat Panel Display Port)
* 1: 24-bit FPDP (Flat Panel Display Port) */
- if ((sr12 & 0x40) & (sr12 & 0x20) &(~(sr12 & 0x10))) {
+ if ((sr12 & 0x40) & (sr12 & 0x20) &(!(sr12 & 0x10))) {
viaDVP0EnableIOPads(pScrn, ioPadState);
} else {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -279,7 +279,7 @@ viaTVEnableIOPads(ScrnInfoPtr pScrn, CARD8 ioPadState)
* 0: DVP1 is used as a DVP (Digital Video Port)
* 1: DVP1 is used as a capture port
*/
- if (~(sr13 & 0x40)) {
+ if (!(sr13 & 0x40)) {
viaDVP1EnableIOPads(pScrn, ioPadState);
} else {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
More information about the Openchrome-devel
mailing list