Max/SameBoy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into libretro_core

Browse Source
This commit is contained in:
Lior Halphon 2017-10-12 22:50:02 +03:00
commit 27b5718b07
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/gb.c
View File

@ -562,6 +562,10 @@ void *GB_get_direct_access(GB_gameboy_t *gb, GB_direct_access_t access, size_t *
*size = sizeof(gb->sprite_palettes_data); *size = sizeof(gb->sprite_palettes_data);
*bank = 0; *bank = 0;
return &gb->sprite_palettes_data; return &gb->sprite_palettes_data;
case GB_DIRECT_ACCESS_IE:
*size = sizeof(gb->interrupt_enable);
*bank = 0;
return &gb->interrupt_enable;
default: default:
*size = 0; *size = 0;
*bank = 0; *bank = 0;

1
Core/gb.h
View File

@ -521,6 +521,7 @@ typedef enum {
GB_DIRECT_ACCESS_OAM, GB_DIRECT_ACCESS_OAM,
GB_DIRECT_ACCESS_BGP, GB_DIRECT_ACCESS_BGP,
GB_DIRECT_ACCESS_OBP, GB_DIRECT_ACCESS_OBP,
GB_DIRECT_ACCESS_IE,
} GB_direct_access_t; } GB_direct_access_t;
/* Returns a mutable pointer to various hardware memories. If that memory is banked, the current bank /* Returns a mutable pointer to various hardware memories. If that memory is banked, the current bank