xserver-xorg-video-neomagic: Changes to 'upstream-experimental'
configure.ac | 2 +-
src/neo_driver.c | 6 +-----
src/neo_pcirename.h | 6 +++---
3 files changed, 5 insertions(+), 9 deletions(-)
New commits:
commit 4ac0d4db51de095acc6c3be558b993abfd725842
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 21 15:50:10 2008 -0400
neomagic 1.2.1
diff --git a/configure.ac b/configure.ac
index e0542ea..97fd8f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-neomagic],
- 1.2.0,
+ 1.2.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-neomagic)
commit 9a2a733e8fc337da838cbd081b22a62f9f97de02
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Mon May 12 17:09:50 2008 -0300
Don't include fbpseudocolor.h, as it is no longer available.
diff --git a/src/neo_driver.c b/src/neo_driver.c
index aca25b5..31e47f0 100644
--- a/src/neo_driver.c
+++ b/src/neo_driver.c
@@ -83,7 +83,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "xf86cmap.h"
#include "fb.h"
-#include "fbpseudocolor.h"
/* Needed by Resources Access Control (RAC) */
#include "xf86RAC.h"
commit 38ca3645e9bded8226aba05c0e5fd6f7fc080c1a
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Sat Mar 15 21:57:46 2008 -0300
Compile warning fix.
Don't redeclare variable err; cut&paste error that caused warning about
mixed code and declarations.
Minor consistency change to neo_pcirename.h.
diff --git a/src/neo_driver.c b/src/neo_driver.c
index 633146d..aca25b5 100644
--- a/src/neo_driver.c
+++ b/src/neo_driver.c
@@ -2083,7 +2083,7 @@ neoMapMem(ScrnInfoPtr pScrn)
if (nPtr->NeoMMIOAddr2 != 0){
result = (void**)&nPtr->NeoMMIOBase2;
- int err = pci_device_map_range(nPtr->PciInfo,
+ err = pci_device_map_range(nPtr->PciInfo,
nPtr->NeoMMIOAddr2,
0x100000L,
PCI_DEV_MAP_FLAG_WRITABLE,
diff --git a/src/neo_pcirename.h b/src/neo_pcirename.h
index f0f5cf8..2492dc0 100644
--- a/src/neo_pcirename.h
+++ b/src/neo_pcirename.h
@@ -26,8 +26,8 @@
* library. The main purpose being to facilitate source code compatibility.
*/
-#ifndef CIRPCIRENAME_H
-#define CIRPCIRENAME_H
+#ifndef NEOPCIRENAME_H
+#define NEOPCIRENAME_H
enum region_type {
REGION_MEM,
@@ -119,4 +119,4 @@ typedef struct pci_device *pciVideoPtr;
#endif /* XSERVER_LIBPCIACCESS */
-#endif /* CIRPCIRENAME_H */
+#endif /* NEOPCIRENAME_H */
commit dc2a372ad7edf34417d7d7042562b601e4f0041c
Author: Adam Jackson <ajax@redhat.com>
Date: Mon May 12 10:51:43 2008 -0400
fbpseudocolor no longer exists, don't try to use it.
diff --git a/src/neo_driver.c b/src/neo_driver.c
index 1ac21c3..633146d 100644
--- a/src/neo_driver.c
+++ b/src/neo_driver.c
@@ -1810,9 +1810,6 @@ NEOScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
CMAP_PALETTED_TRUECOLOR | CMAP_RELOAD_ON_MODE_SWITCH))
return FALSE;
- if (pScrn->depth == 16)
- xxSetup(pScreen,8, pScrn->depth, NULL, nPtr->accelSync); /*@!@*/
-
racflag |= RAC_COLORMAP;
if (nPtr->NeoHWCursorInitialized)
racflag |= RAC_CURSOR;
Reply to: