Guest User

Untitled

a guest
Mar 14th, 2012
294
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 9.13 KB | None | 0 0
  1. diff -ur xf86-video-sis-0.9.1.orig/src/sis_driver.c xf86-video-sis-0.9.1/src/sis_driver.c
  2. --- xf86-video-sis-0.9.1.orig/src/sis_driver.c  2009-06-22 14:15:54.000000000 +0200
  3. +++ xf86-video-sis-0.9.1/src/sis_driver.c   2012-03-14 23:08:27.009397583 +0100
  4. @@ -3278,7 +3278,7 @@
  5.      pSiS->pInt = NULL;
  6.  
  7.      /* Save PCI Domain Base */
  8. -#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0)
  9. +#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0) || GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 12
  10.      pSiS->IODBase = 0;
  11.  #else
  12.      pSiS->IODBase = pScrn->domainIOBase;
  13. diff -ur xf86-video-sis-0.9.1.orig/src/sis.h xf86-video-sis-0.9.1/src/sis.h
  14. --- xf86-video-sis-0.9.1.orig/src/sis.h 2009-12-03 20:28:46.000000000 +0100
  15. +++ xf86-video-sis-0.9.1/src/sis.h  2012-03-14 23:08:27.010397580 +0100
  16. @@ -80,6 +80,13 @@
  17.  #include "xf86_ansic.h"
  18.  #endif
  19.  
  20. +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
  21. +#define _swapl(x, n) swapl(x,n)
  22. +#define _swaps(x, n) swaps(x,n)
  23. +#else
  24. +#define _swapl(x, n) swapl(x)
  25. +#define _swaps(x, n) swaps(x)
  26. +#endif
  27.  
  28.  #define SIS_HaveDriverFuncs 0
  29.  
  30. diff -ur xf86-video-sis-0.9.1.orig/src/sis_mergedfb.c xf86-video-sis-0.9.1/src/sis_mergedfb.c
  31. --- xf86-video-sis-0.9.1.orig/src/sis_mergedfb.c    2008-05-15 20:50:12.000000000 +0200
  32. +++ xf86-video-sis-0.9.1/src/sis_mergedfb.c 2012-03-14 23:08:27.012397575 +0100
  33. @@ -2472,10 +2472,10 @@
  34.      rep.majorVersion = SIS_XINERAMA_MAJOR_VERSION;
  35.      rep.minorVersion = SIS_XINERAMA_MINOR_VERSION;
  36.      if(client->swapped) {
  37. -       swaps(&rep.sequenceNumber, n);
  38. -       swapl(&rep.length, n);
  39. -       swaps(&rep.majorVersion, n);
  40. -       swaps(&rep.minorVersion, n);
  41. +       _swaps(&rep.sequenceNumber, n);
  42. +       _swapl(&rep.length, n);
  43. +       _swaps(&rep.majorVersion, n);
  44. +       _swaps(&rep.minorVersion, n);
  45.      }
  46.      WriteToClient(client, sizeof(xPanoramiXQueryVersionReply), (char *)&rep);
  47.      return (client->noClientException);
  48. @@ -2498,9 +2498,8 @@
  49.      rep.sequenceNumber = client->sequence;
  50.      rep.state = !SiSnoPanoramiXExtension;
  51.      if(client->swapped) {
  52. -       swaps (&rep.sequenceNumber, n);
  53. -       swapl (&rep.length, n);
  54. -       swaps (&rep.state, n);
  55. +       _swaps (&rep.sequenceNumber, n);
  56. +       _swapl (&rep.length, n);
  57.      }
  58.      WriteToClient(client, sizeof(xPanoramiXGetStateReply), (char *)&rep);
  59.      return client->noClientException;
  60. @@ -2523,9 +2522,8 @@
  61.      rep.sequenceNumber = client->sequence;
  62.      rep.ScreenCount = SiSXineramaNumScreens;
  63.      if(client->swapped) {
  64. -       swaps(&rep.sequenceNumber, n);
  65. -       swapl(&rep.length, n);
  66. -       swaps(&rep.ScreenCount, n);
  67. +       _swaps(&rep.sequenceNumber, n);
  68. +       _swapl(&rep.length, n);
  69.      }
  70.      WriteToClient(client, sizeof(xPanoramiXGetScreenCountReply), (char *)&rep);
  71.      return client->noClientException;
  72. @@ -2549,10 +2547,10 @@
  73.      rep.width  = SiSXineramadataPtr[stuff->screen].width;
  74.      rep.height = SiSXineramadataPtr[stuff->screen].height;
  75.      if(client->swapped) {
  76. -       swaps(&rep.sequenceNumber, n);
  77. -       swapl(&rep.length, n);
  78. -       swaps(&rep.width, n);
  79. -       swaps(&rep.height, n);
  80. +       _swaps(&rep.sequenceNumber, n);
  81. +       _swapl(&rep.length, n);
  82. +       _swapl(&rep.width, n);
  83. +       _swapl(&rep.height, n);
  84.      }
  85.      WriteToClient(client, sizeof(xPanoramiXGetScreenSizeReply), (char *)&rep);
  86.      return client->noClientException;
  87. @@ -2571,9 +2569,9 @@
  88.      rep.state = !SiSnoPanoramiXExtension;
  89.      if(client->swapped) {
  90.         register int n;
  91. -       swaps(&rep.sequenceNumber, n);
  92. -       swapl(&rep.length, n);
  93. -       swapl(&rep.state, n);
  94. +       _swaps(&rep.sequenceNumber, n);
  95. +       _swapl(&rep.length, n);
  96. +       _swapl(&rep.state, n);
  97.      }
  98.      WriteToClient(client, sizeof(xXineramaIsActiveReply), (char *) &rep);
  99.      return client->noClientException;
  100. @@ -2592,9 +2590,9 @@
  101.      rep.length = rep.number * sz_XineramaScreenInfo >> 2;
  102.      if(client->swapped) {
  103.         register int n;
  104. -       swaps(&rep.sequenceNumber, n);
  105. -       swapl(&rep.length, n);
  106. -       swapl(&rep.number, n);
  107. +       _swaps(&rep.sequenceNumber, n);
  108. +       _swapl(&rep.length, n);
  109. +       _swapl(&rep.number, n);
  110.      }
  111.      WriteToClient(client, sizeof(xXineramaQueryScreensReply), (char *)&rep);
  112.  
  113. @@ -2609,10 +2607,10 @@
  114.       scratch.height = SiSXineramadataPtr[i].height;
  115.       if(client->swapped) {
  116.          register int n;
  117. -        swaps(&scratch.x_org, n);
  118. -        swaps(&scratch.y_org, n);
  119. -        swaps(&scratch.width, n);
  120. -        swaps(&scratch.height, n);
  121. +        _swaps(&scratch.x_org, n);
  122. +        _swaps(&scratch.y_org, n);
  123. +        _swaps(&scratch.width, n);
  124. +        _swaps(&scratch.height, n);
  125.       }
  126.       WriteToClient(client, sz_XineramaScreenInfo, (char *)&scratch);
  127.         }
  128. @@ -2761,7 +2759,7 @@
  129.  {
  130.      REQUEST(xPanoramiXQueryVersionReq);
  131.      register int n;
  132. -    swaps(&stuff->length,n);
  133. +    _swaps(&stuff->length,n);
  134.      REQUEST_SIZE_MATCH (xPanoramiXQueryVersionReq);
  135.      return SiSProcXineramaQueryVersion(client);
  136.  }
  137. @@ -2771,7 +2769,7 @@
  138.  {
  139.      REQUEST(xPanoramiXGetStateReq);
  140.      register int n;
  141. -    swaps (&stuff->length, n);
  142. +    _swaps (&stuff->length, n);
  143.      REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
  144.      return SiSProcXineramaGetState(client);
  145.  }
  146. @@ -2781,7 +2779,7 @@
  147.  {
  148.      REQUEST(xPanoramiXGetScreenCountReq);
  149.      register int n;
  150. -    swaps (&stuff->length, n);
  151. +    _swaps (&stuff->length, n);
  152.      REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
  153.      return SiSProcXineramaGetScreenCount(client);
  154.  }
  155. @@ -2791,7 +2789,7 @@
  156.  {
  157.      REQUEST(xPanoramiXGetScreenSizeReq);
  158.      register int n;
  159. -    swaps (&stuff->length, n);
  160. +    _swaps (&stuff->length, n);
  161.      REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
  162.      return SiSProcXineramaGetScreenSize(client);
  163.  }
  164. @@ -2801,7 +2799,7 @@
  165.  {
  166.      REQUEST(xXineramaIsActiveReq);
  167.      register int n;
  168. -    swaps (&stuff->length, n);
  169. +    _swaps (&stuff->length, n);
  170.      REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
  171.      return SiSProcXineramaIsActive(client);
  172.  }
  173. @@ -2811,7 +2809,7 @@
  174.  {
  175.      REQUEST(xXineramaQueryScreensReq);
  176.      register int n;
  177. -    swaps (&stuff->length, n);
  178. +    _swaps (&stuff->length, n);
  179.      REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
  180.      return SiSProcXineramaQueryScreens(client);
  181.  }
  182. @@ -2821,8 +2819,8 @@
  183.  {
  184.      REQUEST(xXineramaSelectInputReq);
  185.      register int n;
  186. -    swaps(&stuff->length, n);
  187. -    swapl(&stuff->window, n);
  188. +    _swaps(&stuff->length, n);
  189. +    _swapl(&stuff->window, n);
  190.      return SiSProcXineramaSelectInput(client);
  191.  }
  192.  
  193. diff -ur xf86-video-sis-0.9.1.orig/src/sis_utility.c xf86-video-sis-0.9.1/src/sis_utility.c
  194. --- xf86-video-sis-0.9.1.orig/src/sis_utility.c 2008-09-02 16:16:32.000000000 +0200
  195. +++ xf86-video-sis-0.9.1/src/sis_utility.c  2012-03-14 23:08:27.013397573 +0100
  196. @@ -2078,10 +2078,10 @@
  197.      rep.majorVersion = SISCTRL_MAJOR_VERSION;
  198.      rep.minorVersion = SISCTRL_MINOR_VERSION;
  199.      if(client->swapped) {
  200. -        swaps(&rep.sequenceNumber, n);
  201. -        swapl(&rep.length, n);
  202. -        swaps(&rep.majorVersion, n);
  203. -        swaps(&rep.minorVersion, n);
  204. +        _swaps(&rep.sequenceNumber, n);
  205. +        _swapl(&rep.length, n);
  206. +        _swaps(&rep.majorVersion, n);
  207. +        _swaps(&rep.minorVersion, n);
  208.      }
  209.      WriteToClient(client, sizeof(xSiSCtrlQueryVersionReply), (char *)&rep);
  210.      return (client->noClientException);
  211. @@ -2122,15 +2122,15 @@
  212.      rep.sequenceNumber = client->sequence;
  213.  
  214.      if(client->swapped) {
  215. -       swaps(&rep.sequenceNumber, n);
  216. -       swapl(&rep.length, n);
  217. -       swapl(&rep.screen, n);
  218. -       swapl(&rep.sdc_id, n);
  219. -       swapl(&rep.sdc_command, n);
  220. -       swapl(&rep.sdc_result_header, n);
  221. +       _swaps(&rep.sequenceNumber, n);
  222. +       _swapl(&rep.length, n);
  223. +       _swapl(&rep.screen, n);
  224. +       _swapl(&rep.sdc_id, n);
  225. +       _swapl(&rep.sdc_command, n);
  226. +       _swapl(&rep.sdc_result_header, n);
  227.         for(i = 0; i < SDC_NUM_PARM_RESULT; i++) {
  228. -     swapl(&rep.sdc_parm[i], n);
  229. -     swapl(&rep.sdc_result[i], n);
  230. +     _swapl(&rep.sdc_parm[i], n);
  231. +     _swapl(&rep.sdc_result[i], n);
  232.         }
  233.      }
  234.      WriteToClient(client, sizeof(xSiSCtrlCommandReply), (char *)&rep);
  235. @@ -2157,7 +2157,7 @@
  236.  {
  237.      REQUEST(xSiSCtrlQueryVersionReq);
  238.      register int n;
  239. -    swaps(&stuff->length, n);
  240. +    _swaps(&stuff->length, n);
  241.      REQUEST_SIZE_MATCH(xSiSCtrlQueryVersionReq);
  242.      return SiSProcSiSCtrlQueryVersion(client);
  243.  }
  244. @@ -2168,14 +2168,14 @@
  245.      REQUEST(xSiSCtrlCommandReq);
  246.      register int n;
  247.      int i;
  248. -    swaps(&stuff->length, n);
  249. -    swapl(&stuff->screen, n);
  250. -    swapl(&stuff->sdc_id, n);
  251. -    swapl(&stuff->sdc_command, n);
  252. -    swapl(&stuff->sdc_result_header, n);
  253. +    _swaps(&stuff->length, n);
  254. +    _swapl(&stuff->screen, n);
  255. +    _swapl(&stuff->sdc_id, n);
  256. +    _swapl(&stuff->sdc_command, n);
  257. +    _swapl(&stuff->sdc_result_header, n);
  258.      for(i = 0; i < SDC_NUM_PARM_RESULT; i++) {
  259. -       swapl(&stuff->sdc_parm[i], n);
  260. -       swapl(&stuff->sdc_result[i], n);
  261. +       _swapl(&stuff->sdc_parm[i], n);
  262. +       _swapl(&stuff->sdc_result[i], n);
  263.      }
  264.      REQUEST_SIZE_MATCH(xSiSCtrlCommandReq);
  265.      return SiSProcSiSCtrlCommand(client);
Advertisement
Add Comment
Please, Sign In to add comment