[PATCH sis 00/15] a bunch of cleanups, and a taste of things to come

Timo Aaltonen tjaalton at ubuntu.com
Wed Apr 6 09:50:02 PDT 2011


Here's a first set of patches to xf86-video-sis, hoping to narrow down
the diff against Thomas Winischofer's 'sisfree' (*) package and the
forked versions from Intel and SiS (and Mandriva).

The first 13 are more or less self-explanatory, but the two final ones
are moving things around to make the code more readable, among other things.

Every commit is build-tested against xserver 1.10 headers.

* http://www.winischhofer.net/linuxsispart4.shtml#download

Timo Aaltonen (15):
  Write out remaining IS_SIS* macros.
  Replace deprecated x(c)alloc/xfree with m/calloc/free
  Fix "format not a string literal and no format arguments" compile
    warnings
  Fix "suggest parentheses around operand of ‘!’" compiler warnings.
  Fix compile warnings of uninitialized variables
  Declare mmioFlags only if XSERVER_LIBPCIACCESS isn't defined
  Purge obsolete and unused SIS_CP checks
  Drop useless checks and relevant code for old XFree86 releases
  Drop unused and non-working XAA trapezoid support for 310 series and
    later
  Remove unused code from sis_video.c
  Remove unused code from SISPutImageBlit()
  Remove unused & non-working Xv deinterlacer code
  Remove deprecated XV SD interface
  Move configurable values from sis.h to sis_config.h
  Move all TV related functions fron sis_driver.c to sis_vb.c

 src/init.c          |   35 +-
 src/init.h          |    3 -
 src/init301.c       |   62 +-
 src/init301.h       |    3 -
 src/initdef.h       |   19 +-
 src/initextx.c      |   18 +-
 src/sis.h           |   86 +--
 src/sis310_accel.c  |  754 ---------------
 src/sis6326_video.c |   60 +--
 src/sis_accel.c     |  128 ---
 src/sis_config.h    |   71 ++
 src/sis_cursor.c    |    8 +-
 src/sis_dac.h       |    2 +
 src/sis_dga.c       |    6 +-
 src/sis_dri.c       |   38 +-
 src/sis_driver.c    | 2625 ++++-----------------------------------------------
 src/sis_driver.h    |  813 +----------------
 src/sis_memcpy.c    |   10 +-
 src/sis_opt.c       |   49 +-
 src/sis_utility.c   |  527 +----------
 src/sis_vb.c        | 2259 ++++++++++++++++++++++++++++++++++++++++++--
 src/sis_vb.h        |  931 ++++++++++++++++++
 src/sis_vga.c       |    7 +-
 src/sis_video.c     |  291 +------
 src/sis_video.h     |  195 ----
 src/sis_videostr.h  |    3 -
 src/vgatypes.h      |    5 -
 27 files changed, 3490 insertions(+), 5518 deletions(-)
 create mode 100644 src/sis_config.h
 create mode 100644 src/sis_vb.h

-- 
1.7.4.1



More information about the xorg-devel mailing list