Revert "Move MTRR feature away from master branch"

This reverts commit b9d6050600.

# Conflicts:
#	src/spd.c
This commit is contained in:
RichardG867
2020-05-01 20:03:03 -03:00
parent 580a912425
commit 6c4a6026f3
10 changed files with 405 additions and 33 deletions

View File

@@ -43,6 +43,7 @@ extern int fdd_can_read_medium(int drive);
extern int fdd_doublestep_40(int drive);
extern int fdd_is_525(int drive);
extern int fdd_is_dd(int drive);
extern int fdd_is_hd(int drive);
extern int fdd_is_ed(int drive);
extern int fdd_is_double_sided(int drive);
extern void fdd_set_head(int drive, int head);

View File

@@ -334,6 +334,10 @@ extern void mem_init(void);
extern void mem_reset(void);
extern void mem_remap_top(int kb);
extern void mem_add_mtrr(uint64_t base, uint64_t mask, uint8_t type);
extern void mem_del_mtrr(uint64_t base, uint64_t mask);
extern void mem_invalidate_mtrr(uint8_t wb);
#ifdef EMU_CPU_H
static __inline uint32_t get_phys(uint32_t addr)