Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 162389
b: refs/heads/master
c: 70ae04e
h: refs/heads/master
i:
  162387: f9d8b31
v: v3
  • Loading branch information
Alan Cox authored and Greg Kroah-Hartman committed Sep 15, 2009
1 parent 772e6f1 commit a603c50
Show file tree
Hide file tree
Showing 3 changed files with 78 additions and 102 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4c29e9799878b6a5fc9ec37d40132c2380911e0f
refs/heads/master: 70ae04e6cc38454187c9ade023f2bdce474e6936
30 changes: 8 additions & 22 deletions trunk/drivers/staging/sep/sep_dev.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,30 +34,23 @@ struct sep_device {

unsigned long in_use;

unsigned long io_bus;
unsigned long io_end_bus;
unsigned long io_memory_size;
void __iomem *io_addr;
/* address of the shared memory allocated during init for SEP driver
(coherent alloc) */
void *shared_addr;
/* the physical address of the shared area */
dma_addr_t shared_bus;

/* restricted access region */
/* restricted access region (coherent alloc) */
dma_addr_t rar_bus;
void *rar_addr;

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

/* firmware regions */
dma_addr_t cache_bus;
/* firmware regions: cache is at rar_addr */
unsigned long cache_size;
void *cache_addr;

/* follows the cache */
dma_addr_t resident_bus;
unsigned long resident_size;
void *resident_addr;

void *rar_region_addr;

/* start address of the access to the SEP registers from driver */
void __iomem *reg_addr;
/* transaction counter that coordinates the transactions between SEP and HOST */
Expand Down Expand Up @@ -88,13 +81,6 @@ struct sep_device {
/* pointer to the workqueue that handles the flow done interrupts */
struct workqueue_struct *flow_wq;

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

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

static struct sep_device *sep_dev;
Expand Down
Loading

0 comments on commit a603c50

Please sign in to comment.