Merge remote-tracking branch 'bonzini/scsi-next' into staging

[qemu.git] / target-cris / mmu.h

diff --git a/target-cris/mmu.h b/target-cris/mmu.h
index adbc1fc5df333c524491e5fe6f5be5037a76b609..8e249e812b7a5333f3e07e83741be1d7ebd1668a 100644 (file)
--- a/target-cris/mmu.h
+++ b/target-cris/mmu.h
@@ -3,18 +3,15 @@
 #define CRIS_MMU_ERR_WRITE 2
 #define CRIS_MMU_ERR_FLUSH 3
 
-struct cris_mmu_result_t
+struct cris_mmu_result
 {
        uint32_t phy;
-       uint32_t pfn;
-       int g:1;
-       int v:1;
-       int k:1;
-       int w:1;
-       int e:1;
-       int cause_op;
+       int prot;
+       int bf_vec;
 };
 
-int cris_mmu_translate(struct cris_mmu_result_t *res,
-                      CPUState *env, uint32_t vaddr,
-                      int rw, int is_user);
+void cris_mmu_init(CPUCRISState *env);
+void cris_mmu_flush_pid(CPUCRISState *env, uint32_t pid);
+int cris_mmu_translate(struct cris_mmu_result *res,
+                      CPUCRISState *env, uint32_t vaddr,
+                      int rw, int mmu_idx, int debug);