xf86-video-intel: 3 commits - src/bios_reader/Makefile.am src/ch7017/ch7017.c src/ch7017/Makefile.am src/ch7xxx/ch7xxx.c src/ch7xxx/Makefile.am src/ivch/Makefile.am src/sil164/Makefile.am src/xvmc/Makefile.am
Eric Anholt
anholt at kemper.freedesktop.org
Sat Mar 31 03:31:40 EEST 2007
src/bios_reader/Makefile.am | 2 +-
src/ch7017/Makefile.am | 2 ++
src/ch7017/ch7017.c | 8 +++++---
src/ch7xxx/Makefile.am | 3 ++-
src/ch7xxx/ch7xxx.c | 8 +-------
src/ivch/Makefile.am | 3 ++-
src/sil164/Makefile.am | 3 ++-
src/xvmc/Makefile.am | 3 ++-
8 files changed, 17 insertions(+), 15 deletions(-)
New commits:
diff-tree e119eaabb2ad1ffc1d83f18199f49c52ec71b0fe (from fd98e88d1a6e0e8d35bda868e7afcb78d2d11524)
Author: Eric Anholt <eric at anholt.net>
Date: Fri Mar 30 17:09:18 2007 -0700
Warnings cleanup in ch7xxx.
diff --git a/src/ch7xxx/ch7xxx.c b/src/ch7xxx/ch7xxx.c
index 9ce581f..0a96555 100644
--- a/src/ch7xxx/ch7xxx.c
+++ b/src/ch7xxx/ch7xxx.c
@@ -74,11 +74,6 @@ struct ch7xxx_priv {
static void ch7xxx_save(I2CDevPtr d);
-static CARD8 ch7xxxFreqRegs[][7] =
- { { 0, 0x23, 0x08, 0x16, 0x30, 0x60, 0x00 },
- { 0, 0x23, 0x04, 0x26, 0x30, 0x60, 0x00 },
- { 0, 0x2D, 0x07, 0x26, 0x30, 0xE0, 0x00 } };
-
static char *ch7xxx_get_id(int vid)
{
int i;
@@ -125,7 +120,6 @@ ch7xxx_init(I2CBusPtr b, I2CSlaveAddr ad
/* this will detect the CH7xxx chip on the specified i2c bus */
struct ch7xxx_priv *dev_priv;
CARD8 vendor, device;
- unsigned char ch;
char *name;
dev_priv = xcalloc(1, sizeof(struct ch7xxx_priv));
@@ -183,7 +177,7 @@ static xf86OutputStatus
ch7xxx_detect(I2CDevPtr d)
{
struct ch7xxx_priv *dev_priv = d->DriverPrivate.ptr;
- CARD8 cdet, gpio, orig_pm, pm;
+ CARD8 cdet, orig_pm, pm;
ch7xxx_read(dev_priv, CH7xxx_PM, &orig_pm);
diff-tree fd98e88d1a6e0e8d35bda868e7afcb78d2d11524 (from 274b99e5e750228eba9a67773725a40ebaa9bf56)
Author: Eric Anholt <eric at anholt.net>
Date: Fri Mar 30 17:07:29 2007 -0700
Finish off some function renaming that was missed before.
Thanks to alanc for catching this.
diff --git a/src/ch7017/ch7017.c b/src/ch7017/ch7017.c
index 019dcea..7070c7d 100644
--- a/src/ch7017/ch7017.c
+++ b/src/ch7017/ch7017.c
@@ -59,6 +59,8 @@ struct ch7017_priv {
static void
ch7017_dump_regs(I2CDevPtr d);
+static void
+ch7017_dpms(I2CDevPtr d, int mode);
static Bool
ch7017_read(struct ch7017_priv *priv, int addr, CARD8 *val)
@@ -193,7 +195,7 @@ ch7017_mode_set(I2CDevPtr d, DisplayMode
lvds_power_down = (mode->HDisplay & 0x0f00) >> 8;
- ch7017Power(d, FALSE);
+ ch7017_dpms(d, DPMSModeOff);
ch7017_write(priv, CH7017_HORIZONTAL_ACTIVE_PIXEL_INPUT,
horizontal_active_pixel_input);
ch7017_write(priv, CH7017_HORIZONTAL_ACTIVE_PIXEL_OUTPUT,
@@ -210,7 +212,7 @@ ch7017_mode_set(I2CDevPtr d, DisplayMode
xf86DrvMsg(priv->d.pI2CBus->scrnIndex, X_INFO,
"Registers after mode setting\n");
- ch7017PrintRegs(d);
+ ch7017_dump_regs(d);
}
/* set the CH7017 power state */
@@ -279,7 +281,7 @@ ch7017_restore(I2CDevPtr d)
struct ch7017_priv *priv = d->DriverPrivate.ptr;
/* Power down before changing mode */
- ch7017Power(d, FALSE);
+ ch7017_dpms(d, DPMSModeOff);
ch7017_write(priv, CH7017_HORIZONTAL_ACTIVE_PIXEL_INPUT, priv->save_hapi);
ch7017_write(priv, CH7017_VERTICAL_ACTIVE_LINE_OUTPUT, priv->save_valo);
diff-tree 274b99e5e750228eba9a67773725a40ebaa9bf56 (from aa6a9abb34e93780c07563ab5b21d8c064ea0a1c)
Author: Eric Anholt <eric at anholt.net>
Date: Fri Mar 30 17:06:43 2007 -0700
Don't forget the warnings CFLAGS in subdirectories.
diff --git a/src/bios_reader/Makefile.am b/src/bios_reader/Makefile.am
index bba969b..8e03693 100644
--- a/src/bios_reader/Makefile.am
+++ b/src/bios_reader/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = @XORG_CFLAGS@ @XMODES_CFLAGS@
+AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @XMODES_CFLAGS@
noinst_PROGRAMS = bios_reader $(BIOS_DUMPER)
diff --git a/src/ch7017/Makefile.am b/src/ch7017/Makefile.am
index 45bf699..d757b3c 100644
--- a/src/ch7017/Makefile.am
+++ b/src/ch7017/Makefile.am
@@ -5,6 +5,8 @@
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
AM_CFLAGS = @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(srcdir)/.. -I$(srcdir)/../modes
+AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ @XMODES_CFLAGS@
+
ch7017_la_LTLIBRARIES = ch7017.la
ch7017_la_LDFLAGS = -module -avoid-version
ch7017_ladir = @moduledir@/drivers
diff --git a/src/ch7xxx/Makefile.am b/src/ch7xxx/Makefile.am
index 68f766c..49a5aa3 100644
--- a/src/ch7xxx/Makefile.am
+++ b/src/ch7xxx/Makefile.am
@@ -3,7 +3,8 @@
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(srcdir)/.. -I$(srcdir)/../modes
+AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
+ -I$(srcdir)/.. -I$(srcdir)/../modes
ch7xxx_la_LTLIBRARIES = ch7xxx.la
ch7xxx_la_LDFLAGS = -module -avoid-version
diff --git a/src/ivch/Makefile.am b/src/ivch/Makefile.am
index ace076c..cf05c01 100644
--- a/src/ivch/Makefile.am
+++ b/src/ivch/Makefile.am
@@ -3,7 +3,8 @@
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(srcdir)/.. -I$(srcdir)/../modes
+AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
+ -I$(srcdir)/.. -I$(srcdir)/../modes
ivch_la_LTLIBRARIES = ivch.la
ivch_la_LDFLAGS = -module -avoid-version
diff --git a/src/sil164/Makefile.am b/src/sil164/Makefile.am
index ac1b33c..de17bd0 100644
--- a/src/sil164/Makefile.am
+++ b/src/sil164/Makefile.am
@@ -3,7 +3,8 @@
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(srcdir)/.. -I$(srcdir)/../modes
+AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
+ -I$(srcdir)/.. -I$(srcdir)/../modes
sil164_la_LTLIBRARIES = sil164.la
sil164_la_LDFLAGS = -module -avoid-version
diff --git a/src/xvmc/Makefile.am b/src/xvmc/Makefile.am
index a9ea9d1..b5c9db9 100644
--- a/src/xvmc/Makefile.am
+++ b/src/xvmc/Makefile.am
@@ -3,7 +3,8 @@ lib_LTLIBRARIES=libI810XvMC.la
libI810XvMC_la_SOURCES = I810XvMC.c \
I810XvMC.h
-libI810XvMC_la_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
+libI810XvMC_la_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
+ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
libI810XvMC_la_LDFLAGS = -version-number 1:0:0
libI810XvMC_la_LIBADD = @DRI_LIBS@
endif
More information about the xorg-commit
mailing list