1*4882a593SmuzhiyunFrom fc7f191a1a0f290a4e808dd8f9bd58ba1dbd2be4 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Otavio Salvador <otavio@ossystems.com.br> 3*4882a593SmuzhiyunDate: Sat, 29 Dec 2012 18:00:36 -0200 4*4882a593SmuzhiyunSubject: [PATCH] ext: Update to newer swap macros 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunThe swap macros now use an internal temporary variable so we need to 7*4882a593Smuzhiyunadapt the code according. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunUpstream-Status: Pending 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunSigned-off-by: Otavio Salvador <otavio@ossystems.com.br> 12*4882a593Smuzhiyun--- 13*4882a593Smuzhiyun src/imx_ext.c | 16 ++++++---------- 14*4882a593Smuzhiyun 1 file changed, 6 insertions(+), 10 deletions(-) 15*4882a593Smuzhiyun 16*4882a593Smuzhiyundiff --git a/src/imx_ext.c b/src/imx_ext.c 17*4882a593Smuzhiyunindex f12469a..710cba4 100644 18*4882a593Smuzhiyun--- a/src/imx_ext.c 19*4882a593Smuzhiyun+++ b/src/imx_ext.c 20*4882a593Smuzhiyun@@ -57,8 +57,6 @@ void imxExtInit() 21*4882a593Smuzhiyun static int 22*4882a593Smuzhiyun Proc_IMX_EXT_GetPixmapPhysAddr(ClientPtr client) 23*4882a593Smuzhiyun { 24*4882a593Smuzhiyun- int n; 25*4882a593Smuzhiyun- 26*4882a593Smuzhiyun REQUEST(xIMX_EXT_GetPixmapPhysAddrReq); 27*4882a593Smuzhiyun REQUEST_SIZE_MATCH(xIMX_EXT_GetPixmapPhysAddrReq); 28*4882a593Smuzhiyun 29*4882a593Smuzhiyun@@ -96,10 +94,10 @@ Proc_IMX_EXT_GetPixmapPhysAddr(ClientPtr client) 30*4882a593Smuzhiyun /* Check if any reply values need byte swapping */ 31*4882a593Smuzhiyun if (client->swapped) { 32*4882a593Smuzhiyun 33*4882a593Smuzhiyun- swaps(&rep.sequenceNumber, n); 34*4882a593Smuzhiyun- swapl(&rep.length, n); 35*4882a593Smuzhiyun- swapl(&rep.pixmapPhysAddr, n); 36*4882a593Smuzhiyun- swapl(&rep.pixmapPitch, n); 37*4882a593Smuzhiyun+ swaps(&rep.sequenceNumber); 38*4882a593Smuzhiyun+ swapl(&rep.length); 39*4882a593Smuzhiyun+ swapl(&rep.pixmapPhysAddr); 40*4882a593Smuzhiyun+ swapl(&rep.pixmapPitch); 41*4882a593Smuzhiyun } 42*4882a593Smuzhiyun 43*4882a593Smuzhiyun /* Reply to client */ 44*4882a593Smuzhiyun@@ -123,16 +121,14 @@ Proc_IMX_EXT_Dispatch(ClientPtr client) 45*4882a593Smuzhiyun static int 46*4882a593Smuzhiyun SProc_IMX_EXT_GetPixmapPhysAddr(ClientPtr client) 47*4882a593Smuzhiyun { 48*4882a593Smuzhiyun- int n; 49*4882a593Smuzhiyun- 50*4882a593Smuzhiyun REQUEST(xIMX_EXT_GetPixmapPhysAddrReq); 51*4882a593Smuzhiyun 52*4882a593Smuzhiyun /* Swap request message length and verify it is correct. */ 53*4882a593Smuzhiyun- swaps(&stuff->length, n); 54*4882a593Smuzhiyun+ swaps(&stuff->length); 55*4882a593Smuzhiyun REQUEST_SIZE_MATCH(xIMX_EXT_GetPixmapPhysAddrReq); 56*4882a593Smuzhiyun 57*4882a593Smuzhiyun /* Swap remaining request message parameters. */ 58*4882a593Smuzhiyun- swapl(&stuff->pixmap, n); 59*4882a593Smuzhiyun+ swapl(&stuff->pixmap); 60*4882a593Smuzhiyun 61*4882a593Smuzhiyun return Proc_IMX_EXT_GetPixmapPhysAddr(client); 62*4882a593Smuzhiyun } 63*4882a593Smuzhiyun-- 64*4882a593Smuzhiyun1.7.10.4 65*4882a593Smuzhiyun 66