mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-24 20:35:32 -07:00
Code Issues Packages Projects Releases Activity

Merge branch 'master' into feature/ich2

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-07-27 20:39:49 -04:00
parent edd13a93db 42f0efeb9d
commit 8e31ca0197
123 changed files with 29984 additions and 31599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mem/rom.c
View File

@@ -595,7 +595,7 @@ bios_load_linear_combined2_ex(char *fn1, char *fn2, char *fn3, char *fn4, char *
int
rom_init(rom_t *rom, char *fn, uint32_t addr, int sz, int mask, int off, uint32_t flags)
{
rom_log("rom_init(%08X, %08X, %08X, %08X, %08X, %08X, %08X)\n", rom, fn, addr, sz, mask, off, flags);
rom_log("rom_init(%08X, %s, %08X, %08X, %08X, %08X, %08X)\n", rom, fn, addr, sz, mask, off, flags);
/* Allocate a buffer for the image. */
rom->rom = malloc(sz);