1
From 0bf29d5ab85132cdb87dc305d364dfed88654869 Mon Sep 17 00:00:00 2001
2
From: Rene Sapiens <rene.sapiens@ti.com>
3
Date: Tue, 18 Jan 2011 03:19:14 +0000
4
Subject: [PATCH 37/37] staging: tidspbridge: set12 remove hungarian from structs
6
hungarian notation will be removed from the elements inside
7
structures, the next varibles will be renamed:
26
Signed-off-by: Rene Sapiens <rene.sapiens@ti.com>
27
Signed-off-by: Armando Uribe <x0095078@ti.com>
28
Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
30
.../tidspbridge/include/dspbridge/dspapi-ioctl.h | 42 ++++++++++----------
31
drivers/staging/tidspbridge/pmgr/dspapi.c | 40 +++++++++---------
32
2 files changed, 41 insertions(+), 41 deletions(-)
34
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dspapi-ioctl.h b/drivers/staging/tidspbridge/include/dspbridge/dspapi-ioctl.h
35
index 6d1e33e..6ff8082 100644
36
--- a/drivers/staging/tidspbridge/include/dspbridge/dspapi-ioctl.h
37
+++ b/drivers/staging/tidspbridge/include/dspbridge/dspapi-ioctl.h
38
@@ -156,7 +156,7 @@ union trapped_args {
44
} args_proc_flushmemory;
47
@@ -171,13 +171,13 @@ union trapped_args {
48
struct dsp_uuid __user *node_id_ptr;
49
struct dsp_cbdata __user *args;
50
struct dsp_nodeattrin __user *attr_in;
51
- void *__user *ph_node;
58
- struct dsp_bufferattr __user *pattr;
60
+ struct dsp_bufferattr __user *attr;
62
} args_node_allocmsgbuf;
64
@@ -191,7 +191,7 @@ union trapped_args {
68
- struct dsp_strmattr __user *pattrs;
69
+ struct dsp_strmattr __user *attrs;
70
struct dsp_cbdata __user *conn_param;
73
@@ -205,13 +205,13 @@ union trapped_args {
77
- struct dsp_bufferattr __user *pattr;
78
+ struct dsp_bufferattr __user *attr;
80
} args_node_freemsgbuf;
84
- struct dsp_nodeattr __user *pattr;
85
+ struct dsp_nodeattr __user *attr;
89
@@ -244,7 +244,7 @@ union trapped_args {
93
- int __user *pstatus;
95
} args_node_terminate;
98
@@ -257,7 +257,7 @@ union trapped_args {
104
u8 *__user *ap_buffer;
106
} args_strm_allocatebuffer;
107
@@ -274,7 +274,7 @@ union trapped_args {
113
} args_strm_geteventhandle;
116
@@ -291,8 +291,8 @@ union trapped_args {
127
@@ -301,7 +301,7 @@ union trapped_args {
130
struct strm_attr __user *attr_in;
131
- void *__user *ph_stream;
132
+ void *__user *stream;
136
@@ -309,7 +309,7 @@ union trapped_args {
139
u32 __user *buf_size_ptr;
140
- u32 __user *pdw_arg;
145
@@ -322,27 +322,27 @@ union trapped_args {
147
void *__user *stream_tab;
156
struct cmm_object *cmm_mgr;
158
- struct cmm_attrs *pattrs;
161
+ struct cmm_attrs *attrs;
166
struct cmm_object *cmm_mgr;
174
- struct cmm_object *__user *ph_cmm_mgr;
175
+ struct cmm_object *__user *cmm_mgr;
176
} args_cmm_gethandle;
179
@@ -353,7 +353,7 @@ union trapped_args {
188
diff --git a/drivers/staging/tidspbridge/pmgr/dspapi.c b/drivers/staging/tidspbridge/pmgr/dspapi.c
189
index 52717d9..767ffe2 100644
190
--- a/drivers/staging/tidspbridge/pmgr/dspapi.c
191
+++ b/drivers/staging/tidspbridge/pmgr/dspapi.c
192
@@ -721,14 +721,14 @@ u32 procwrap_flush_memory(union trapped_args *args, void *pr_ctxt)
196
- if (args->args_proc_flushmemory.ul_flags >
197
+ if (args->args_proc_flushmemory.flags >
198
PROC_WRITEBACK_INVALIDATE_MEM)
201
status = proc_flush_memory(pr_ctxt,
202
args->args_proc_flushmemory.mpu_addr,
203
args->args_proc_flushmemory.size,
204
- args->args_proc_flushmemory.ul_flags);
205
+ args->args_proc_flushmemory.flags);
209
@@ -1129,7 +1129,7 @@ u32 nodewrap_allocate(union trapped_args *args, void *pr_ctxt)
212
nodeid = node_res->id + 1;
213
- CP_TO_USR(args->args_node_allocate.ph_node, &nodeid,
214
+ CP_TO_USR(args->args_node_allocate.node, &nodeid,
218
@@ -1159,11 +1159,11 @@ u32 nodewrap_alloc_msg_buf(union trapped_args *args, void *pr_ctxt)
222
- if (!args->args_node_allocmsgbuf.usize)
223
+ if (!args->args_node_allocmsgbuf.size)
226
- if (args->args_node_allocmsgbuf.pattr) { /* Optional argument */
227
- CP_FM_USR(&attr, args->args_node_allocmsgbuf.pattr, status, 1);
228
+ if (args->args_node_allocmsgbuf.attr) { /* Optional argument */
229
+ CP_FM_USR(&attr, args->args_node_allocmsgbuf.attr, status, 1);
233
@@ -1172,7 +1172,7 @@ u32 nodewrap_alloc_msg_buf(union trapped_args *args, void *pr_ctxt)
234
CP_FM_USR(&pbuffer, args->args_node_allocmsgbuf.buffer, status, 1);
236
status = node_alloc_msg_buf(node_res->node,
237
- args->args_node_allocmsgbuf.usize,
238
+ args->args_node_allocmsgbuf.size,
241
CP_TO_USR(args->args_node_allocmsgbuf.buffer, &pbuffer, status, 1);
242
@@ -1253,8 +1253,8 @@ u32 nodewrap_connect(union trapped_args *args, void *pr_ctxt)
246
- if (args->args_node_connect.pattrs) { /* Optional argument */
247
- CP_FM_USR(&attrs, args->args_node_connect.pattrs, status, 1);
248
+ if (args->args_node_connect.attrs) { /* Optional argument */
249
+ CP_FM_USR(&attrs, args->args_node_connect.attrs, status, 1);
253
@@ -1323,8 +1323,8 @@ u32 nodewrap_free_msg_buf(union trapped_args *args, void *pr_ctxt)
257
- if (args->args_node_freemsgbuf.pattr) { /* Optional argument */
258
- CP_FM_USR(&attr, args->args_node_freemsgbuf.pattr, status, 1);
259
+ if (args->args_node_freemsgbuf.attr) { /* Optional argument */
260
+ CP_FM_USR(&attr, args->args_node_freemsgbuf.attr, status, 1);
264
@@ -1358,7 +1358,7 @@ u32 nodewrap_get_attr(union trapped_args *args, void *pr_ctxt)
266
status = node_get_attr(node_res->node, &attr,
267
args->args_node_getattr.attr_size);
268
- CP_TO_USR(args->args_node_getattr.pattr, &attr, status, 1);
269
+ CP_TO_USR(args->args_node_getattr.attr, &attr, status, 1);
273
@@ -1495,7 +1495,7 @@ u32 nodewrap_terminate(union trapped_args *args, void *pr_ctxt)
275
status = node_terminate(node_res->node, &tempstatus);
277
- CP_TO_USR(args->args_node_terminate.pstatus, &tempstatus, status, 1);
278
+ CP_TO_USR(args->args_node_terminate.status, &tempstatus, status, 1);
282
@@ -1564,7 +1564,7 @@ u32 strmwrap_allocate_buffer(union trapped_args *args, void *pr_ctxt)
285
status = strm_allocate_buffer(strm_res,
286
- args->args_strm_allocatebuffer.usize,
287
+ args->args_strm_allocatebuffer.size,
288
ap_buffer, num_bufs, pr_ctxt);
290
CP_TO_USR(args->args_strm_allocatebuffer.ap_buffer, ap_buffer,
291
@@ -1715,8 +1715,8 @@ u32 strmwrap_issue(union trapped_args *args, void *pr_ctxt)
293
status = strm_issue(strm_res->stream,
294
args->args_strm_issue.buffer,
295
- args->args_strm_issue.dw_bytes,
296
- args->args_strm_issue.dw_buf_size,
297
+ args->args_strm_issue.bytes,
298
+ args->args_strm_issue.buf_size,
299
args->args_strm_issue.arg);
302
@@ -1756,7 +1756,7 @@ u32 strmwrap_open(union trapped_args *args, void *pr_ctxt)
305
strmid = strm_res_obj->id + 1;
306
- CP_TO_USR(args->args_strm_open.ph_stream, &strmid, status, 1);
307
+ CP_TO_USR(args->args_strm_open.stream, &strmid, status, 1);
311
@@ -1782,7 +1782,7 @@ u32 strmwrap_reclaim(union trapped_args *args, void *pr_ctxt)
312
&ul_bytes, &ul_buf_size, &dw_arg);
313
CP_TO_USR(args->args_strm_reclaim.buf_ptr, &buf_ptr, status, 1);
314
CP_TO_USR(args->args_strm_reclaim.bytes, &ul_bytes, status, 1);
315
- CP_TO_USR(args->args_strm_reclaim.pdw_arg, &dw_arg, status, 1);
316
+ CP_TO_USR(args->args_strm_reclaim.arg, &dw_arg, status, 1);
318
if (args->args_strm_reclaim.buf_size_ptr != NULL) {
319
CP_TO_USR(args->args_strm_reclaim.buf_size_ptr, &ul_buf_size,
320
@@ -1855,7 +1855,7 @@ u32 strmwrap_select(union trapped_args *args, void *pr_ctxt)
321
status = strm_select(strm_tab, args->args_strm_select.strm_num,
322
&mask, args->args_strm_select.timeout);
324
- CP_TO_USR(args->args_strm_select.pmask, &mask, status, 1);
325
+ CP_TO_USR(args->args_strm_select.mask, &mask, status, 1);
329
@@ -1892,7 +1892,7 @@ u32 cmmwrap_get_handle(union trapped_args *args, void *pr_ctxt)
331
status = cmm_get_handle(hprocessor, &hcmm_mgr);
333
- CP_TO_USR(args->args_cmm_gethandle.ph_cmm_mgr, &hcmm_mgr, status, 1);
334
+ CP_TO_USR(args->args_cmm_gethandle.cmm_mgr, &hcmm_mgr, status, 1);