Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 205865
b: refs/heads/master
c: 0cd343a
h: refs/heads/master
i:
  205863: 6db5659
v: v3
  • Loading branch information
Rene Sapiens authored and Greg Kroah-Hartman committed Jul 22, 2010
1 parent 7ded5c8 commit 9a3b6bb
Show file tree
Hide file tree
Showing 21 changed files with 190 additions and 189 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 318b5df99bbbe58eb9f80105d9534117ac2f25ce
refs/heads/master: 0cd343a42f60a965cece191efaefe51e01e58f64
30 changes: 15 additions & 15 deletions trunk/drivers/staging/tidspbridge/core/chnl_sm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
#define MAILBOX_IRQ INT_MAIL_MPU_IRQ

/* ----------------------------------- Function Prototypes */
static struct lst_list *create_chirp_list(u32 uChirps);
static struct lst_list *create_chirp_list(u32 chirps);

static void free_chirp_list(struct lst_list *lst);

Expand Down Expand Up @@ -709,18 +709,18 @@ int bridge_chnl_get_ioc(struct chnl_object *chnl_obj, u32 timeout,
* ======== bridge_chnl_get_mgr_info ========
* Retrieve information related to the channel manager.
*/
int bridge_chnl_get_mgr_info(struct chnl_mgr *hchnl_mgr, u32 uChnlID,
int bridge_chnl_get_mgr_info(struct chnl_mgr *hchnl_mgr, u32 ch_id,
OUT struct chnl_mgrinfo *mgr_info)
{
int status = 0;
struct chnl_mgr *chnl_mgr_obj = (struct chnl_mgr *)hchnl_mgr;

if (mgr_info != NULL) {
if (uChnlID <= CHNL_MAXCHANNELS) {
if (ch_id <= CHNL_MAXCHANNELS) {
if (hchnl_mgr) {
/* Return the requested information: */
mgr_info->chnl_obj =
chnl_mgr_obj->ap_channel[uChnlID];
chnl_mgr_obj->ap_channel[ch_id];
mgr_info->open_channels =
chnl_mgr_obj->open_channels;
mgr_info->dw_type = chnl_mgr_obj->dw_type;
Expand Down Expand Up @@ -776,7 +776,7 @@ int bridge_chnl_idle(struct chnl_object *chnl_obj, u32 timeout,
*/
int bridge_chnl_open(OUT struct chnl_object **chnl,
struct chnl_mgr *hchnl_mgr, s8 chnl_mode,
u32 uChnlId, CONST IN struct chnl_attr *pattrs)
u32 ch_id, CONST IN struct chnl_attr *pattrs)
{
int status = 0;
struct chnl_mgr *chnl_mgr_obj = hchnl_mgr;
Expand All @@ -794,23 +794,23 @@ int bridge_chnl_open(OUT struct chnl_object **chnl,
if (!hchnl_mgr) {
status = -EFAULT;
} else {
if (uChnlId != CHNL_PICKFREE) {
if (uChnlId >= chnl_mgr_obj->max_channels)
if (ch_id != CHNL_PICKFREE) {
if (ch_id >= chnl_mgr_obj->max_channels)
status = -ECHRNG;
else if (chnl_mgr_obj->ap_channel[uChnlId] !=
else if (chnl_mgr_obj->ap_channel[ch_id] !=
NULL)
status = -EALREADY;
} else {
/* Check for free channel */
status =
search_free_channel(chnl_mgr_obj, &uChnlId);
search_free_channel(chnl_mgr_obj, &ch_id);
}
}
}
if (DSP_FAILED(status))
goto func_end;

DBC_ASSERT(uChnlId < chnl_mgr_obj->max_channels);
DBC_ASSERT(ch_id < chnl_mgr_obj->max_channels);
/* Create channel object: */
pchnl = kzalloc(sizeof(struct chnl_object), GFP_KERNEL);
if (!pchnl) {
Expand Down Expand Up @@ -846,7 +846,7 @@ int bridge_chnl_open(OUT struct chnl_object **chnl,
pchnl->free_packets_list) {
/* Initialize CHNL object fields: */
pchnl->chnl_mgr_obj = chnl_mgr_obj;
pchnl->chnl_id = uChnlId;
pchnl->chnl_id = ch_id;
pchnl->chnl_mode = chnl_mode;
pchnl->user_event = sync_event;
pchnl->sync_event = sync_event;
Expand Down Expand Up @@ -926,13 +926,13 @@ int bridge_chnl_register_notify(struct chnl_object *chnl_obj,
* Purpose:
* Initialize a queue of channel I/O Request/Completion packets.
* Parameters:
* uChirps: Number of Chirps to allocate.
* chirps: Number of Chirps to allocate.
* Returns:
* Pointer to queue of IRPs, or NULL.
* Requires:
* Ensures:
*/
static struct lst_list *create_chirp_list(u32 uChirps)
static struct lst_list *create_chirp_list(u32 chirps)
{
struct lst_list *chirp_list;
struct chnl_irp *chnl_packet_obj;
Expand All @@ -943,14 +943,14 @@ static struct lst_list *create_chirp_list(u32 uChirps)
if (chirp_list) {
INIT_LIST_HEAD(&chirp_list->head);
/* Make N chirps and place on queue. */
for (i = 0; (i < uChirps)
for (i = 0; (i < chirps)
&& ((chnl_packet_obj = make_new_chirp()) != NULL); i++) {
lst_put_tail(chirp_list,
(struct list_head *)chnl_packet_obj);
}

/* If we couldn't allocate all chirps, free those allocated: */
if (i != uChirps) {
if (i != chirps) {
free_chirp_list(chirp_list);
chirp_list = NULL;
}
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/tidspbridge/core/tiomap3430.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1507,7 +1507,7 @@ static int bridge_brd_mem_un_map(struct bridge_dev_context *dev_ctxt,
"0x%x\n", paddr, ul_num_bytes);
bad_page_dump(paddr, pg);
} else {
SetPageDirty(pg);
set_page_dirty(pg);
page_cache_release(pg);
}
paddr += HW_PAGE_SIZE4KB;
Expand Down Expand Up @@ -1571,7 +1571,7 @@ static int bridge_brd_mem_un_map(struct bridge_dev_context *dev_ctxt,
"0x%x\n", paddr, ul_num_bytes);
bad_page_dump(paddr, pg);
} else {
SetPageDirty(pg);
set_page_dirty(pg);
page_cache_release(pg);
}
}
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/tidspbridge/hw/hw_mmu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ hw_status hw_mmu_fault_addr_read(const void __iomem *base_address, u32 *addr)
return status;
}

hw_status hw_mmu_ttb_set(const void __iomem *base_address, u32 TTBPhysAddr)
hw_status hw_mmu_ttb_set(const void __iomem *base_address, u32 ttb_phys_addr)
{
hw_status status = RET_OK;
u32 load_ttb;
Expand All @@ -268,7 +268,7 @@ hw_status hw_mmu_ttb_set(const void __iomem *base_address, u32 TTBPhysAddr)
CHECK_INPUT_PARAM(base_address, 0, RET_BAD_NULL_PARAM,
RES_MMU_BASE + RES_INVALID_INPUT_PARAM);

load_ttb = TTBPhysAddr & ~0x7FUL;
load_ttb = ttb_phys_addr & ~0x7FUL;
/* write values to register */
MMUMMU_TTB_WRITE_REGISTER32(base_address, load_ttb);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/tidspbridge/hw/hw_mmu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ extern hw_status hw_mmu_fault_addr_read(const void __iomem *base_address,

/* Set the TT base address */
extern hw_status hw_mmu_ttb_set(const void __iomem *base_address,
u32 TTBPhysAddr);
u32 ttb_phys_addr);

extern hw_status hw_mmu_twl_enable(const void __iomem *base_address);

Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/tidspbridge/include/dspbridge/dbdefs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@
#define DSPWORDSIZE sizeof(DSPWORD)

/* Success & Failure macros */
#define DSP_SUCCEEDED(Status) likely((s32)(Status) >= 0)
#define DSP_FAILED(Status) unlikely((s32)(Status) < 0)
#define DSP_SUCCEEDED(status) likely((s32)(status) >= 0)
#define DSP_FAILED(status) unlikely((s32)(status) < 0)

/* Power control enumerations */
#define PROC_PWRCONTROL 0x8070
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/tidspbridge/include/dspbridge/dblldefs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ typedef int(*dbll_open_fxn) (struct dbll_tar_obj *target, char *file,
*/
typedef int(*dbll_read_sect_fxn) (struct dbll_library_obj *lib,
char *name, char *content,
u32 uContentSize);
u32 cont_size);

/*
* ======== dbll_set_attrs ========
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/tidspbridge/include/dspbridge/drv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ extern void mem_ext_phys_pool_release(void);
* Allocate physically contiguous, uncached memory
* Parameters:
* byte_size: Number of bytes to allocate.
* ulAlign: Alignment Mask.
* align_mask: Alignment Mask.
* physical_address: Physical address of allocated memory.
* Returns:
* Pointer to a block of memory;
Expand All @@ -463,7 +463,7 @@ extern void mem_ext_phys_pool_release(void);
* location of memory.
*/
extern void *mem_alloc_phys_mem(IN u32 byte_size,
IN u32 ulAlign, OUT u32 *physical_address);
IN u32 align_mask, OUT u32 *physical_address);

/*
* ======== mem_free_phys_mem ========
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/tidspbridge/include/dspbridge/dspapi-ioctl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <dspbridge/strmdefs.h>
#include <dspbridge/dbdcd.h>

union Trapped_Args {
union trapped_args {

/* MGR Module */
struct {
Expand Down
112 changes: 56 additions & 56 deletions trunk/drivers/staging/tidspbridge/include/dspbridge/dspapi.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
* Ensures:
*/
extern int api_call_dev_ioctl(unsigned int cmd,
union Trapped_Args *args,
union trapped_args *args,
u32 *result, void *pr_ctxt);

/*
Expand Down Expand Up @@ -98,70 +98,70 @@ extern int api_init_complete2(void);
extern void api_exit(void);

/* MGR wrapper functions */
extern u32 mgrwrap_enum_node_info(union Trapped_Args *args, void *pr_ctxt);
extern u32 mgrwrap_enum_proc_info(union Trapped_Args *args, void *pr_ctxt);
extern u32 mgrwrap_register_object(union Trapped_Args *args, void *pr_ctxt);
extern u32 mgrwrap_unregister_object(union Trapped_Args *args, void *pr_ctxt);
extern u32 mgrwrap_wait_for_bridge_events(union Trapped_Args *args,
extern u32 mgrwrap_enum_node_info(union trapped_args *args, void *pr_ctxt);
extern u32 mgrwrap_enum_proc_info(union trapped_args *args, void *pr_ctxt);
extern u32 mgrwrap_register_object(union trapped_args *args, void *pr_ctxt);
extern u32 mgrwrap_unregister_object(union trapped_args *args, void *pr_ctxt);
extern u32 mgrwrap_wait_for_bridge_events(union trapped_args *args,
void *pr_ctxt);

extern u32 mgrwrap_get_process_resources_info(union Trapped_Args *args,
extern u32 mgrwrap_get_process_resources_info(union trapped_args *args,
void *pr_ctxt);

/* CPRC (Processor) wrapper Functions */
extern u32 procwrap_attach(union Trapped_Args *args, void *pr_ctxt);
extern u32 procwrap_ctrl(union Trapped_Args *args, void *pr_ctxt);
extern u32 procwrap_detach(union Trapped_Args *args, void *pr_ctxt);
extern u32 procwrap_enum_node_info(union Trapped_Args *args, void *pr_ctxt);
extern u32 procwrap_enum_resources(union Trapped_Args *args, void *pr_ctxt);
extern u32 procwrap_get_state(union Trapped_Args *args, void *pr_ctxt);
extern u32 procwrap_get_trace(union Trapped_Args *args, void *pr_ctxt);
extern u32 procwrap_load(union Trapped_Args *args, void *pr_ctxt);
extern u32 procwrap_register_notify(union Trapped_Args *args, void *pr_ctxt);
extern u32 procwrap_start(union Trapped_Args *args, void *pr_ctxt);
extern u32 procwrap_reserve_memory(union Trapped_Args *args, void *pr_ctxt);
extern u32 procwrap_un_reserve_memory(union Trapped_Args *args, void *pr_ctxt);
extern u32 procwrap_map(union Trapped_Args *args, void *pr_ctxt);
extern u32 procwrap_un_map(union Trapped_Args *args, void *pr_ctxt);
extern u32 procwrap_flush_memory(union Trapped_Args *args, void *pr_ctxt);
extern u32 procwrap_stop(union Trapped_Args *args, void *pr_ctxt);
extern u32 procwrap_invalidate_memory(union Trapped_Args *args, void *pr_ctxt);
extern u32 procwrap_begin_dma(union Trapped_Args *args, void *pr_ctxt);
extern u32 procwrap_end_dma(union Trapped_Args *args, void *pr_ctxt);
extern u32 procwrap_attach(union trapped_args *args, void *pr_ctxt);
extern u32 procwrap_ctrl(union trapped_args *args, void *pr_ctxt);
extern u32 procwrap_detach(union trapped_args *args, void *pr_ctxt);
extern u32 procwrap_enum_node_info(union trapped_args *args, void *pr_ctxt);
extern u32 procwrap_enum_resources(union trapped_args *args, void *pr_ctxt);
extern u32 procwrap_get_state(union trapped_args *args, void *pr_ctxt);
extern u32 procwrap_get_trace(union trapped_args *args, void *pr_ctxt);
extern u32 procwrap_load(union trapped_args *args, void *pr_ctxt);
extern u32 procwrap_register_notify(union trapped_args *args, void *pr_ctxt);
extern u32 procwrap_start(union trapped_args *args, void *pr_ctxt);
extern u32 procwrap_reserve_memory(union trapped_args *args, void *pr_ctxt);
extern u32 procwrap_un_reserve_memory(union trapped_args *args, void *pr_ctxt);
extern u32 procwrap_map(union trapped_args *args, void *pr_ctxt);
extern u32 procwrap_un_map(union trapped_args *args, void *pr_ctxt);
extern u32 procwrap_flush_memory(union trapped_args *args, void *pr_ctxt);
extern u32 procwrap_stop(union trapped_args *args, void *pr_ctxt);
extern u32 procwrap_invalidate_memory(union trapped_args *args, void *pr_ctxt);
extern u32 procwrap_begin_dma(union trapped_args *args, void *pr_ctxt);
extern u32 procwrap_end_dma(union trapped_args *args, void *pr_ctxt);

/* NODE wrapper functions */
extern u32 nodewrap_allocate(union Trapped_Args *args, void *pr_ctxt);
extern u32 nodewrap_alloc_msg_buf(union Trapped_Args *args, void *pr_ctxt);
extern u32 nodewrap_change_priority(union Trapped_Args *args, void *pr_ctxt);
extern u32 nodewrap_connect(union Trapped_Args *args, void *pr_ctxt);
extern u32 nodewrap_create(union Trapped_Args *args, void *pr_ctxt);
extern u32 nodewrap_delete(union Trapped_Args *args, void *pr_ctxt);
extern u32 nodewrap_free_msg_buf(union Trapped_Args *args, void *pr_ctxt);
extern u32 nodewrap_get_attr(union Trapped_Args *args, void *pr_ctxt);
extern u32 nodewrap_get_message(union Trapped_Args *args, void *pr_ctxt);
extern u32 nodewrap_pause(union Trapped_Args *args, void *pr_ctxt);
extern u32 nodewrap_put_message(union Trapped_Args *args, void *pr_ctxt);
extern u32 nodewrap_register_notify(union Trapped_Args *args, void *pr_ctxt);
extern u32 nodewrap_run(union Trapped_Args *args, void *pr_ctxt);
extern u32 nodewrap_terminate(union Trapped_Args *args, void *pr_ctxt);
extern u32 nodewrap_get_uuid_props(union Trapped_Args *args, void *pr_ctxt);
extern u32 nodewrap_allocate(union trapped_args *args, void *pr_ctxt);
extern u32 nodewrap_alloc_msg_buf(union trapped_args *args, void *pr_ctxt);
extern u32 nodewrap_change_priority(union trapped_args *args, void *pr_ctxt);
extern u32 nodewrap_connect(union trapped_args *args, void *pr_ctxt);
extern u32 nodewrap_create(union trapped_args *args, void *pr_ctxt);
extern u32 nodewrap_delete(union trapped_args *args, void *pr_ctxt);
extern u32 nodewrap_free_msg_buf(union trapped_args *args, void *pr_ctxt);
extern u32 nodewrap_get_attr(union trapped_args *args, void *pr_ctxt);
extern u32 nodewrap_get_message(union trapped_args *args, void *pr_ctxt);
extern u32 nodewrap_pause(union trapped_args *args, void *pr_ctxt);
extern u32 nodewrap_put_message(union trapped_args *args, void *pr_ctxt);
extern u32 nodewrap_register_notify(union trapped_args *args, void *pr_ctxt);
extern u32 nodewrap_run(union trapped_args *args, void *pr_ctxt);
extern u32 nodewrap_terminate(union trapped_args *args, void *pr_ctxt);
extern u32 nodewrap_get_uuid_props(union trapped_args *args, void *pr_ctxt);

/* STRM wrapper functions */
extern u32 strmwrap_allocate_buffer(union Trapped_Args *args, void *pr_ctxt);
extern u32 strmwrap_close(union Trapped_Args *args, void *pr_ctxt);
extern u32 strmwrap_free_buffer(union Trapped_Args *args, void *pr_ctxt);
extern u32 strmwrap_get_event_handle(union Trapped_Args *args, void *pr_ctxt);
extern u32 strmwrap_get_info(union Trapped_Args *args, void *pr_ctxt);
extern u32 strmwrap_idle(union Trapped_Args *args, void *pr_ctxt);
extern u32 strmwrap_issue(union Trapped_Args *args, void *pr_ctxt);
extern u32 strmwrap_open(union Trapped_Args *args, void *pr_ctxt);
extern u32 strmwrap_reclaim(union Trapped_Args *args, void *pr_ctxt);
extern u32 strmwrap_register_notify(union Trapped_Args *args, void *pr_ctxt);
extern u32 strmwrap_select(union Trapped_Args *args, void *pr_ctxt);
extern u32 strmwrap_allocate_buffer(union trapped_args *args, void *pr_ctxt);
extern u32 strmwrap_close(union trapped_args *args, void *pr_ctxt);
extern u32 strmwrap_free_buffer(union trapped_args *args, void *pr_ctxt);
extern u32 strmwrap_get_event_handle(union trapped_args *args, void *pr_ctxt);
extern u32 strmwrap_get_info(union trapped_args *args, void *pr_ctxt);
extern u32 strmwrap_idle(union trapped_args *args, void *pr_ctxt);
extern u32 strmwrap_issue(union trapped_args *args, void *pr_ctxt);
extern u32 strmwrap_open(union trapped_args *args, void *pr_ctxt);
extern u32 strmwrap_reclaim(union trapped_args *args, void *pr_ctxt);
extern u32 strmwrap_register_notify(union trapped_args *args, void *pr_ctxt);
extern u32 strmwrap_select(union trapped_args *args, void *pr_ctxt);

extern u32 cmmwrap_calloc_buf(union Trapped_Args *args, void *pr_ctxt);
extern u32 cmmwrap_free_buf(union Trapped_Args *args, void *pr_ctxt);
extern u32 cmmwrap_get_handle(union Trapped_Args *args, void *pr_ctxt);
extern u32 cmmwrap_get_info(union Trapped_Args *args, void *pr_ctxt);
extern u32 cmmwrap_calloc_buf(union trapped_args *args, void *pr_ctxt);
extern u32 cmmwrap_free_buf(union trapped_args *args, void *pr_ctxt);
extern u32 cmmwrap_get_handle(union trapped_args *args, void *pr_ctxt);
extern u32 cmmwrap_get_info(union trapped_args *args, void *pr_ctxt);

#endif /* DSPAPI_ */
4 changes: 2 additions & 2 deletions trunk/drivers/staging/tidspbridge/include/dspbridge/dspchnl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ extern int bridge_chnl_destroy(struct chnl_mgr *hchnl_mgr);
extern int bridge_chnl_open(OUT struct chnl_object **chnl,
struct chnl_mgr *hchnl_mgr,
s8 chnl_mode,
u32 uChnlId,
u32 ch_id,
CONST IN OPTIONAL struct chnl_attr
*pattrs);

Expand All @@ -57,7 +57,7 @@ extern int bridge_chnl_get_info(struct chnl_object *chnl_obj,
OUT struct chnl_info *channel_info);

extern int bridge_chnl_get_mgr_info(struct chnl_mgr *hchnl_mgr,
u32 uChnlID, OUT struct chnl_mgrinfo
u32 ch_id, OUT struct chnl_mgrinfo
*mgr_info);

extern int bridge_chnl_idle(struct chnl_object *chnl_obj,
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ typedef void (*fxn_deh_notify) (struct deh_mgr *hdeh_mgr,
* CHNL_GetMgr().
* chnl_mode: One of {CHNL_MODETODSP, CHNL_MODEFROMDSP} specifies
* direction of data transfer.
* uChnlId: If CHNL_PICKFREE is specified, the channel manager will
* ch_id: If CHNL_PICKFREE is specified, the channel manager will
* select a free channel id (default);
* otherwise this field specifies the id of the channel.
* pattrs: Channel attributes. Attribute fields are as follows:
Expand Down Expand Up @@ -411,7 +411,7 @@ typedef int(*fxn_chnl_open) (OUT struct chnl_object
**chnl,
struct chnl_mgr *hchnl_mgr,
s8 chnl_mode,
u32 uChnlId,
u32 ch_id,
CONST IN OPTIONAL struct
chnl_attr * pattrs);

Expand Down Expand Up @@ -569,7 +569,7 @@ typedef int(*fxn_chnl_getinfo) (struct chnl_object *chnl_obj,
* Retrieve information related to the channel manager.
* Parameters:
* hchnl_mgr: Handle to a valid channel manager, or NULL.
* uChnlID: Channel ID.
* ch_id: Channel ID.
* mgr_info: Location to store channel manager info.
* Returns:
* 0: Success;
Expand All @@ -582,7 +582,7 @@ typedef int(*fxn_chnl_getinfo) (struct chnl_object *chnl_obj,
*/
typedef int(*fxn_chnl_getmgrinfo) (struct chnl_mgr
* hchnl_mgr,
u32 uChnlID,
u32 ch_id,
OUT struct chnl_mgrinfo *mgr_info);

/*
Expand Down
Loading

0 comments on commit 9a3b6bb

Please sign in to comment.