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