pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor cleanup and adding audio.h reference

Browse source
This commit is contained in:
Dimitris Panokostas 2020-08-14 14:30:27 +02:00
parent 9c5a80c427
commit e88431d775
5 changed files with 394 additions and 390 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/hardfile.cpp
View file

@ -13,6 +13,9 @@
#include "threaddep/thread.h" #include "threaddep/thread.h"
#include "options.h" #include "options.h"
#include "memory.h" #include "memory.h"
#include "custom.h"
#include "newcpu.h"
#include "disk.h"
#include "autoconf.h" #include "autoconf.h"
#include "traps.h" #include "traps.h"
#include "filesys.h" #include "filesys.h"
@ -23,7 +26,6 @@
#include "scsi.h" #include "scsi.h"
#include "gayle.h" #include "gayle.h"
#include "execio.h" #include "execio.h"
#include "newcpu.h"
#include "zfile.h" #include "zfile.h"
#include "ide.h" #include "ide.h"
#include "rommgr.h" #include "rommgr.h"
@ -925,7 +927,8 @@ static uae_u64 vhd_write(struct hardfiledata* hfd, void* v, uae_u64 offset, uae_
} }
return written; return written;
} }
#ifndef AMIBERRY
int vhd_create (const TCHAR *name, uae_u64 size, uae_u32 dostype) int vhd_create (const TCHAR *name, uae_u64 size, uae_u32 dostype)
{ {
struct hardfiledata hfd; struct hardfiledata hfd;
@ -1060,7 +1063,6 @@ end:
zfile_fclose (zf); zfile_fclose (zf);
return ret; return ret;
} }
#endif
static int hdf_read2 (struct hardfiledata *hfd, void *buffer, uae_u64 offset, int len) static int hdf_read2 (struct hardfiledata *hfd, void *buffer, uae_u64 offset, int len)
{ {
@ -2217,15 +2219,13 @@ static int handle_scsi (TrapContext *ctx, uae_u8 *iobuf, uaecptr request, struct
sd->sense[0] = 0x70; sd->sense[0] = 0x70;
sd->sense[2] = 5; /* ILLEGAL REQUEST */ sd->sense[2] = 5; /* ILLEGAL REQUEST */
sd->sense[12] = 0x30; /* INCOMPATIBLE MEDIUM INSERTED */ sd->sense[12] = 0x30; /* INCOMPATIBLE MEDIUM INSERTED */
} } else {
else {
scsi_emulate_analyze(sd); scsi_emulate_analyze(sd);
scsi_start_transfer(sd); scsi_start_transfer(sd);
if (sd->direction > 0) { if (sd->direction > 0) {
trap_get_bytes(ctx, sd->buffer, scsi_data, sd->data_len); trap_get_bytes(ctx, sd->buffer, scsi_data, sd->data_len);
scsi_emulate_cmd(sd); scsi_emulate_cmd(sd);
} } else {
else {
scsi_emulate_cmd(sd); scsi_emulate_cmd(sd);
if (sd->direction < 0) if (sd->direction < 0)
trap_put_bytes(ctx, sd->buffer, scsi_data, sd->data_len); trap_put_bytes(ctx, sd->buffer, scsi_data, sd->data_len);
@ -2369,7 +2369,7 @@ static int start_thread(TrapContext* ctx, int unit)
hfpd->base = trap_get_areg(ctx, 6); hfpd->base = trap_get_areg(ctx, 6);
init_comm_pipe (&hfpd->requests, 300, 3); init_comm_pipe (&hfpd->requests, 300, 3);
uae_sem_init (&hfpd->sync_sem, 0, 0); uae_sem_init (&hfpd->sync_sem, 0, 0);
uae_start_thread(_T("hardfile"), hardfile_thread, hfpd, &hfpd->thread_id); uae_start_thread (_T("hardfile"), hardfile_thread, hfpd, NULL);
uae_sem_wait (&hfpd->sync_sem); uae_sem_wait (&hfpd->sync_sem);
return hfpd->thread_running; return hfpd->thread_running;
} }

1
src/inputdevice.cpp
View file

@ -34,6 +34,7 @@
#include "gui.h" #include "gui.h"
#include "savestate.h" #include "savestate.h"
#include "autoconf.h" #include "autoconf.h"
#include "audio.h"
#include "sounddep/sound.h" #include "sounddep/sound.h"
#include "disk.h" #include "disk.h"
#include "amiberry_gfx.h" #include "amiberry_gfx.h"

1
src/osdep/amiberry_gfx.cpp
View file

@ -29,6 +29,7 @@
#include "gfxboard.h" #include "gfxboard.h"
#include "statusline.h" #include "statusline.h"
#include "audio.h"
#include "sounddep/sound.h" #include "sounddep/sound.h"
#include "threaddep/thread.h" #include "threaddep/thread.h"
static uae_thread_id display_tid = nullptr; static uae_thread_id display_tid = nullptr;

1
src/osdep/amiberry_gui.cpp
View file

@ -18,6 +18,7 @@
#include "rommgr.h" #include "rommgr.h"
#include "custom.h" #include "custom.h"
#include "inputdevice.h" #include "inputdevice.h"
#include "audio.h"
#include "sounddep/sound.h" #include "sounddep/sound.h"
#include "savestate.h" #include "savestate.h"
#include "blkdev.h" #include "blkdev.h"

1
src/osdep/gui/PanelSound.cpp
View file

@ -9,6 +9,7 @@
#include "sysdeps.h" #include "sysdeps.h"
#include "options.h" #include "options.h"
#include "gui_handling.h" #include "gui_handling.h"
#include "audio.h"
#include "sounddep/sound.h" #include "sounddep/sound.h"