xserver-xorg-video-siliconmotion: Changes to 'debian-unstable'
ChangeLog | 108 ++++++++++++++++++++++++++++++++++++++++
configure.ac | 2
debian/changelog | 9 +++
debian/compat | 2
debian/control | 3 -
debian/rules | 5 +
debian/upstream/signing-key.asc | 64 +++++++++++++++++++++++
debian/watch | 1
src/smi.h | 21 +++++--
src/smi_accel.c | 2
src/smi_driver.c | 11 ++--
src/smi_i2c.c | 1
src/smi_video.c | 8 +-
src/smilynx_hw.c | 8 ++
14 files changed, 222 insertions(+), 23 deletions(-)
New commits:
commit 2a107d36bdb9b1e41bd1d5273a2afc217bef4dc5
Author: Julien Cristau <jcristau@debian.org>
Date: Sat May 9 17:10:19 2015 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 35097c1..6b6347e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-video-siliconmotion (1:1.7.8-1) UNRELEASED; urgency=medium
+xserver-xorg-video-siliconmotion (1:1.7.8-1) unstable; urgency=medium
* New upstream release.
* Let uscan verify tarball signatures.
* Remove Cyril from Uploaders.
* Bump debhelper compat level to 9.
- -- Julien Cristau <jcristau@debian.org> Sat, 09 May 2015 17:01:42 +0200
+ -- Julien Cristau <jcristau@debian.org> Sat, 09 May 2015 17:06:15 +0200
xserver-xorg-video-siliconmotion (1:1.7.7-2) unstable; urgency=low
commit e300e812ef2a1ffa378b89f92e1e72d0715db78b
Author: Julien Cristau <jcristau@debian.org>
Date: Sat May 9 17:06:14 2015 +0200
Bump debhelper compat level to 9.
diff --git a/debian/changelog b/debian/changelog
index 2b57e67..35097c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-video-siliconmotion (1:1.7.8-1) UNRELEASED; urgency=medium
* New upstream release.
* Let uscan verify tarball signatures.
* Remove Cyril from Uploaders.
+ * Bump debhelper compat level to 9.
-- Julien Cristau <jcristau@debian.org> Sat, 09 May 2015 17:01:42 +0200
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index e94d100..baa770b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Build-Depends:
- debhelper (>= 8),
+ debhelper (>= 9),
dh-autoreconf,
pkg-config,
xserver-xorg-dev (>= 2:1.9.4),
diff --git a/debian/rules b/debian/rules
index 3d192dc..bf3cf96 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,10 @@
#!/usr/bin/make -f
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ --disable-silent-rules \
+ --libdir=\$${exec_prefix}/lib
+
# Install in debian/tmp to retain control through dh_install:
override_dh_auto_install:
dh_auto_install --destdir=debian/tmp
commit e48f75081e9d58775205dfc11e847dd3b97d72be
Author: Julien Cristau <jcristau@debian.org>
Date: Sat May 9 17:04:51 2015 +0200
Remove Cyril from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 75d2808..2b57e67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-siliconmotion (1:1.7.8-1) UNRELEASED; urgency=medium
* New upstream release.
* Let uscan verify tarball signatures.
+ * Remove Cyril from Uploaders.
-- Julien Cristau <jcristau@debian.org> Sat, 09 May 2015 17:01:42 +0200
diff --git a/debian/control b/debian/control
index fff5fe8..e94d100 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,6 @@ Source: xserver-xorg-video-siliconmotion
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 8),
dh-autoreconf,
commit 84ff69112cfa2d9d31f476e49822f2e39abcb6eb
Author: Julien Cristau <jcristau@debian.org>
Date: Sat May 9 17:02:33 2015 +0200
Let uscan verify tarball signatures.
diff --git a/debian/changelog b/debian/changelog
index 6691fbb..75d2808 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-siliconmotion (1:1.7.8-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Let uscan verify tarball signatures.
-- Julien Cristau <jcristau@debian.org> Sat, 09 May 2015 17:01:42 +0200
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..9930dd6
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,64 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQINBEoIZDEBEAD5MrFJC9Hi4mXZ97HlFotHIrkMURIFkvl17XEuJ8Jh3hlzJD/q
+K1ByzQGHozzVcfbg4lP4lzqfdps6WCbusqtVYcTF61jjFhYo398lBgpKHUBbsEPC
+SfYp5WkoICa824zcmWO9qYizGqkpd1C6gdQtK6ZaGjLx3xt08M9oVZqj+E2SsPHz
+WaYLugCwCKhlbVTaP28OGy7tBRY6hcLtiZc2CNpr0YjZ53B7Ubs0BVYQutYxho7l
+u0ChE9zNesy4KaIOumXZjTUrMCLpxF/01M1tfzXArMMLAqx3F1M6QIuy18F1zJ2W
+LlkRwJi47NTiJ6jwLUYKBTN9T3nmy0oNAvv5v4B8nWgZAOjjDC2pFoVJa1O3K8Ab
+vSRA3L/N+80MxM9VK5bw451pDqNhxn5q0yeS+RBagmOb2PZSMIuw9adooMurAfDJ
+hsxqp3KaCTdYX5p+mCczNkoKMRUQiVUi250426o69IAmtpVi1q+MV0qWLl2tSvx4
+I4iph9XAhho7ycb4jziWf46ZljnhoGn54EU5GEqH0huakYcXK7XoNxU0XzS/eQuD
+qVy2NH2C945h3LAtMo4zr49VZXjNnFn++zZqCUHASDX6Y3h8uMpzIY6Eslu2S85W
+gpb+V4M5RvKPeuEJTuzxJOOW/B3nyoWFQfN6SXWGVW618dLEmFmQnyLBwwARAQAB
+tCxKdWxpZW4gQ3Jpc3RhdSA8anVsaWVuLmNyaXN0YXVAZW5zLWx5b24ub3JnPokC
+PAQTAQgAJgIbAwIeAQIXgAYLCQgHAwIGFQoJCAsCBRYCAwEABQJK4Fj7AhkBAAoJ
+EDEBgAUJBeQMu/wP/jmGDVXrXZXtNJ7Ov94iDBwcEBlLoNHUyH4FWQG05eW3CqT0
+w9ZOvZEQ/kKlSjpdZzPiYMjgunl7D78aoL4Il2qKyirlT+trt+v79rl5VkD2xJx/
+gi7iN34VJQ50iGBxyxPicUjkXUO17kpJ2/uw/7/pNG0buBDbLGPwYPQFyV3UVOv7
+R8chvmAqtujck1961gRffKPihiv6sj4zjGs8ukmLCO3EgLzpz3shBfJyq6GNMNmy
+aVX7hAcwhErKCrPeGVlzFpCLbtqIxpq6uPfxrDI20LhQkQ9NPD/4t1qkvenRCY77
+wqoiUBSYlpsKND2I2mywOE2FVMj34aBKvn96YsZWlj3Rkc++JvzdZQy09WQIUXt5
+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
+=+xMJ
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index 52b8ba2..6cee75d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-siliconmotion
version=3
+opts="pgpsigurlmangle=s/$/.sig/" \
http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-siliconmotion-(.*)\.tar\.gz
commit 9c3b67e7d46b5ce490da829496fc06bb7b84e48f
Author: Julien Cristau <jcristau@debian.org>
Date: Sat May 9 17:01:47 2015 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index f037bf4..6d8e7c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,111 @@
+commit 70d3d3a384651e5d22840a0de8644eb8b10c5775
+Author: Julien Cristau <jcristau@debian.org>
+Date: Sat May 9 16:56:51 2015 +0200
+
+ Bump to 1.7.8
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit b22c590a546b2ea5f256e7654c4a6b165b320e80
+Author: Julien Cristau <jcristau@debian.org>
+Date: Fri May 8 13:40:46 2015 +0200
+
+ Fix a couple const-ness warnings
+
+ smi_accel.c: In function 'SMI_GEReset':
+ smi_accel.c:51:1: warning: passing argument 4 of 'SMI_GEReset' discards 'const' qualifier from pointer target type
+ WaitIdle();
+ ^
+ smi_accel.c:38:1: note: expected 'char *' but argument is of type 'const char *'
+ SMI_GEReset(ScrnInfoPtr pScrn, int from_timeout, int line, char *file)
+ ^
+ [...]
+ smi_driver.c: In function 'SMI_DetectPanelSize':
+ smi_driver.c:1011:12: warning: assignment discards 'const' qualifier from pointer target type
+ if ((s = xf86GetOptValString(pSmi->Options, OPTION_PANEL_SIZE)) != NULL) {
+ ^
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit ca1c4c19d688d215b52f4e7e2a634c0cbcfff3c1
+Author: Julien Cristau <jcristau@debian.org>
+Date: Fri May 8 13:41:01 2015 +0200
+
+ Fix SwitchMode and AdjustFrame hooks
+
+ smi_driver.c: In function 'SMI_Probe':
+ smi_driver.c:360:24: warning: assignment from incompatible pointer type
+ pScrn->SwitchMode = SMI_SwitchMode;
+ ^
+ smi_driver.c:361:24: warning: assignment from incompatible pointer type
+ pScrn->AdjustFrame = SMI_AdjustFrame;
+ ^
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit d06454e89384957fa2b77ff35b35108dc657a510
+Author: Julien Cristau <jcristau@debian.org>
+Date: Fri May 8 13:27:56 2015 +0200
+
+ Fix BlockHandler declaration
+
+ smi_video.c: In function 'SMI_SetupVideo':
+ smi_video.c:940:24: warning: assignment from incompatible pointer type
+ pSmi->BlockHandler = pScreen->BlockHandler;
+ ^
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit 6073828547bdff86d147ab54accb12bc4230d6aa
+Author: Julien Cristau <jcristau@debian.org>
+Date: Fri May 8 13:26:00 2015 +0200
+
+ Fix shadow compiler warning
+
+ smi_video.c: In function 'SetAttrSAA7111':
+ smi_video.c:795:6: warning: declaration of 'i' shadows a parameter [-Wshadow]
+ int i;
+ ^
+ smi_video.c:723:39: warning: shadowed declaration is here [-Wshadow]
+ SetAttrSAA7111(ScrnInfoPtr pScrn, int i, int value)
+ ^
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit c31d7f853d7469085f96f1e37923c260884c611c
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Sep 30 10:34:07 2014 -0400
+
+ Remove dependency on xf86PciInfo.h
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 08d459d2b548ce89264f45c7018f1cda9f08d795
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Sep 30 10:31:52 2014 -0400
+
+ Fix a typo
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit b0b287209cfba5c64c7584b1a82ed2a2f1eab7e6
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Sep 30 10:28:48 2014 -0400
+
+ Fix build against xserver 1.17
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 9b563415326e02f0b89f716c29b2fc22f393fb96
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed May 21 14:01:02 2014 -0400
+
+ Use own thunk function instead of vgaHW*Weak
+
+ I plan to remove the Weak functions from a future server.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
commit f19d7e463c30f1364e82e8c9f87b8a8407d53680
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jan 9 22:59:39 2013 -0500
diff --git a/debian/changelog b/debian/changelog
index 5b5afca..6691fbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-siliconmotion (1:1.7.8-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 09 May 2015 17:01:42 +0200
+
xserver-xorg-video-siliconmotion (1:1.7.7-2) unstable; urgency=low
* Release to unstable.
commit 70d3d3a384651e5d22840a0de8644eb8b10c5775
Author: Julien Cristau <jcristau@debian.org>
Date: Sat May 9 16:56:51 2015 +0200
Bump to 1.7.8
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/configure.ac b/configure.ac
index da5ecfd..431a564 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-siliconmotion],
- [1.7.7],
+ [1.7.8],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/siliconmotion],
[xf86-video-siliconmotion])
commit b22c590a546b2ea5f256e7654c4a6b165b320e80
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 8 13:40:46 2015 +0200
Fix a couple const-ness warnings
smi_accel.c: In function 'SMI_GEReset':
smi_accel.c:51:1: warning: passing argument 4 of 'SMI_GEReset' discards 'const' qualifier from pointer target type
WaitIdle();
^
smi_accel.c:38:1: note: expected 'char *' but argument is of type 'const char *'
SMI_GEReset(ScrnInfoPtr pScrn, int from_timeout, int line, char *file)
^
[...]
smi_driver.c: In function 'SMI_DetectPanelSize':
smi_driver.c:1011:12: warning: assignment discards 'const' qualifier from pointer target type
if ((s = xf86GetOptValString(pSmi->Options, OPTION_PANEL_SIZE)) != NULL) {
^
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/smi.h b/src/smi.h
index e03a0c9..5e44892 100644
--- a/src/smi.h
+++ b/src/smi.h
@@ -372,7 +372,7 @@ Bool SMI_I2CInit(ScrnInfoPtr pScrn);
/* smi_accel.c */
void SMI_AccelSync(ScrnInfoPtr pScrn);
-void SMI_GEReset(ScrnInfoPtr pScrn, int from_timeout, int line, char *file);
+void SMI_GEReset(ScrnInfoPtr pScrn, int from_timeout, int line, const char *file);
void SMI_EngineReset(ScrnInfoPtr);
void SMI_SetClippingRectangle(ScrnInfoPtr, int, int, int, int);
void SMI_DisableClipping(ScrnInfoPtr);
diff --git a/src/smi_accel.c b/src/smi_accel.c
index b6a3b35..61a686d 100644
--- a/src/smi_accel.c
+++ b/src/smi_accel.c
@@ -35,7 +35,7 @@ authorization from the XFree86 Project and silicon Motion.
#include "smi_501.h"
void
-SMI_GEReset(ScrnInfoPtr pScrn, int from_timeout, int line, char *file)
+SMI_GEReset(ScrnInfoPtr pScrn, int from_timeout, int line, const char *file)
{
SMIPtr pSmi = SMIPTR(pScrn);
int32_t tmp;
diff --git a/src/smi_driver.c b/src/smi_driver.c
index 1c0b355..2568637 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -1002,7 +1002,7 @@ SMI_LeaveVT(VT_FUNC_ARGS_DECL)
static void
SMI_DetectPanelSize(ScrnInfoPtr pScrn)
{
- char *s;
+ const char *s;
int width, height;
SMIPtr pSmi = SMIPTR(pScrn);
commit ca1c4c19d688d215b52f4e7e2a634c0cbcfff3c1
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 8 13:41:01 2015 +0200
Fix SwitchMode and AdjustFrame hooks
smi_driver.c: In function 'SMI_Probe':
smi_driver.c:360:24: warning: assignment from incompatible pointer type
pScrn->SwitchMode = SMI_SwitchMode;
^
smi_driver.c:361:24: warning: assignment from incompatible pointer type
pScrn->AdjustFrame = SMI_AdjustFrame;
^
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/smi.h b/src/smi.h
index 9d6671a..e03a0c9 100644
--- a/src/smi.h
+++ b/src/smi.h
@@ -390,8 +390,8 @@ Bool SMI_HWCursorInit(ScreenPtr pScrn);
/* smi_driver.c */
Bool SMI_MapMem(ScrnInfoPtr pScrn);
void SMI_UnmapMem(ScrnInfoPtr pScrn);
-void SMI_AdjustFrame(int scrnIndex, int x, int y, int flags);
-Bool SMI_SwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
+void SMI_AdjustFrame(ADJUST_FRAME_ARGS_DECL);
+Bool SMI_SwitchMode(SWITCH_MODE_ARGS_DECL);
void SMI_LoadPalette(ScrnInfoPtr pScrn, int numColors, int *indicies,
LOCO *colors, VisualPtr pVisual);
xf86MonPtr SMI_ddc1(ScrnInfoPtr pScrn);
diff --git a/src/smi_driver.c b/src/smi_driver.c
index 134db79..1c0b355 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -1899,9 +1899,10 @@ SMI_SaveScreen(ScreenPtr pScreen, int mode)
}
void
-SMI_AdjustFrame(int scrnIndex, int x, int y, int flags)
+SMI_AdjustFrame(ADJUST_FRAME_ARGS_DECL)
{
- xf86CrtcConfigPtr crtcConf = XF86_CRTC_CONFIG_PTR(xf86Screens[scrnIndex]);
+ SCRN_INFO_PTR(arg);
+ xf86CrtcConfigPtr crtcConf = XF86_CRTC_CONFIG_PTR(pScrn);
xf86CrtcPtr compat_crtc = crtcConf->output[crtcConf->compat_output]->crtc;
ENTER();
@@ -1912,10 +1913,10 @@ SMI_AdjustFrame(int scrnIndex, int x, int y, int flags)
}
Bool
-SMI_SwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+SMI_SwitchMode(SWITCH_MODE_ARGS_DECL)
{
Bool ret;
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ SCRN_INFO_PTR(arg);
SMIPtr pSmi = SMIPTR(pScrn);
ENTER();
commit d06454e89384957fa2b77ff35b35108dc657a510
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 8 13:27:56 2015 +0200
Fix BlockHandler declaration
smi_video.c: In function 'SMI_SetupVideo':
smi_video.c:940:24: warning: assignment from incompatible pointer type
pSmi->BlockHandler = pScreen->BlockHandler;
^
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/smi.h b/src/smi.h
index dce82e6..9d6671a 100644
--- a/src/smi.h
+++ b/src/smi.h
@@ -276,8 +276,7 @@ typedef struct
Bool interlaced; /* True: Interlaced Video */
XF86VideoAdaptorPtr ptrAdaptor; /* Pointer to VideoAdapter
structure */
- void (*BlockHandler)(int i, pointer blockData, pointer pTimeout,
- pointer pReadMask);
+ void (*BlockHandler)(BLOCKHANDLER_ARGS_DECL);
#if SMI501_CLI_DEBUG
/* SMI 501/502 Command List Interpreter */
Bool batch_active;
commit 6073828547bdff86d147ab54accb12bc4230d6aa
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 8 13:26:00 2015 +0200
Fix shadow compiler warning
smi_video.c: In function 'SetAttrSAA7111':
smi_video.c:795:6: warning: declaration of 'i' shadows a parameter [-Wshadow]
int i;
^
smi_video.c:723:39: warning: shadowed declaration is here [-Wshadow]
SetAttrSAA7111(ScrnInfoPtr pScrn, int i, int value)
^
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/smi_video.c b/src/smi_video.c
index 7900b3e..27df68d 100644
--- a/src/smi_video.c
+++ b/src/smi_video.c
@@ -792,12 +792,12 @@ SetAttrSAA7111(ScrnInfoPtr pScrn, int i, int value)
/* debug: show registers */
{
I2CByte i2c_bytes[32];
- int i;
+ int j;
xf86I2CReadBytes(&(pPort->I2CDev), 0, i2c_bytes, 32);
DEBUG("SAA7111 Registers\n");
- for (i=0; i<32; i++) {
- DEBUG("%02X=%02X ", i, i2c_bytes[i]);
- if ((i&7) == 7) DEBUG("\n");
+ for (j=0; j<32; j++) {
+ DEBUG("%02X=%02X ", j, i2c_bytes[j]);
+ if ((j&7) == 7) DEBUG("\n");
}
}
commit c31d7f853d7469085f96f1e37923c260884c611c
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Sep 30 10:34:07 2014 -0400
Remove dependency on xf86PciInfo.h
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/smi.h b/src/smi.h
index 8ca760e..dce82e6 100644
--- a/src/smi.h
+++ b/src/smi.h
@@ -37,7 +37,6 @@ authorization from the XFree86 Project and Silicon Motion.
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86PciInfo.h"
#include "xf86Pci.h"
#include "xf86Cursor.h"
#include "vgaHW.h"
@@ -68,6 +67,15 @@ authorization from the XFree86 Project and Silicon Motion.
/* D E F I N I T I O N S */
/******************************************************************************/
+#define PCI_VENDOR_SMI 0x126F
+#define PCI_CHIP_SMI910 0x0910
+#define PCI_CHIP_SMI810 0x0810
+#define PCI_CHIP_SMI820 0x0820
+#define PCI_CHIP_SMI710 0x0710
+#define PCI_CHIP_SMI712 0x0712
+#define PCI_CHIP_SMI720 0x0720
+#define PCI_CHIP_SMI731 0x0730
+
#ifndef SMI_DEBUG
#define SMI_DEBUG 0
#endif
diff --git a/src/smi_i2c.c b/src/smi_i2c.c
index f38b514..ecf350e 100644
--- a/src/smi_i2c.c
+++ b/src/smi_i2c.c
@@ -35,7 +35,6 @@ authorization from the XFree86 Project and Silicon Motion.
#include "xf86_OSproc.h"
#include "compiler.h"
#include "xf86Pci.h"
-#include "xf86PciInfo.h"
#include "vgaHW.h"
#include "smi.h"
commit 08d459d2b548ce89264f45c7018f1cda9f08d795
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Sep 30 10:31:52 2014 -0400
Fix a typo
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/smilynx_hw.c b/src/smilynx_hw.c
index 7f6a8f2..b2ee8a5 100644
--- a/src/smilynx_hw.c
+++ b/src/smilynx_hw.c
@@ -573,7 +573,7 @@ SMILynx_ddc1Read(ScrnInfoPtr pScrn)
}
static void
-SMILynx_ddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeec speed)
+SMILynx_ddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
{
vgaHWddc1SetSpeed(pScrn, speed);
}
commit b0b287209cfba5c64c7584b1a82ed2a2f1eab7e6
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Sep 30 10:28:48 2014 -0400
Fix build against xserver 1.17
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/smi.h b/src/smi.h
index 956c14f..8ca760e 100644
--- a/src/smi.h
+++ b/src/smi.h
@@ -221,7 +221,7 @@ typedef struct
CARD8 * DataPortBase; /* Base of data port */
int DataPortSize; /* Size of data port */
CARD8 * IOBase; /* Base of MMIO VGA ports */
- IOADDRESS PIOBase; /* Base of I/O ports */
+ unsigned int PIOBase; /* Base of I/O ports */
unsigned char * FBBase; /* Base of FB */
CARD32 fbMapOffset; /* offset for fb mapping */
CARD32 FBOffset; /* Current visual FB starting
commit 9b563415326e02f0b89f716c29b2fc22f393fb96
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 21 14:01:02 2014 -0400
Use own thunk function instead of vgaHW*Weak
I plan to remove the Weak functions from a future server.
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/smilynx_hw.c b/src/smilynx_hw.c
index 9a10a31..7f6a8f2 100644
--- a/src/smilynx_hw.c
+++ b/src/smilynx_hw.c
@@ -572,6 +572,12 @@ SMILynx_ddc1Read(ScrnInfoPtr pScrn)
LEAVE(ret);
}
+static void
+SMILynx_ddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeec speed)
+{
+ vgaHWddc1SetSpeed(pScrn, speed);
+}
+
xf86MonPtr
SMILynx_ddc1(ScrnInfoPtr pScrn)
{
@@ -585,7 +591,7 @@ SMILynx_ddc1(ScrnInfoPtr pScrn)
VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x72, tmp | 0x20);
pMon = xf86PrintEDID(xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn),
- vgaHWddc1SetSpeedWeak(),
+ SMILynx_ddc1SetSpeed,
SMILynx_ddc1Read));
VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x72, tmp);
Reply to: