Skip to content

Commit

Permalink
Staging: sep: Try and get kernel address and user address types right
Browse files Browse the repository at this point in the history
We will need to tackle this in order to begin doing something about the
bus handled and shared memory object mess.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Alan Cox authored and Greg Kroah-Hartman committed Sep 15, 2009
1 parent 3b66bb6 commit 790cf1b
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 64 deletions.
14 changes: 7 additions & 7 deletions drivers/staging/sep/sep_dev.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,19 @@ struct sep_device {
void __iomem *io_addr;

/* restricted access region */
unsigned long rar_bus;
dma_addr_t rar_bus;
void *rar_addr;

/* shared memory region */
unsigned long shared_bus;
dma_addr_t shared_bus;
void *shared_addr;

/* firmware regions */
unsigned long cache_bus;
dma_addr_t cache_bus;
unsigned long cache_size;
void *cache_addr;

unsigned long resident_bus;
dma_addr_t resident_bus;
unsigned long resident_size;
void *resident_addr;

Expand Down Expand Up @@ -87,12 +87,12 @@ struct sep_device {
struct workqueue_struct *flow_wq;

/* address of the shared memory allocated during init for SEP driver */
unsigned long shared_area;
void *shared_area;
/* the physical address of the shared area */
unsigned long shared_area_bus;
dma_addr_t shared_area_bus;

/* Message Shared Area start address - will be allocated during init */
unsigned long message_shared_area_addr;
void *message_shared_area_addr;
};

static struct sep_device *sep_dev;
Expand Down
Loading

0 comments on commit 790cf1b

Please sign in to comment.