?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Update from omapzoom 18-Aug-2008
[bridge-dev.git] / 0013-BRIDGE-remove-homebrewn-macros.patch
bloba9869218469cb160629d5232d6b9c02748cfa8d7
1 From: Omar Ramirez Luna <x00omar@ti.com> on behalf of Ramesh Gupta <grgupta@ti.com>
2 Subject: [PATCH] Removed home brewn macros
3
4 Removed MAX, MIN, Min from bridge sources and replaced them with
5 max/min from the kernel header file. Also cleaned up the resource
6 cleanup functions.
7
8 Signed-off-by: Ramesh Gupta <grgupta@ti.com>
9 ---
10 drivers/dsp/bridge/pmgr/dbl.c | 4 --
11 drivers/dsp/bridge/rmgr/drv.c | 33 ---------------------
12 drivers/dsp/bridge/rmgr/rmm.c | 4 --
13 drivers/dsp/bridge/wmd/io_sm.c | 6 +--
14 arch/arm/plat-omap/include/bridge/resourcecleanup.h | 18 -----------
15 5 files changed, 4 insertions(+), 61 deletions(-)
16
17 Index: omapkernel/arch/arm/plat-omap/include/bridge/resourcecleanup.h
18 ===================================================================
19 --- omapkernel.orig/arch/arm/plat-omap/include/bridge/resourcecleanup.h 2008-08-12 18:31:03.000000000 -0500
20 +++ omapkernel/arch/arm/plat-omap/include/bridge/resourcecleanup.h 2008-08-12 21:11:36.000000000 -0500
21 @@ -82,24 +82,6 @@
22
23 extern DSP_STATUS DRV_RemoveAllSTRMResElements(HANDLE pCtxt);
24
25 -extern DSP_STATUS DRV_GetDSPHEAPResElement(u32 pMapAddr, HANDLE hDSPHEAPRes,
26 - HANDLE hPCtxt);
27 -
28 -extern DSP_STATUS DRV_RemoveAllDSPHEAPResElements(HANDLE hPCtxt);
29 -
30 -extern DSP_STATUS DRV_ProcFreeDSPHEAPRes(HANDLE hPCtxt);
31 -
32 -extern DSP_STATUS DRV_UpdateDSPHEAPResElement(HANDLE hDSPHEAPRes,
33 - u32 pMpuAddr, u32 ulSize,
34 - u32 pReqAddr, u32 pMapAddr,
35 - HANDLE hProcessor);
36 -
37 -extern DSP_STATUS DRV_RemoveDSPHEAPResElement(HANDLE hDSPHEAPRes,
38 - HANDLE hPCtxt);
39 -
40 -extern DSP_STATUS DRV_InsertDSPHEAPResElement(HANDLE hDSPHEAPRes,
41 - HANDLE hPCtxt);
42 -
43 extern DSP_STATUS DRV_ProcDisplayResInfo(u8 *pBuf, u32 *pSize);
44
45 extern enum NODE_STATE NODE_GetState(HANDLE hNode);
46 Index: omapkernel/drivers/dsp/bridge/pmgr/dbl.c
47 ===================================================================
48 --- omapkernel.orig/drivers/dsp/bridge/pmgr/dbl.c 2008-08-12 18:31:03.000000000 -0500
49 +++ omapkernel/drivers/dsp/bridge/pmgr/dbl.c 2008-08-12 21:11:36.000000000 -0500
50 @@ -72,8 +72,6 @@
51 #define EXECUTEPHASE 2
52 #define NONE 3 /* For overlay section with phase not specified */
53
54 -#define MIN(a, b) ((a) < (b) ? (a) : (b))
55 -
56 /* Default load buffer size */
57 #define LOADBUFSIZE 0x800
58
59 @@ -1056,7 +1054,7 @@
60 addr = sectHdr.addr;
61 space = sectHdr.page;
62 for (total = sectHdr.size; total > 0; total -= nWords) {
63 - nWords = MIN(total, bufSize);
64 + nWords = min(total, bufSize);
65 nBytes = nWords * mauSize;
66 /* Read section data */
67 if ((*dbl->dblAttrs.fread)(pBuf, nBytes, 1,
68 Index: omapkernel/drivers/dsp/bridge/rmgr/drv.c
69 ===================================================================
70 --- omapkernel.orig/drivers/dsp/bridge/rmgr/drv.c 2008-08-12 18:31:03.000000000 -0500
71 +++ omapkernel/drivers/dsp/bridge/rmgr/drv.c 2008-08-12 21:11:36.000000000 -0500
72 @@ -861,39 +861,6 @@
73 (*STRMRes)->uNumBufs = uNumBufs;
74 return status;
75 }
76 -
77 -/* Actual DSPHEAP De-Allocation */
78 -DSP_STATUS DRV_ProcFreeDSPHEAPRes(HANDLE hPCtxt)
79 -{
80 - struct PROCESS_CONTEXT *pCtxt = (struct PROCESS_CONTEXT *)hPCtxt;
81 - DSP_STATUS status = DSP_SOK;
82 - struct DSPHEAP_RES_OBJECT *pDSPHEAPList = NULL;
83 - struct DSPHEAP_RES_OBJECT *pDSPHEAPRes = NULL;
84 -
85 - DBC_Assert(hPCtxt != NULL);
86 - pDSPHEAPList = pCtxt->pDSPHEAPList;
87 - while (pDSPHEAPList != NULL) {
88 - pDSPHEAPRes = pDSPHEAPList;
89 - pDSPHEAPList = pDSPHEAPList->next;
90 - if (pDSPHEAPRes->heapAllocated) {
91 - GT_1trace(curTrace, GT_5CLASS,
92 - "DRV_ProcFreeDSPHEAPRes:Unmapping "
93 - "pDSPHEAPRes->ulDSPAddr:%x \n",
94 - pDSPHEAPRes->ulDSPAddr);
95 - status = PROC_UnMap(pDSPHEAPRes->hProcessor,
96 - (void *) pDSPHEAPRes->ulDSPAddr);
97 - GT_1trace(curTrace, GT_5CLASS,
98 - "DRV_ProcFreeDSPHEAPRes:UnReserving"
99 - " memory:pDSPHEAPRes->ulDSPResAddr: %x \n",
100 - pDSPHEAPRes->ulDSPResAddr);
101 - status = PROC_UnReserveMemory(pDSPHEAPRes->hProcessor,
102 - (void *)pDSPHEAPRes->ulDSPResAddr);
103 - pDSPHEAPRes->heapAllocated = 0;
104 - }
105 - }
106 - return status;
107 -}
108 -
109 /* Displaying the resources allocated by a process */
110 DSP_STATUS DRV_ProcDisplayResInfo(u8 *pBuf1, u32 *pSize)
111 {
112 Index: omapkernel/drivers/dsp/bridge/rmgr/rmm.c
113 ===================================================================
114 --- omapkernel.orig/drivers/dsp/bridge/rmgr/rmm.c 2008-08-12 18:31:03.000000000 -0500
115 +++ omapkernel/drivers/dsp/bridge/rmgr/rmm.c 2008-08-12 21:11:36.000000000 -0500
116 @@ -69,8 +69,6 @@
117
118 #define RMM_TARGSIGNATURE 0x544d4d52 /* "TMMR" */
119
120 -#define MAX(x, y) ((x) > (y) ? (x) : (y))
121 -
122 /*
123 * ======== RMM_Header ========
124 * This header is used to maintain a list of free memory blocks.
125 @@ -456,7 +454,7 @@
126
127 /* Collect data from freeList */
128 while (head != NULL) {
129 - maxFreeSize = MAX(maxFreeSize, head->size);
130 + maxFreeSize = max(maxFreeSize, head->size);
131 totalFreeSize += head->size;
132 freeBlocks++;
133 head = head->next;
134 Index: omapkernel/drivers/dsp/bridge/wmd/io_sm.c
135 ===================================================================
136 --- omapkernel.orig/drivers/dsp/bridge/wmd/io_sm.c 2008-08-12 18:31:03.000000000 -0500
137 +++ omapkernel/drivers/dsp/bridge/wmd/io_sm.c 2008-08-12 21:11:36.000000000 -0500
138 @@ -168,8 +168,6 @@
139
140 #define EXTEND "_EXT_END"
141
142 -#define Min(x, y) ((x < y) ? x : y)
143 -
144 #define SwapWord(x) (x)
145 #define ulPageAlignSize 0x10000 /* Page Align Size */
146
147 @@ -1219,7 +1217,7 @@
148 DBC_Assert(pChnl->cIOReqs >= 0);
149 /* Ensure we don't overflow the client's
150 * buffer: */
151 - uBytes = Min(uBytes, pChirp->cBytes);
152 + uBytes = min(uBytes, pChirp->cBytes);
153 /* Transfer buffer from DSP side: */
154 uBytes = ReadData(pIOMgr->hWmdContext,
155 pChirp->pHostSysBuf,
156 @@ -1461,7 +1459,7 @@
157
158 /* Transfer buffer to DSP side: */
159 pChirp->cBytes = WriteData(pIOMgr->hWmdContext, pIOMgr->pOutput,
160 - pChirp->pHostSysBuf, Min(pIOMgr->uSMBufSize, pChirp->
161 + pChirp->pHostSysBuf, min(pIOMgr->uSMBufSize, pChirp->
162 cBytes));
163 pChnl->cBytesMoved += pChirp->cBytes;
164 /* Write all 32 bits of arg */
my dev tree for bridge