linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / powerpc / platforms / cell / spufs / spufs.h

diff --git a/arch/powerpc/platforms/cell/spufs/spufs.h b/arch/powerpc/platforms/cell/spufs/spufs.h
index 4485738..db2601f 100644 (file)
--- a/arch/powerpc/platforms/cell/spufs/spufs.h
+++ b/arch/powerpc/platforms/cell/spufs/spufs.h
@@ -43,11 +43,7 @@ struct spu_context {
        struct spu *spu;                  /* pointer to a physical SPU */
        struct spu_state csa;             /* SPU context save area. */
        spinlock_t mmio_lock;             /* protects mmio access */
-       struct address_space *local_store; /* local store mapping.  */
-       struct address_space *mfc;         /* 'mfc' area mappings. */
-       struct address_space *cntl;        /* 'control' area mappings. */
-       struct address_space *signal1;     /* 'signal1' area mappings. */
-       struct address_space *signal2;     /* 'signal2' area mappings. */
+       struct address_space *local_store;/* local store backing store */
 
        enum { SPU_STATE_RUNNABLE, SPU_STATE_SAVED } state;
        struct rw_semaphore state_sema;
@@ -59,27 +55,13 @@ struct spu_context {
        wait_queue_head_t ibox_wq;
        wait_queue_head_t wbox_wq;
        wait_queue_head_t stop_wq;
-       wait_queue_head_t mfc_wq;
        struct fasync_struct *ibox_fasync;
        struct fasync_struct *wbox_fasync;
-       struct fasync_struct *mfc_fasync;
-       u32 tagwait;
        struct spu_context_ops *ops;
        struct work_struct reap_work;
        u64 flags;
 };
 
-struct mfc_dma_command {
-       int32_t pad;    /* reserved */
-       uint32_t lsa;   /* local storage address */
-       uint64_t ea;    /* effective address */
-       uint16_t size;  /* transfer size */
-       uint16_t tag;   /* command tag */
-       uint16_t class; /* class ID */
-       uint16_t cmd;   /* command opcode */
-};
-
-
 /* SPU context query/set operations. */
 struct spu_context_ops {
        int (*mbox_read) (struct spu_context * ctx, u32 * data);
@@ -102,11 +84,6 @@ struct spu_context_ops {
        char*(*get_ls) (struct spu_context * ctx);
        void (*runcntl_write) (struct spu_context * ctx, u32 data);
        void (*runcntl_stop) (struct spu_context * ctx);
-       int (*set_mfc_query)(struct spu_context * ctx, u32 mask, u32 mode);
-       u32 (*read_mfc_tagstatus)(struct spu_context * ctx);
-       u32 (*get_mfc_free_elements)(struct spu_context *ctx);
-       int (*send_mfc_command)(struct spu_context *ctx,
-                                       struct mfc_dma_command *cmd);
 };
 
 extern struct spu_context_ops spu_hw_ops;
@@ -129,7 +106,7 @@ long spufs_create_thread(struct nameidata *nd,
 extern struct file_operations spufs_context_fops;
 
 /* context management */
-struct spu_context * alloc_spu_context(void);
+struct spu_context * alloc_spu_context(struct address_space *local_store);
 void destroy_spu_context(struct kref *kref);
 struct spu_context * get_spu_context(struct spu_context *ctx);
 int put_spu_context(struct spu_context *ctx);
@@ -182,6 +159,5 @@ size_t spu_ibox_read(struct spu_context *ctx, u32 *data);
 void spufs_ibox_callback(struct spu *spu);
 void spufs_wbox_callback(struct spu *spu);
 void spufs_stop_callback(struct spu *spu);
-void spufs_mfc_callback(struct spu *spu);
 
 #endif