xserver-xorg-video-i128: Changes to 'upstream-experimental'
configure.ac | 2 +-
src/i128IBMDAC.c | 1 +
src/i128_driver.c | 45 +++++++++++++++++++++++----------------------
src/i128accel.c | 6 ++++--
src/i128exa.c | 2 ++
src/i128init.c | 2 ++
src/i128pcirename.h | 6 +++---
7 files changed, 36 insertions(+), 28 deletions(-)
New commits:
commit 4be161bca1ae9fca29e882c5909405781b565cb1
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Sep 4 19:51:58 2008 +0200
Bump to 1.3.1
diff --git a/configure.ac b/configure.ac
index 350130b..6002fc5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-i128],
- 1.3.0,
+ 1.3.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-i128)
commit ab11b4bd9e76abdbfca5d7e5c9e9d0a7f52a4a34
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Aug 15 15:30:19 2008 -0400
Don't store pScrn->monitor->DDC manually, let xf86SetDDCproperties do it.
diff --git a/src/i128_driver.c b/src/i128_driver.c
index 9895900..72a69e7 100644
--- a/src/i128_driver.c
+++ b/src/i128_driver.c
@@ -898,7 +898,6 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
/* Read and print the Monitor DDC info */
mon = I128getDDC(pScrn);
- pScrn->monitor->DDC = mon;
/* see if we can find a flatpanel */
if (!pI128->FlatPanel && mon) {
commit 3b1d9fe8694df9b63ad12c7fe5cd059f4132a8ce
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Mar 13 16:31:30 2008 -0300
Replace calls to xf86usleep with calls to usleep and include unistd.h.
diff --git a/src/i128_driver.c b/src/i128_driver.c
index 5231923..9895900 100644
--- a/src/i128_driver.c
+++ b/src/i128_driver.c
@@ -66,6 +66,8 @@
#include "i128.h"
#include "i128reg.h"
+#include <unistd.h>
+
/*
* Forward definitions for the functions that make up the driver.
*/
@@ -1901,7 +1903,7 @@ I128DDC1Read(ScrnInfoPtr pScrn)
ddc = inl(iobase + 0x2C);
if ((ddc & DDC_MODE_MASK) != DDC_MODE_DDC1) {
outl(iobase + 0x2C, DDC_MODE_DDC1);
- xf86usleep(40);
+ usleep(40);
}
/* wait for Vsync */
@@ -1918,7 +1920,7 @@ I128DDC1Read(ScrnInfoPtr pScrn)
if ((ddc & DDC_MODE_MASK) != DDC_MODE_DDC1) {
outl(iobase + 0x2C, ~DDC_MODE_MASK & ddc);
- xf86usleep(40);
+ usleep(40);
}
return val;
@@ -2003,14 +2005,14 @@ I128I2CInit(ScrnInfoPtr pScrn)
soft_sw &= 0xfffffffc;
soft_sw |= 0x00000001;
outl(iobase + 0x28, soft_sw);
- xf86usleep(1000);
+ usleep(1000);
/* set default as ddc2 mode */
ddc = inl(iobase + 0x2C);
ddc &= ~DDC_MODE_MASK;
ddc |= DDC_MODE_DDC2;
outl(iobase + 0x2C, ddc);
- xf86usleep(40);
+ usleep(40);
if (!xf86I2CBusInit(I2CPtr)) {
return FALSE;
commit 6327ba52ba39cbbe5584fe5cba6864d3d6ad38b0
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Mar 13 16:42:06 2008 -0300
Compile warning fixes.
The casts for printf format are really required to pass
proper arguments, as pciaddr_t is a 64 bit integer.
diff --git a/src/i128IBMDAC.c b/src/i128IBMDAC.c
index 4e6fd97..1ad9f65 100644
--- a/src/i128IBMDAC.c
+++ b/src/i128IBMDAC.c
@@ -36,6 +36,7 @@
#include "i128reg.h"
#include "IBMRGB.h"
+#include <unistd.h>
static void I128IBMShowCursor(ScrnInfoPtr pScrn);
static void I128IBMHideCursor(ScrnInfoPtr pScrn);
diff --git a/src/i128_driver.c b/src/i128_driver.c
index b9fdb15..5231923 100644
--- a/src/i128_driver.c
+++ b/src/i128_driver.c
@@ -797,7 +797,7 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
{
unsigned short temp;
pci_device_cfg_read_u16(pI128->PciInfo, &temp, 0x4);
- if ((temp & 0x03 == 0x03) && (PCI_SUB_DEVICE_ID(pI128->PciInfo) == 0x08))
+ if (((temp & 0x03) == 0x03) && (PCI_SUB_DEVICE_ID(pI128->PciInfo) == 0x08))
pI128->MemoryType = I128_MEMORY_DRAM;
}
#endif
@@ -2105,38 +2105,38 @@ I128DumpBaseRegisters(ScrnInfoPtr pScrn)
" PCI Registers\n");
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
" MW0_AD 0x%08lx addr 0x%08lx %spre-fetchable\n",
- PCI_REGION_BASE(pI128->PciInfo, 0, REGION_MEM),
- PCI_REGION_BASE(pI128->PciInfo, 0, REGION_MEM) & 0xFFC00000,
+ (unsigned long)PCI_REGION_BASE(pI128->PciInfo, 0, REGION_MEM),
+ (unsigned long)(PCI_REGION_BASE(pI128->PciInfo, 0, REGION_MEM) & 0xFFC00000),
PCI_REGION_BASE(pI128->PciInfo, 0, REGION_MEM) & 0x8 ? "" : "not-");
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
" MW1_AD 0x%08lx addr 0x%08lx %spre-fetchable\n",
- PCI_REGION_BASE(pI128->PciInfo, 1, REGION_MEM),
- PCI_REGION_BASE(pI128->PciInfo, 1, REGION_MEM) & 0xFFC00000,
+ (unsigned long)PCI_REGION_BASE(pI128->PciInfo, 1, REGION_MEM),
+ (unsigned long)(PCI_REGION_BASE(pI128->PciInfo, 1, REGION_MEM) & 0xFFC00000),
PCI_REGION_BASE(pI128->PciInfo, 1, REGION_MEM) & 0x8 ? "" : "not-");
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
" XYW_AD(A) 0x%08lx addr 0x%08lx\n",
- PCI_REGION_BASE(pI128->PciInfo, 2, REGION_MEM),
- PCI_REGION_BASE(pI128->PciInfo, 2, REGION_MEM) & 0xFFC00000);
+ (unsigned long)PCI_REGION_BASE(pI128->PciInfo, 2, REGION_MEM),
+ (unsigned long)(PCI_REGION_BASE(pI128->PciInfo, 2, REGION_MEM) & 0xFFC00000));
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
" XYW_AD(B) 0x%08lx addr 0x%08lx\n",
- PCI_REGION_BASE(pI128->PciInfo, 3, REGION_MEM),
- PCI_REGION_BASE(pI128->PciInfo, 3, REGION_MEM) & 0xFFC00000);
+ (unsigned long)PCI_REGION_BASE(pI128->PciInfo, 3, REGION_MEM),
+ (unsigned long)(PCI_REGION_BASE(pI128->PciInfo, 3, REGION_MEM) & 0xFFC00000));
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
" RBASE_G 0x%08lx addr 0x%08lx\n",
- PCI_REGION_BASE(pI128->PciInfo, 4, REGION_MEM),
- PCI_REGION_BASE(pI128->PciInfo, 4, REGION_MEM) & 0xFFFF0000);
+ (unsigned long)PCI_REGION_BASE(pI128->PciInfo, 4, REGION_MEM),
+ (unsigned long)(PCI_REGION_BASE(pI128->PciInfo, 4, REGION_MEM) & 0xFFFF0000));
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
" IO 0x%08lx addr 0x%08lx\n",
- PCI_REGION_BASE(pI128->PciInfo, 5, REGION_IO),
- PCI_REGION_BASE(pI128->PciInfo, 5, REGION_IO) & 0xFFFFFF00);
+ (unsigned long)PCI_REGION_BASE(pI128->PciInfo, 5, REGION_IO),
+ (unsigned long)(PCI_REGION_BASE(pI128->PciInfo, 5, REGION_IO) & 0xFFFFFF00));
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
" SSC 0x%08x addr 0x%08x\n",
- PCI_SUB_DEVICE_ID(pI128->PciInfo),
- PCI_SUB_DEVICE_ID(pI128->PciInfo) & 0xFFFFFF00);
+ (unsigned int)PCI_SUB_DEVICE_ID(pI128->PciInfo),
+ (unsigned int)(PCI_SUB_DEVICE_ID(pI128->PciInfo) & 0xFFFFFF00));
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
" SSV 0x%08x addr 0x%08x\n",
- PCI_SUB_VENDOR_ID(pI128->PciInfo),
- PCI_SUB_VENDOR_ID(pI128->PciInfo) & 0xFFFFFF00);
+ (unsigned int)PCI_SUB_VENDOR_ID(pI128->PciInfo),
+ (unsigned int)(PCI_SUB_VENDOR_ID(pI128->PciInfo) & 0xFFFFFF00));
#ifndef XSERVER_LIBPCIACCESS
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
" RBASE_E 0x%08lx addr 0x%08lx %sdecode-enabled\n\n",
diff --git a/src/i128accel.c b/src/i128accel.c
index 4db3e8d..37d6353 100644
--- a/src/i128accel.c
+++ b/src/i128accel.c
@@ -56,9 +56,11 @@ static void I128SetClippingRectangle(ScrnInfoPtr pScrn, int x1, int y1,
int x2, int y2);
static void I128FillSolidRects(ScrnInfoPtr pScrn, int fg, int rop,
unsigned int planemask, int nBox, register BoxPtr pBoxI);
+#if 0
static void I128ScreenToScreenBitBlt(ScrnInfoPtr pScrn, int nbox,
DDXPointPtr pptSrc, BoxPtr pbox, int xdir, int ydir, int alu,
unsigned planemask);
+#endif
#define ENG_PIPELINE_READY() { while (pI128->mem.rbase_a[BUSY] & BUSY_BUSY) ; }
#define ENG_DONE() { while (pI128->mem.rbase_a[FLOW] & (FLOW_DEB | FLOW_MCB | FLOW_PRV)) ;}
@@ -396,7 +398,7 @@ I128FillSolidRects(ScrnInfoPtr pScrn, int fg, int rop, unsigned int planemask,
}
-
+#if 0
static void
I128ScreenToScreenBitBlt(ScrnInfoPtr pScrn, int nbox, DDXPointPtr pptSrc,
BoxPtr pbox, int xdir, int ydir, int alu, unsigned planemask)
@@ -408,7 +410,7 @@ I128ScreenToScreenBitBlt(ScrnInfoPtr pScrn, int nbox, DDXPointPtr pptSrc,
pbox->x1, pbox->y1, pbox->x2 - pbox->x1, pbox->y2 - pbox->y1);
ENG_DONE();
}
-
+#endif
Bool
I128XaaInit(ScreenPtr pScreen)
diff --git a/src/i128exa.c b/src/i128exa.c
index 36aa78f..84452a8 100644
--- a/src/i128exa.c
+++ b/src/i128exa.c
@@ -452,11 +452,13 @@ static const struct dest_format dest_formats[] = {
{ 0, 0 }
};
+#if 0
static struct dest_format *
i128MapDestFormat(int fmt)
{
return NULL;
}
+#endif
/* Composite is probably t2r and t2r4 only */
static Bool
diff --git a/src/i128init.c b/src/i128init.c
index 29906cf..d57e295 100644
--- a/src/i128init.c
+++ b/src/i128init.c
@@ -37,6 +37,8 @@
#include "Ti302X.h"
#include "IBMRGB.h"
+#include <unistd.h>
+
static void I128SavePalette(I128Ptr pI128);
static void I128RestorePalette(I128Ptr pI128);
diff --git a/src/i128pcirename.h b/src/i128pcirename.h
index f0f5cf8..3e04b2d 100644
--- a/src/i128pcirename.h
+++ b/src/i128pcirename.h
@@ -26,8 +26,8 @@
* library. The main purpose being to facilitate source code compatibility.
*/
-#ifndef CIRPCIRENAME_H
-#define CIRPCIRENAME_H
+#ifndef I128PCIRENAME_H
+#define I128PCIRENAME_H
enum region_type {
REGION_MEM,
@@ -119,4 +119,4 @@ typedef struct pci_device *pciVideoPtr;
#endif /* XSERVER_LIBPCIACCESS */
-#endif /* CIRPCIRENAME_H */
+#endif /* I128PCIRENAME_H */
Reply to: