---

yaml --- r: 205869 b: refs/heads/master c: 5e76806 h: refs/heads/master i: 205867: 0d33f1c v: v3
git-mirror · Jul 22, 2010 · 3c21ee2 · 3c21ee2
1 parent 2422d62
commit 3c21ee2
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 35 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8c1ad8ce317c1e213db47f094d6eee8dec7d280
+refs/heads/master: 5e7680679e4ac852db7b03e232f3472f86d4c47f
diff --git a/trunk/drivers/staging/tidspbridge/core/tiomap3430.c b/trunk/drivers/staging/tidspbridge/core/tiomap3430.c
@@ -1863,10 +1863,10 @@ bool wait_for_start(struct bridge_dev_context *dev_context, u32 dw_sync_addr)
 	while (*((volatile u16 *)dw_sync_addr) && --timeout)
 		udelay(10);
 
-	/*  If timed out: return FALSE */
+	/*  If timed out: return false */
 	if (!timeout) {
 		pr_err("%s: Timed out waiting DSP to Start\n", __func__);
-		return FALSE;
+		return false;
 	}
-	return TRUE;
+	return true;
 }
diff --git a/trunk/drivers/staging/tidspbridge/dynload/dload_internal.h b/trunk/drivers/staging/tidspbridge/dynload/dload_internal.h
@@ -23,9 +23,6 @@
  * Internal state definitions for the dynamic loader
  */
 
-#define TRUE 1
-#define FALSE 0
-
 /* type used for relocation intermediate results */
 typedef s32 rvalue;
 

diff --git a/trunk/drivers/staging/tidspbridge/dynload/header.h b/trunk/drivers/staging/tidspbridge/dynload/header.h
@@ -14,8 +14,6 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define TRUE 1
-#define FALSE 0
 #ifndef NULL
 #define NULL 0
 #endif

diff --git a/trunk/drivers/staging/tidspbridge/gen/gb.c b/trunk/drivers/staging/tidspbridge/gen/gb.c
@@ -161,7 +161,7 @@ bool gb_test(struct gb_t_map *map, u32 bitn)
 
 	mask = 1L << (bitn % BITS_PER_LONG);
 	word = map->words[bitn / BITS_PER_LONG];
-	state = word & mask ? TRUE : FALSE;
+	state = word & mask ? true : false;
 
 	return state;
 }
diff --git a/trunk/drivers/staging/tidspbridge/hw/GlobalTypes.h b/trunk/drivers/staging/tidspbridge/hw/GlobalTypes.h
@@ -19,16 +19,6 @@
 #ifndef _GLOBALTYPES_H
 #define _GLOBALTYPES_H
 
-/*
- * Definition: TRUE, FALSE
- *
- * DESCRIPTION:  Boolean Definitions
- */
-#ifndef TRUE
-#define FALSE	0
-#define TRUE	(!(FALSE))
-#endif
-
 /*
  * Definition: NULL
  *

diff --git a/trunk/drivers/staging/tidspbridge/include/dspbridge/dbtype.h b/trunk/drivers/staging/tidspbridge/include/dspbridge/dbtype.h
@@ -41,17 +41,6 @@
 #define CONST   const
 #endif
 
-/*===========================================================================*/
-/*  Boolean constants */
-/*===========================================================================*/
-
-#ifndef FALSE
-#define FALSE   0
-#endif
-#ifndef TRUE
-#define TRUE    1
-#endif
-
 /*===========================================================================*/
 /*  NULL    (Definition is language specific) */
 /*===========================================================================*/

diff --git a/trunk/drivers/staging/tidspbridge/pmgr/dbll.c b/trunk/drivers/staging/tidspbridge/pmgr/dbll.c
@@ -1226,7 +1226,7 @@ static int dbll_rmm_alloc(struct dynamic_loader_allocate *this,
 	int status = 0;
 	u32 mem_sect_type;
 	struct rmm_addr rmm_addr_obj;
-	s32 ret = TRUE;
+	s32 ret = true;
 	unsigned stype = DLOAD_SECTION_TYPE(info->type);
 	char *token = NULL;
 	char *sz_sec_last_token = NULL;
@@ -1315,7 +1315,7 @@ static int dbll_rmm_alloc(struct dynamic_loader_allocate *this,
 						    rmm_handle, mem_sect_type,
 						    alloc_size, align,
 						    (u32 *) &rmm_addr_obj,
-						    seg_id, req, FALSE);
+						    seg_id, req, false);
 	}
 	if (DSP_FAILED(status)) {
 		ret = false;

diff --git a/trunk/drivers/staging/tidspbridge/pmgr/dmm.c b/trunk/drivers/staging/tidspbridge/pmgr/dmm.c
@@ -503,7 +503,7 @@ u32 dmm_mem_map_dump(struct dmm_object *dmm_mgr)
 		for (i = 0; i < table_size; i +=
 		     virtual_mapping_table[i].region_size) {
 			curr_node = virtual_mapping_table + i;
-			if (curr_node->reserved == TRUE) {
+			if (curr_node->reserved) {
 				/*printk("RESERVED size = 0x%x, "
 				   "Map size = 0x%x\n",
 				   (curr_node->region_size * PG_SIZE4K),

diff --git a/trunk/drivers/staging/tidspbridge/rmgr/node.c b/trunk/drivers/staging/tidspbridge/rmgr/node.c
@@ -2620,7 +2620,7 @@ static void delete_node(struct node_object *hnode,
 
 	/* Free all SM address translator resources */
 	if (xlator) {
-		(void)cmm_xlator_delete(xlator, TRUE);	/* force free */
+		(void)cmm_xlator_delete(xlator, true);	/* force free */
 		xlator = NULL;
 	}