UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: tidspbridge: Change macros to static inline functions 

This patch changes preprocesing macros to static inline
funcions. Also the function is_equal_uuid (IS_EQUAL_UUID) now uses the
memcmp function.

Signed-off-by: Armando Uribe <x0095078@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Armando Uribe 2010-07-22 20:25:33 -05:00 committed by Greg Kroah-Hartman
parent 803cd75eff
commit bf968b0a52
3 changed files with 20 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/staging/tidspbridge/include/dspbridge/dbdefs.h
View File

@ -110,29 +110,15 @@
#define DSPTYPE64 0x99 #define DSPTYPE64 0x99
/* Handy Macros */ /* Handy Macros */
#define IS_VALID_PROC_EVENT(x) (((x) == 0) || (((x) & \ #define VALID_PROC_EVENT (DSP_PROCESSORSTATECHANGE | DSP_PROCESSORATTACH | \
(DSP_PROCESSORSTATECHANGE | \ DSP_PROCESSORDETACH | DSP_PROCESSORRESTART | DSP_NODESTATECHANGE | \
DSP_PROCESSORATTACH | \ DSP_STREAMDONE | DSP_STREAMIOCOMPLETION | DSP_MMUFAULT | \
DSP_PROCESSORDETACH | \ DSP_SYSERROR | DSP_WDTOVERFLOW | DSP_PWRERROR)
DSP_PROCESSORRESTART | \
DSP_NODESTATECHANGE | \ static inline bool is_valid_proc_event(u32 x)
DSP_STREAMDONE | \ {
DSP_STREAMIOCOMPLETION | \ return (x == 0 || (x & VALID_PROC_EVENT && !(x & ~VALID_PROC_EVENT)));
DSP_MMUFAULT | \ }
DSP_SYSERROR | \
DSP_WDTOVERFLOW | \
DSP_PWRERROR)) && \
!((x) & ~(DSP_PROCESSORSTATECHANGE | \
DSP_PROCESSORATTACH | \
DSP_PROCESSORDETACH | \
DSP_PROCESSORRESTART | \
DSP_NODESTATECHANGE | \
DSP_STREAMDONE | \
DSP_STREAMIOCOMPLETION | \
DSP_MMUFAULT | \
DSP_SYSERROR | \
DSP_WDTOVERFLOW | \
DSP_PWRERROR))))
#define IS_VALID_NODE_EVENT(x) (((x) == 0) || \ #define IS_VALID_NODE_EVENT(x) (((x) == 0) || \
(((x) & (DSP_NODESTATECHANGE | DSP_NODEMESSAGEREADY)) && \ (((x) & (DSP_NODESTATECHANGE | DSP_NODEMESSAGEREADY)) && \

20
drivers/staging/tidspbridge/rmgr/nldr.c
View File

@ -135,13 +135,11 @@
#define PDELETE "delete" #define PDELETE "delete"
#define PEXECUTE "execute" #define PEXECUTE "execute"
#define IS_EQUAL_UUID(uuid1, uuid2) (\ static inline bool is_equal_uuid(struct dsp_uuid *uuid1,
((uuid1).ul_data1 == (uuid2).ul_data1) && \ struct dsp_uuid *uuid2)
((uuid1).us_data2 == (uuid2).us_data2) && \ {
((uuid1).us_data3 == (uuid2).us_data3) && \ return !memcmp(uuid1, uuid2, sizeof(struct dsp_uuid));
((uuid1).uc_data4 == (uuid2).uc_data4) && \ }
((uuid1).uc_data5 == (uuid2).uc_data5) && \
(strncmp((void *)(uuid1).uc_data6, (void *)(uuid2).uc_data6, 6)) == 0)
/* /*
* ======== mem_seg_info ======== * ======== mem_seg_info ========
@ -1487,8 +1485,8 @@ static int load_ovly(struct nldr_nodeobject *nldr_node_obj,
/* Find the node in the table */ /* Find the node in the table */
for (i = 0; i < nldr_obj->ovly_nodes; i++) { for (i = 0; i < nldr_obj->ovly_nodes; i++) {
if (IS_EQUAL_UUID if (is_equal_uuid
(nldr_node_obj->uuid, nldr_obj->ovly_table[i].uuid)) { (&nldr_node_obj->uuid, &nldr_obj->ovly_table[i].uuid)) {
/* Found it */ /* Found it */
po_node = &(nldr_obj->ovly_table[i]); po_node = &(nldr_obj->ovly_table[i]);
break; break;
@ -1825,8 +1823,8 @@ static void unload_ovly(struct nldr_nodeobject *nldr_node_obj,
/* Find the node in the table */ /* Find the node in the table */
for (i = 0; i < nldr_obj->ovly_nodes; i++) { for (i = 0; i < nldr_obj->ovly_nodes; i++) {
if (IS_EQUAL_UUID if (is_equal_uuid
(nldr_node_obj->uuid, nldr_obj->ovly_table[i].uuid)) { (&nldr_node_obj->uuid, &nldr_obj->ovly_table[i].uuid)) {
/* Found it */ /* Found it */
po_node = &(nldr_obj->ovly_table[i]); po_node = &(nldr_obj->ovly_table[i]);
break; break;

4
drivers/staging/tidspbridge/rmgr/proc.c
View File

@ -1879,7 +1879,7 @@ int proc_notify_clients(void *proc, u32 events)
struct proc_object *p_proc_object = (struct proc_object *)proc; struct proc_object *p_proc_object = (struct proc_object *)proc;
DBC_REQUIRE(p_proc_object); DBC_REQUIRE(p_proc_object);
DBC_REQUIRE(IS_VALID_PROC_EVENT(events)); DBC_REQUIRE(is_valid_proc_event(events));
DBC_REQUIRE(refs > 0); DBC_REQUIRE(refs > 0);
if (!p_proc_object) { if (!p_proc_object) {
status = -EFAULT; status = -EFAULT;
@ -1902,7 +1902,7 @@ int proc_notify_all_clients(void *proc, u32 events)
int status = 0; int status = 0;
struct proc_object *p_proc_object = (struct proc_object *)proc; struct proc_object *p_proc_object = (struct proc_object *)proc;
DBC_REQUIRE(IS_VALID_PROC_EVENT(events)); DBC_REQUIRE(is_valid_proc_event(events));
DBC_REQUIRE(refs > 0); DBC_REQUIRE(refs > 0);
if (!p_proc_object) { if (!p_proc_object) {