Mailinglist Archive: opensuse-commit (1083 mails)
| < Previous | Next > |
commit xorg-x11-driver-video
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Mon, 10 Sep 2007 12:52:50 +0200
- Message-id: <20070910105251.399BC67817A@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package xorg-x11-driver-video
checked in at Mon Sep 10 12:52:50 CEST 2007.
--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-09-05 10:40:47.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-09-07 17:49:26.000000000 +0200
@@ -1,0 +2,19 @@
+Fri Sep 7 17:44:11 CEST 2007 - sndirsch@xxxxxxx
+
+- 'Requires: 915resolution' no longer reuqired (Bug #299829)
+
+-------------------------------------------------------------------
+Fri Sep 7 16:48:26 CEST 2007 - sndirsch@xxxxxxx
+
+- radeonrandr12 driver:
+ * load the correct kernel module (radeonrandr12 --> radeon)
+
+-------------------------------------------------------------------
+Thu Sep 6 23:29:29 CEST 2007 - sndirsch@xxxxxxx
+
+- xf86-video-nsc 2.8.3
+ * This release is an untested build fix for the 7.3 release.
+- xf86-video-mga 1.4.7
+- adjusted mga-g200se_pci-fix.diff
+
+-------------------------------------------------------------------
Old:
----
xf86-video-mga-1.4.6.1.tar.bz2
xf86-video-nsc-2.8.2.tar.bz2
New:
----
xf86-video-mga-1.4.7.tar.bz2
xf86-video-nsc-2.8.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.I11704/_old 2007-09-10 12:52:19.000000000 +0200
+++ /var/tmp/diff_new_pack.I11704/_new 2007-09-10 12:52:19.000000000 +0200
@@ -14,13 +14,10 @@
BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
URL: http://xorg.freedesktop.org/
Version: 7.2
-Release: 172
+Release: 175
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
-%ifarch %ix86 x86_64
-Requires: 915resolution
-%endif
Provides: xorg-x11-driver-video-nvidia
Obsoletes: xorg-x11-driver-video-nvidia
Summary: X.Org video drivers
@@ -38,10 +35,10 @@
Source11: xf86-video-i740-X11R7.1-1.1.0.tar.bz2
Source12: xf86-video-i810-1.7.4.tar.bz2
Source13: xf86-video-imstt-X11R7.1-1.1.0.tar.bz2
-Source14: xf86-video-mga-1.4.6.1.tar.bz2
+Source14: xf86-video-mga-1.4.7.tar.bz2
Source15: xf86-video-neomagic-X11R7.1-1.1.1.tar.bz2
Source16: xf86-video-newport-0.2.1.tar.bz2
-Source17: xf86-video-nsc-2.8.2.tar.bz2
+Source17: xf86-video-nsc-2.8.3.tar.bz2
Source18: xf86-video-nv-2.1.3.tar.bz2
Source19: xf86-video-rendition-4.1.3.tar.bz2
Source20: xf86-video-s3-0.5.0.tar.bz2
@@ -243,6 +240,16 @@
%{_mandir}/man4/*
%changelog
+* Fri Sep 07 2007 - sndirsch@xxxxxxx
+- 'Requires: 915resolution' no longer reuqired (Bug #299829)
+* Fri Sep 07 2007 - sndirsch@xxxxxxx
+- radeonrandr12 driver:
+ * load the correct kernel module (radeonrandr12 --> radeon)
+* Thu Sep 06 2007 - sndirsch@xxxxxxx
+- xf86-video-nsc 2.8.3
+ * This release is an untested build fix for the 7.3 release.
+- xf86-video-mga 1.4.7
+- adjusted mga-g200se_pci-fix.diff
* Wed Sep 05 2007 - sndirsch@xxxxxxx
- xf86-video-ati-opma.diff:
* get monitor DDC from VGA_DDC line first (Bug #307074)
++++++ mga-g200se_pci-fix.diff ++++++
--- /var/tmp/diff_new_pack.I11704/_old 2007-09-10 12:52:19.000000000 +0200
+++ /var/tmp/diff_new_pack.I11704/_new 2007-09-10 12:52:19.000000000 +0200
@@ -41,17 +41,15 @@
pMga->CurrentLayout.mode = mode;
if(pMga->MergedFB && mode->Private && (mode->PrivSize == 0)) {
---- src/mga_dacG.c.orig 2006-12-03 23:06:32.908071711 +0100
-+++ src/mga_dacG.c 2006-12-03 23:07:36.086463534 +0100
-@@ -422,10 +422,7 @@
+--- src/mga_dacG.c.orig 2007-09-07 08:28:41.288547750 +0200
++++ src/mga_dacG.c 2007-09-07 08:29:47.240669500 +0200
+@@ -416,8 +416,7 @@
MGA1064_MISC_CTL_VGA8 |
MGA1064_MISC_CTL_DAC_RAM_CS;
-- if(pMga->HasSDRAM)
-- pReg->Option = 0x40499121;
-- else
-- pReg->Option = 0x4049cd21;
-+ pReg->Option = 0x40049120;
- pReg->Option2 = 0x00008000;
+- if (pMga->HasSDRAM)
+- pReg->Option = 0x40049120;
++ pReg->Option = 0x40049120;
+ pReg->Option2 = 0x00008000;
break;
case PCI_CHIP_MGAG200:
++++++ xf86-video-ati.randr12.diff ++++++
--- /var/tmp/diff_new_pack.I11704/_old 2007-09-10 12:52:19.000000000 +0200
+++ /var/tmp/diff_new_pack.I11704/_new 2007-09-10 12:52:19.000000000 +0200
@@ -272,7 +272,7 @@
-#define RADEON_NAME "RADEON"
-#define RADEON_DRIVER_NAME "radeon"
+#define RADEON_NAME "RADEONRANDR12"
-+#define RADEON_DRIVER_NAME "radeonrandr12"
++#define RADEON_DRIVER_NAME "radeon"
#define R200_DRIVER_NAME "r200"
#define R300_DRIVER_NAME "r300"
++++++ xf86-video-mga-1.4.6.1.tar.bz2 -> xf86-video-mga-1.4.7.tar.bz2 ++++++
++++ 15112 lines of diff (skipped)
++++++ xf86-video-nsc-2.8.2.tar.bz2 -> xf86-video-nsc-2.8.3.tar.bz2 ++++++
++++ 30687 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-nsc-2.8.2/config.h.in new/xf86-video-nsc-2.8.3/config.h.in
--- old/xf86-video-nsc-2.8.2/config.h.in 2006-10-14 00:38:58.000000000 +0200
+++ new/xf86-video-nsc-2.8.3/config.h.in 2007-09-05 03:05:20.000000000 +0200
@@ -62,6 +62,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-nsc-2.8.2/configure.ac new/xf86-video-nsc-2.8.3/configure.ac
--- old/xf86-video-nsc-2.8.2/configure.ac 2006-10-14 00:38:39.000000000 +0200
+++ new/xf86-video-nsc-2.8.3/configure.ac 2007-09-05 03:04:57.000000000 +0200
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-nsc],
- 2.8.2,
+ 2.8.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-nsc)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-nsc-2.8.2/missing new/xf86-video-nsc-2.8.3/missing
--- old/xf86-video-nsc-2.8.2/missing 2006-10-14 00:11:36.000000000 +0200
+++ new/xf86-video-nsc-2.8.3/missing 2007-08-21 01:37:15.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard@xxxxxxxxxxxxxxxx>, 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-nsc-2.8.2/src/durango.c new/xf86-video-nsc-2.8.3/src/durango.c
--- old/xf86-video-nsc-2.8.2/src/durango.c 2006-10-12 00:26:43.000000000 +0200
+++ new/xf86-video-nsc-2.8.3/src/durango.c 2007-09-05 03:04:57.000000000 +0200
@@ -311,221 +311,6 @@
* routines will work properly.
*/
-#if defined(OS_WIN32) /* For Windows */
-
-/* VSA II CALL */
-
-void
-gfx_msr_asm_read(unsigned short msrReg, unsigned long msrAddr,
- unsigned long *ptrHigh, unsigned long *ptrLow)
-{
- unsigned long temp1, temp2;
-
- _asm {
- mov dx, 0x0AC1C
- mov eax, 0x0FC530007
- out dx, eax
- add dl, 2
- mov ecx, msrAddr
- mov cx, msrReg
- in ax, dx;
- ;EDX:EAX will contain MSR contents.
- mov temp1, edx
- mov temp2, eax
- }
-
- *ptrHigh = temp1;
- *ptrLow = temp2;
-}
-
-void
-gfx_msr_asm_write(unsigned short msrReg, unsigned long msrAddr,
- unsigned long *ptrHigh, unsigned long *ptrLow)
-{
- unsigned long temp1 = *ptrHigh;
- unsigned long temp2 = *ptrLow;
-
- _asm {
- mov dx, 0x0AC1C
- mov eax, 0x0FC530007
- out dx, eax i
- add dl, 2
- ;ECX contains msrAddr | msrReg
- mov ecx, msrAddr
- mov cx, msrReg
- ;<OR_mask_hi >
- mov ebx, temp1
-
- ;<OR_mask_hi >
- mov eax, temp2
- ;<AND_mask_hi >
- mov esi, 0
- ;<AND_mask_lo >
- mov edi, 0
- ;MSR is written at this point
- out dx, ax
- }
-}
-
-unsigned char
-gfx_inb(unsigned short port)
-{
- unsigned char data;
-
- _asm {
- pushf
- mov dx, port
- in al, dx
- mov data, al
- popf
- }
- return (data);
-}
-
-unsigned short
-gfx_inw(unsigned short port)
-{
- unsigned short data;
-
- _asm {
- pushf
- mov dx, port
- in ax, dx
- mov data, ax
- popf
- }
- return (data);
-}
-
-unsigned long
-gfx_ind(unsigned short port)
-{
- unsigned long data;
-
- _asm {
- pushf
- mov dx, port
- in eax, dx
- mov data, eax
- popf
- }
- return (data);
-}
-
-void
-gfx_outb(unsigned short port, unsigned char data)
-{
- _asm {
- pushf
- mov al, data
- mov dx, port
- out dx, al
- popf
- }
-}
-
-void
-gfx_outw(unsigned short port, unsigned short data)
-{
- _asm {
- pushf
- mov ax, data
- mov dx, port
- out dx, ax
- popf
- }
-}
-
-void
-gfx_outd(unsigned short port, unsigned long data)
-{
- _asm {
- pushf
- mov eax, data
- mov dx, port
- out dx, eax
- popf
- }
-}
-
-#elif defined(OS_VXWORKS) || defined (OS_LINUX) /* VxWorks and Linux */
-
-extern unsigned long nsc_asm_msr_vsa_rd(unsigned long, unsigned long *,
- unsigned long *);
-extern unsigned long nsc_asm_msr_vsa_wr(unsigned long, unsigned long,
- unsigned long);
-
-void
-gfx_msr_asm_read(unsigned short msrReg, unsigned long msrAddr,
- unsigned long *ptrHigh, unsigned long *ptrLow)
-{
- unsigned long addr, val1, val2;
-
- addr = msrAddr | (unsigned long)msrReg;
- nsc_asm_msr_vsa_rd(addr, &val2, &val1);
- *ptrHigh = val2;
- *ptrLow = val1;
-}
-
-void
-gfx_msr_asm_write(unsigned short msrReg, unsigned long msrAddr,
- unsigned long *ptrHigh, unsigned long *ptrLow)
-{
- unsigned long addr, val1, val2;
-
- val2 = *ptrHigh;
- val1 = *ptrLow;
- addr = (msrAddr & 0xFFFF0000) | (unsigned long)msrReg;
- nsc_asm_msr_vsa_wr(addr, val2, val1);
-}
-
-unsigned char
-gfx_inb(unsigned short port)
-{
- unsigned char value;
- __asm__ volatile ("inb %1,%0":"=a" (value):"d"(port));
-
- return value;
-}
-
-unsigned short
-gfx_inw(unsigned short port)
-{
- unsigned short value;
- __asm__ volatile ("in %1,%0":"=a" (value):"d"(port));
-
- return value;
-}
-
-unsigned long
-gfx_ind(unsigned short port)
-{
- unsigned long value;
- __asm__ volatile ("inl %1,%0":"=a" (value):"d"(port));
-
- return value;
-}
-
-void
-gfx_outb(unsigned short port, unsigned char data)
-{
- __asm__ volatile ("outb %0,%1"::"a" (data), "d"(port));
-}
-
-void
-gfx_outw(unsigned short port, unsigned short data)
-{
- __asm__ volatile ("out %0,%1"::"a" (data), "d"(port));
-}
-
-void
-gfx_outd(unsigned short port, unsigned long data)
-{
- __asm__ volatile ("outl %0,%1"::"a" (data), "d"(port));
-}
-
-#elif defined(XFree86Server)
-
#include <compiler.h>
#define INB(port) inb(port)
#define INW(port) inw(port)
@@ -611,56 +396,6 @@
nsc_asm_msr_vsa_wr(addr, val2, val1);
#endif
}
-#else /* else nothing */
-
-unsigned char
-gfx_inb(unsigned short port)
-{
- /* ADD OS SPECIFIC IMPLEMENTATION */
- return (0);
-}
-
-unsigned short
-gfx_inw(unsigned short port)
-{
- /* ADD OS SPECIFIC IMPLEMENTATION */
- return (0);
-}
-
-unsigned long
-gfx_ind(unsigned short port)
-{
- /* ADD OS SPECIFIC IMPLEMENTATION */
- return (0);
-}
-
-void
-gfx_outb(unsigned short port, unsigned char data)
-{
- /* ADD OS SPECIFIC IMPLEMENTATION */
-}
-
-void
-gfx_outw(unsigned short port, unsigned short data)
-{
- /* ADD OS SPECIFIC IMPLEMENTATION */
-}
-
-void
-gfx_outd(unsigned short port, unsigned long data)
-{
- /* ADD OS SPECIFIC IMPLEMENTATION */
-}
-#endif
-
-#ifndef XFree86Server
-#define INB(port) gfx_inb(port)
-#define INW(port) gfx_inw(port)
-#define IND(port) gfx_ind(port)
-#define OUTB(port, data) gfx_outb(port, data)
-#define OUTW(port, data) gfx_outw(port, data)
-#define OUTD(port, data) gfx_outd(port, data)
-#endif
/* INITIALIZATION ROUTINES
* These routines are used during the initialization of the driver to
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-nsc-2.8.2/src/nsc_driver.c new/xf86-video-nsc-2.8.3/src/nsc_driver.c
--- old/xf86-video-nsc-2.8.2/src/nsc_driver.c 2006-10-12 00:26:43.000000000 +0200
+++ new/xf86-video-nsc-2.8.3/src/nsc_driver.c 2007-08-21 00:50:08.000000000 +0200
@@ -211,10 +211,10 @@
/* This should match the durango code version.
* The patchlevel may be used to indicate changes in geode.c
*/
-#define NSC_VERSION_NAME "2.8.1"
-#define NSC_VERSION_MAJOR 2
-#define NSC_VERSION_MINOR 8
-#define NSC_PATCHLEVEL 1
+#define NSC_VERSION_NAME PACKAGE_VERSION
+#define NSC_VERSION_MAJOR PACKAGE_VERSION_MAJOR
+#define NSC_VERSION_MINOR PACKAGE_VERSION_MINOR
+#define NSC_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
#define NSC_VERSION_CURRENT ((NSC_VERSION_MAJOR << 24) | \
(NSC_VERSION_MINOR << 16) | NSC_PATCHLEVEL)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-nsc-2.8.2/src/panel/panel.c new/xf86-video-nsc-2.8.3/src/panel/panel.c
--- old/xf86-video-nsc-2.8.2/src/panel/panel.c 2006-10-12 00:26:43.000000000 +0200
+++ new/xf86-video-nsc-2.8.3/src/panel/panel.c 2007-09-05 03:04:57.000000000 +0200
@@ -139,25 +139,6 @@
*
* END_NSC_LIC_GPL */
-#if defined(linux) /* Linux */
-
-#ifdef __KERNEL__
-
-#include <linux/string.h>
-#include <asm/io.h>
-
-#elif !defined(XFree86Server)
-
-#include <linux/fs.h>
-#include <asm/mman.h>
-
-#endif /* __KERNEL__ */
-#elif defined(_WIN32) /* windows */
-
-#include <windows.h>
-
-#endif
-
#include "panel.h"
#include "gfx_defs.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-nsc-2.8.2/src/panel/platform.c new/xf86-video-nsc-2.8.3/src/panel/platform.c
--- old/xf86-video-nsc-2.8.2/src/panel/platform.c 2006-10-12 00:26:43.000000000 +0200
+++ new/xf86-video-nsc-2.8.3/src/panel/platform.c 2007-09-05 03:04:57.000000000 +0200
@@ -191,26 +191,10 @@
int FindStringInSeg(unsigned int, char *);
static unsigned char get_sys_board_type(SYS_BOARD_INFO *, SYS_BOARD_INFO *);
-#if defined(linux) && !defined(__KERNEL__)
-#if !defined(XFree86Server)
-static void platform_protected_mode_access(unsigned int, unsigned int,
- unsigned long, unsigned char *);
-static void setup_pma();
-static void close_pma();
-static int fd;
-#endif /* IN_MODULE */
-#endif /* __KERNEL__ */
-
/* Detect the Platform */
int
Detect_Platform(void)
{
-#if defined(linux) && !defined(__KERNEL__)
-#if !defined(XFree86Server)
- setup_pma();
-#endif /* IN_MODULE */
-#endif /* __KERNEL__ */
-
/* See if we can find the board name using Xpressrom */
if (get_sys_board_type(&Sys_info, Sys_board_array_base) == TRUE) {
#if 0
@@ -223,11 +207,6 @@
}
#endif
}
-#if defined(linux) && !defined(__KERNEL__)
-#if !defined(XFree86Server)
- close_pma();
-#endif /* IN_MODULE */
-#endif /* __KERNEL__ */
return (Sys_info.sys_board);
}
@@ -302,25 +281,7 @@
(void)mem_ptr;
(void)segment_buffer;
-#if defined(linux) && !defined(XFree86Server)
-#ifdef __KERNEL__
- XpressROMPtr = (unsigned char *)ioremap(mem_ptr, SEGMENT_LENGTH + 1);
psegment_buf = (char *)XpressROMPtr;
-#else
- /* Fill the segment_buffer with 16 page accesses */
-
- for (cursor = 0; (cursor * PAGE_LENGTH) < SEGMENT_LENGTH; cursor++) {
- platform_protected_mode_access(PLT_READ_BYTES, PAGE_LENGTH, mem_ptr +
- (cursor * PAGE_LENGTH),
- &(segment_buffer[(cursor * PAGE_LENGTH)]));
- }
- psegment_buf = segment_buffer;
-#endif /* __KERNEL__ */
-#elif defined (XFree86Server)
- psegment_buf = (char *)XpressROMPtr;
-#elif defined(_WIN32) /* Windows */
- psegment_buf = XpressROMPtr;
-#endif
/* Now search for the first character of the string_ptr */
for (i = 0; i < SEGMENT_LENGTH + 1; i++) {
@@ -397,330 +358,3 @@
Strcpy(sys_info->sys_board_name, "Unknown");
return (FALSE);
} /* end get_sys_board_type() */
-
-#if defined(linux) && !defined(__KERNEL__)
-#if !defined(XFree86Server)
-
-/******************************************************************
- *
- * platform_protected_mode_access( unsigned int mode, unsigned int width,
- * unsigned long addr, unsigned char* pdata )
- * This function provides access to physical memory
- * at the requested address.
- * mode is: PLT_READ or PLT_WRITE (accesses a single byte, word
- * or double word depending on the value of "width".
- * Only 1, 2 or 4 supported).
- * PLT_READ_BYTES, PLT_WRITE_BYTES accesses "width" number
- * of bytes (8 bits)
- * PLT_READ_WORDS, PLT_WRITE_WORDS accesses "width" number
- * of words (16 bits) PLT_READ_DWORDS, PLT_WRITE_DWORDS accesses
- * "width" number of dwords (32 bits)
- * width is: The size of the access.
- * For PLT_READ or PLT_WRITE, only 1, 2 and 4 are
- * supported. For other modes, width is not limited but
- * will cause paging if the block traverses page boundaries.
- * addr is: The physical address being accessed
- * pdata is: A pointer to the data to be read or written into.
- * NOTE! WORD or DWORD accesses can only be made on
- * WORD or DWORD boundaries!
- *
- ******************************************************************
- */
-
-static void
-platform_protected_mode_access(unsigned int mode, unsigned int width,
- unsigned long addr, unsigned char *pdata)
-{
-
-#define PMTRASH 0x12345678L
-
- unsigned long base; /* The physical page address */
- int length = 0x1000; /* the page size is 4k */
- unsigned int offset = 0; /* The physical addr offset into page */
- unsigned int index = 0; /* Used to read/write from/to a block */
- unsigned int chunk = 0; /* The amount to read/wr from THIS block */
- unsigned int size = 0; /* Data size shift value (to avoid math) */
- static void *ptr; /* pointer to real memory location. */
-
- static unsigned long lastbase = PMTRASH;
-
- /* temp storage of previous base used. */
- /* type specific buffer pointers */
- unsigned char *byte_data = (unsigned char *)pdata;
- unsigned int *word_data = (unsigned int *)pdata;
- unsigned long *dword_data = (unsigned long *)pdata;
-
- switch (mode) {
-
- case PLT_READ_WORDS:
- case PLT_WRITE_WORDS:
-
- size = 1;
- break;
-
- case PLT_READ_DWORDS:
- case PLT_WRITE_DWORDS:
-
- size = 2;
- }
-
- /* Check if we're in the user accessable range */
- if (addr < 0xFF000000L) {
-
- /* We get physical memory in "pages", defined by the
- * following "base" address and the "offset" into it.
- * "base" will be used with mmap to get "ptr", which
- * points to the memory mapped actual physical memory at
- * the address pointed-to by "base".
- * "width" and "chunk" are in units of whatever data
- * type we're reading.
- * "length" and "offset" are in units of bytes.
- * "width" and "chunk" must be adjusted with "<<size"
- * to use with "length" or "offset". Similarly, the
- * result must be adjusted with ">>size" to make into the
- * proper type units when done.
- */
- base = addr & 0xFFFFF000L;
- offset = addr & 0x00000FFFL;
- do {
- if ((offset + (width << size)) > length) {
-
- /* Block being read extends beyond the
- * page boundary. Adjust things.
- */
- chunk = (length - offset) >> size;
-
- /* Figure the chunk size */
- width -= chunk;
-
- /* Reduce width by the current chunk */
- } else {
-
- /* Block being read is within the
- * page boundary.
- */
- chunk = width;
- width = 0;
-
- /* set to zero so we'll exit at the end */
-
- }
- /* We keep the page around in case we need to
- * access it again.
- * This saves us some time if we have consecutive
- * accesses.
- */
-
- if (base != lastbase) {
-
- /* we haven't mmap'd this address
- * Have to get a new page. Free the
- * previous page, if it's valid (ie, not
- * PMTRASH). If not, unmap it and get the
- * new page.
- */
- if (lastbase != PMTRASH)
- munmap(ptr, length);
- ptr = mmap(NULL, length, PROT_READ | PROT_WRITE, MAP_SHARED, fd,
- base);
- if ((int)ptr == -1) {
- lastbase = PMTRASH;
- return; /* error */
- }
- }
-
- /* Now we're ready to get the data.
- * It's pure memory access now, no funny
- * function calls, however we do cast things to get
- * the right size data.
- */
-
- /* Scale the offset for the data type size */
- index = offset >> size;
-
- /* Note that the above line and below lines,
- * which shift "offset", discard address information
- * if you happen to be trying to write, for example,
- * dwords on non-dword boundaries.
- */
- /* Note that cases PLT_READ and PLT_WRITE don't
- * use "index". They shift "offset" on their own.
- * This is because in PLT_READ and PLT_WRITE modes,
- * the information on the size of the data
- * transaction is in the "width" variable not "size".
- * We also need separate cases to cast the values
- * right.
- */
- switch (mode) {
-
- case PLT_READ:{
-
- switch (chunk) {
-
- case FOUR_BYTES:
-
- *(dword_data) = (unsigned long)
- (*(((unsigned long *)ptr) + (offset >> 2)));
- break;
-
- case TWO_BYTES:
-
- *(word_data) = (unsigned int)
- (*(((unsigned int *)ptr) + (offset >> 1)));
- break;
-
- default:
-
- *(byte_data) = (unsigned char)
- (*(((unsigned char *)ptr) + (offset)));
- break;
-
- } /* end switch() */
- break;
-
- } /* end case PLT_READ */
-
- case PLT_WRITE:{
-
- switch (chunk) {
-
- case FOUR_BYTES:
-
- *(((unsigned long *)ptr) + (offset >> 2)) = *dword_data;
- break;
-
- case TWO_BYTES:
-
- *(((unsigned int *)ptr) + (offset >> 1)) = *word_data;
- break;
-
- default:
-
- *(((unsigned char *)ptr) + (offset)) = *byte_data;
- break;
- } /* end switch() */
- break;
-
- } /* end case PLT_WRITE */
-
- case PLT_READ_BYTES:{
-
- for (; chunk > 0; chunk--) {
-
- *(byte_data++) = (unsigned char)(*(((unsigned char *)ptr) +
- (index++)));
- }
- break;
- } /* end case PLT_READ_BYTES */
-
- case PLT_WRITE_BYTES:{
-
- for (; chunk > 0; chunk--) {
- *(((unsigned char *)ptr) + (index++)) = *(byte_data++);
- }
- break;
-
- } /* end case PLT_WRITE_BYTES */
-
- case PLT_READ_WORDS:{
-
- for (; chunk > 0; chunk--) {
-
- *(word_data++) = (unsigned int)
- (*(((unsigned int *)ptr) + (index++)));
- }
- break;
-
- } /* end case PLT_READ_WORDS */
-
- case PLT_WRITE_WORDS:{
-
- for (; chunk > 0; chunk--) {
-
- *(((unsigned int *)ptr) + (index++)) = *(word_data++);
- }
- break;
-
- } /* end case PLT_WRITE_WORDS */
-
- case PLT_READ_DWORDS:{
-
- for (; chunk > 0; chunk--) {
-
- *(dword_data++) = (*(((unsigned long *)ptr) + (index++)));
- }
- break;
-
- } /* end case PLT_READ_DWORDS */
-
- case PLT_WRITE_DWORDS:{
-
- for (; chunk > 0; chunk--) {
-
- *(((unsigned long *)ptr) + (index++))
- = *(dword_data++);
- }
- break;
-
- } /* end case PLT_WRITE_DWORDS */
-
- } /* end switch(mode) */
-
- lastbase = base;
-
- /* Save the page we've just processed. */
-
- if (width) {
-
- /* If there's still width left to get. */
-
- base += length;
- /* Increment to the next page. */
-
- offset = 0;
- /* Set the offset to zero. */
- }
-
- } while (width); /* While there's still data to get. */
- return;
-
- } /* end for if addr */
- else {
-
- printf("PMA error: Unable to read ROM address space\n");
- exit(1);
- }
- return;
-}
-
-/************************************************************************
- * setup_pma() loads the ROM memory access module and initializes
- * memory access file descriptor (access is handled through a file-like
- * interface).
- ************************************************************************
- */
-static void
-setup_pma()
-{
- fd = open("/dev/mem", 2); /* O_RDWR */
- if (fd == -1) {
-
- printf("Error: Unable to open /dev/mem !\a\n");
- exit(1);
- }
- return;
-}
-
-/**********************************************************************
- * close_pma() cleans up the open memory access devices and file
- * descriptors.
- **********************************************************************
- */
-static void
-close_pma()
-{
- close(fd);
- return;
-}
-#endif /* IN_MODULE */
-#endif /* linux && !__KERNEL__ */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-nsc-2.8.2/src/panel.c new/xf86-video-nsc-2.8.3/src/panel.c
--- old/xf86-video-nsc-2.8.2/src/panel.c 2006-10-12 00:26:43.000000000 +0200
+++ new/xf86-video-nsc-2.8.3/src/panel.c 2007-09-05 03:04:57.000000000 +0200
@@ -144,25 +144,6 @@
#include "config.h"
#endif
-#if defined(linux) /* Linux */
-
-#ifdef __KERNEL__
-
-#include <linux/string.h>
-#include <asm/io.h>
-
-#elif !defined(XFree86Server)
-
-#include <linux/fs.h>
-#include <asm/mman.h>
-
-#endif /* __KERNEL__ */
-#elif defined(_WIN32) /* windows */
-
-#include <windows.h>
-
-#endif
-
#include "panel.h"
#include "gfx_defs.h"
#include "nsc.h"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |