From ae4f03d5610cdec6a8fb1704d06fc1bebbc43c49 Mon Sep 17 00:00:00 2001 From: Ionut Nicu Date: Sun, 21 Nov 2010 10:46:20 +0000 Subject: [PATCH] --- yaml --- r: 235927 b: refs/heads/master c: ad4adcc495363fb2506d82c9cab0f71dea83ea9b h: refs/heads/master i: 235925: 2dc65d2d9081b92598a629bbf01fe5ba39ef6be5 235923: 84177828a05d106cd489b902b09bb1c2fbe9685f 235919: 923aa9b1d2dddf1a390f2c4d22ce220c9608b48e v: v3 --- [refs] | 2 +- .../tidspbridge/include/dspbridge/utildefs.h | 39 ------------------- trunk/drivers/staging/tidspbridge/pmgr/cmm.c | 9 +---- 3 files changed, 2 insertions(+), 48 deletions(-) delete mode 100644 trunk/drivers/staging/tidspbridge/include/dspbridge/utildefs.h diff --git a/[refs] b/[refs] index 5de98a3c98d2..c0f6cd0f4877 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 31de278078aeb869467cbde0877d7f1027ab844c +refs/heads/master: ad4adcc495363fb2506d82c9cab0f71dea83ea9b diff --git a/trunk/drivers/staging/tidspbridge/include/dspbridge/utildefs.h b/trunk/drivers/staging/tidspbridge/include/dspbridge/utildefs.h deleted file mode 100644 index 8fe5414824ce..000000000000 --- a/trunk/drivers/staging/tidspbridge/include/dspbridge/utildefs.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * utildefs.h - * - * DSP-BIOS Bridge driver support functions for TI OMAP processors. - * - * Global UTIL constants and types, shared between DSP API and DSPSYS. - * - * Copyright (C) 2005-2006 Texas Instruments, Inc. - * - * This package is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. - */ - -#ifndef UTILDEFS_ -#define UTILDEFS_ - -/* constants taken from configmg.h */ -#define UTIL_MAXMEMREGS 9 -#define UTIL_MAXIOPORTS 20 -#define UTIL_MAXIRQS 7 -#define UTIL_MAXDMACHNLS 7 - -/* misc. constants */ -#define UTIL_MAXARGVS 10 - -/* Platform specific important info */ -struct util_sysinfo { - /* Granularity of page protection; usually 1k or 4k */ - u32 dw_page_size; - u32 dw_allocation_granularity; /* VM granularity, usually 64K */ - u32 dw_number_of_processors; /* Used as sanity check */ -}; - -#endif /* UTILDEFS_ */ diff --git a/trunk/drivers/staging/tidspbridge/pmgr/cmm.c b/trunk/drivers/staging/tidspbridge/pmgr/cmm.c index 93a7c4fd57e4..8dbdd20c4e9e 100644 --- a/trunk/drivers/staging/tidspbridge/pmgr/cmm.c +++ b/trunk/drivers/staging/tidspbridge/pmgr/cmm.c @@ -40,7 +40,6 @@ /* ----------------------------------- OS Adaptation Layer */ #include #include -#include /* ----------------------------------- Platform Manager */ #include @@ -245,7 +244,6 @@ int cmm_create(struct cmm_object **ph_cmm_mgr, { struct cmm_object *cmm_obj = NULL; int status = 0; - struct util_sysinfo sys_info; DBC_REQUIRE(refs > 0); DBC_REQUIRE(ph_cmm_mgr != NULL); @@ -261,12 +259,7 @@ int cmm_create(struct cmm_object **ph_cmm_mgr, DBC_ASSERT(mgr_attrts->ul_min_block_size >= 4); /* save away smallest block allocation for this cmm mgr */ cmm_obj->ul_min_block_size = mgr_attrts->ul_min_block_size; - /* save away the systems memory page size */ - sys_info.dw_page_size = PAGE_SIZE; - sys_info.dw_allocation_granularity = PAGE_SIZE; - sys_info.dw_number_of_processors = 1; - - cmm_obj->dw_page_size = sys_info.dw_page_size; + cmm_obj->dw_page_size = PAGE_SIZE; /* Note: DSP SM seg table(aDSPSMSegTab[]) zero'd by * MEM_ALLOC_OBJECT */