--- hatari/src/uae-cpu/memory.h 2019/04/01 07:09:16 1.1 +++ hatari/src/uae-cpu/memory.h 2019/04/01 07:10:24 1.1.1.3 @@ -4,10 +4,14 @@ * memory management * * Copyright 1995 Bernd Schmidt + * + * Adaptation to Hatari by Thomas Huth */ -#ifndef UAEMEMORY -#define UAEMEMORY +#ifndef UAE_MEMORY_H +#define UAE_MEMORY_H + +#include "maccess.h" /* Enabling this adds one additional native memory reference per 68k memory @@ -28,14 +32,6 @@ typedef uae_u8 *(*xlate_func)(uaecptr) R typedef int (*check_func)(uaecptr, uae_u32) REGPARAM; extern char *address_space, *good_address_map; -extern uae_u8 *chipmemory; - -extern uae_u32 allocated_chipmem; -extern uae_u32 allocated_fastmem; -extern uae_u32 allocated_bogomem; -extern uae_u32 allocated_gfxmem; -extern uae_u32 allocated_z3fastmem; -extern uae_u32 allocated_a3000mem; #undef DIRECT_MEMFUNCS_SUCCESSFUL /*#include "machdep/maccess.h"*/ @@ -48,8 +44,8 @@ extern uae_u32 allocated_a3000mem; #define USE_MAPPED_MEMORY #endif -#define ROMmem_size TOSSize -#define ROMmem_start TOSAddress +#define ROMmem_start 0x00E00000 +#define ROMmem_size (0x00FF0000-0x00E00000) #define STmem_start 0x00000000 #define TTmem_start 0x01000000 @@ -187,4 +183,4 @@ extern void chipmem_wput (uaecptr, uae_u extern void chipmem_bput (uaecptr, uae_u32) REGPARAM; -#endif /* UAEMEMORY */ +#endif /* UAE_MEMORY_H */