X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fmemory.h;h=ae7ae50dad2ce115112f6314ac9da935f62e8268;hb=0c7d1ba332b26f4ac67199e8ecbb826651f8512a;hp=1fd7fc1550d511b149d5f9810b06cdc3275ffe9e;hpb=00faec9cdbc073199fa984a0450e1a961994b058;p=picodrive.git diff --git a/pico/memory.h b/pico/memory.h index 1fd7fc1..ae7ae50 100644 --- a/pico/memory.h +++ b/pico/memory.h @@ -26,6 +26,11 @@ extern uptr s68k_write16_map[0x1000000 >> M68K_MEM_SHIFT]; typedef u32 (cpu68k_read_f)(u32 a); typedef void (cpu68k_write_f)(u32 a, u32 d); +extern u32 m68k_read8(u32 a); +extern u32 m68k_read16(u32 a); +extern void m68k_write8(u32 a, u8 d); +extern void m68k_write16(u32 a, u16 d); + // z80 #define Z80_MEM_SHIFT 13 extern uptr z80_read_map [0x10000 >> Z80_MEM_SHIFT]; @@ -40,7 +45,8 @@ void cpu68k_map_set(uptr *map, int start_addr, int end_addr, void cpu68k_map_all_ram(int start_addr, int end_addr, void *ptr, int is_sub); void m68k_map_unmap(int start_addr, int end_addr); -#define map_flag_set(x) ((x) & ((uptr)1 << (sizeof(uptr) * 8 - 1))) +#define MAP_FLAG ((uptr)1 << (sizeof(uptr) * 8 - 1)) +#define map_flag_set(x) ((x) & MAP_FLAG) #define MAKE_68K_READ8(name, map) \ u32 name(u32 a) \ @@ -127,6 +133,25 @@ void name(u32 a, u32 d) \ } \ } +#ifdef NEED_DMA_SOURCE // meh + +static __inline void *m68k_dma_source(u32 a) +{ + u8 *base; + uptr v; + v = m68k_read16_map[a >> M68K_MEM_SHIFT]; + if (map_flag_set(v)) { + if (a >= Pico.romsize) // Rom + return NULL; + base = Pico.rom; + } + else + base = (void *)(v << 1); + return base + (a & 0xfe0000); +} + +#endif + // 32x typedef struct { uptr addr; // stores (membase >> 1) or ((handler >> 1) | (1<<31))